aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2011-12-19 17:19:32 +1100
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-19 10:27:33 -0600
commitb1746dddfc94f9c98b9b9c1a6f25c064f0f58a5a (patch)
tree1b8455461a26487aaa7063485219f1925e840f8a /qemu-options.hx
parenta3adb7ad3bd9c517d569e7e23b249e7f7d616015 (diff)
downloadqemu-b1746dddfc94f9c98b9b9c1a6f25c064f0f58a5a.zip
qemu-b1746dddfc94f9c98b9b9c1a6f25c064f0f58a5a.tar.gz
qemu-b1746dddfc94f9c98b9b9c1a6f25c064f0f58a5a.tar.bz2
Documentation: Move balloon option out of i386 only section
The balloon option is not i386 only, so move it into the standard options section. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx26
1 files changed, 13 insertions, 13 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 749aee1..a60191f 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -456,6 +456,19 @@ modprobe i810_audio clocking=48000
@end example
ETEXI
+DEF("balloon", HAS_ARG, QEMU_OPTION_balloon,
+ "-balloon none disable balloon device\n"
+ "-balloon virtio[,addr=str]\n"
+ " enable virtio balloon device (default)\n", QEMU_ARCH_ALL)
+STEXI
+@item -balloon none
+@findex -balloon
+Disable balloon device.
+@item -balloon virtio[,addr=@var{addr}]
+Enable virtio balloon device (default), optionally with PCI address
+@var{addr}.
+ETEXI
+
STEXI
@end table
ETEXI
@@ -1120,19 +1133,6 @@ STEXI
Disable HPET support.
ETEXI
-DEF("balloon", HAS_ARG, QEMU_OPTION_balloon,
- "-balloon none disable balloon device\n"
- "-balloon virtio[,addr=str]\n"
- " enable virtio balloon device (default)\n", QEMU_ARCH_ALL)
-STEXI
-@item -balloon none
-@findex -balloon
-Disable balloon device.
-@item -balloon virtio[,addr=@var{addr}]
-Enable virtio balloon device (default), optionally with PCI address
-@var{addr}.
-ETEXI
-
DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,
"-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n"
" ACPI table description\n", QEMU_ARCH_I386)