iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'berendt-fix_qemu_size_argument'

This commit is contained in:
Mitchell Hashimoto 2014-10-27 16:13:58 -07:00
parent a47610879f 3504e4c1b7
commit 5d80085808
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
website/source/docs/builders/qemu.html.markdown
View File

@ -186,7 +186,7 @@ qemu-system-x86 command. The arguments are all printed for review.
```javascript ```javascript
// ... // ...
"qemuargs": [ "qemuargs": [
[ "-m", "1024m" ], [ "-m", "1024M" ],
[ "--no-acpi", "" ], [ "--no-acpi", "" ],
[ [
"-netdev", "-netdev",
@ -201,9 +201,9 @@ qemu-system-x86 command. The arguments are all printed for review.
would produce the following (not including other defaults supplied by the builder and not otherwise conflicting with the qemuargs): would produce the following (not including other defaults supplied by the builder and not otherwise conflicting with the qemuargs):
```text <pre class="prettyprint">
qemu-system-x86 -m 1024m --no-acpi -netdev user,id=mynet0,hostfwd=hostip:hostport-guestip:guestport -device virtio-net,netdev=mynet0" qemu-system-x86 -m 1024m --no-acpi -netdev user,id=mynet0,hostfwd=hostip:hostport-guestip:guestport -device virtio-net,netdev=mynet0"
``` </pre>
* `qemu_binary` (string) - The name of the Qemu binary to look for. This * `qemu_binary` (string) - The name of the Qemu binary to look for. This
defaults to "qemu-system-x86_64", but may need to be changed for some defaults to "qemu-system-x86_64", but may need to be changed for some