From: y@ozlabs.org
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 3/3] Documentation: Move balloon option out of i386 only section
Date: Mon, 19 Dec 2011 17:19:32 +1100 [thread overview]
Message-ID: <1324275572-17752-3-git-send-email-y> (raw)
In-Reply-To: <1324275572-17752-1-git-send-email-y>
From: Michael Ellerman <michael@ellerman.id.au>
The balloon option is not i386 only, so move it into the standard
options section.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
qemu-options.hx | 26 +++++++++++++-------------
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)
--
1.7.7.3
next prev parent reply other threads:[~2011-12-19 6:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-19 6:19 [Qemu-devel] [PATCH 1/3] vl.c: Move option generation logic into a wrapper file y
2011-12-19 6:19 ` [Qemu-devel] [PATCH 2/3] vl.c: In qemu -h output, only print options for the arch we are running as y
2011-12-19 6:19 ` y [this message]
2011-12-19 6:23 ` [Qemu-devel] [PATCH 1/3] vl.c: Move option generation logic into a wrapper file Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1324275572-17752-3-git-send-email-y \
--to=y@ozlabs.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).