[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 33/34] balloon: Fix documentation of the --balloon pa
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 33/34] balloon: Fix documentation of the --balloon parameter and deprecate it |
Date: |
Tue, 6 Mar 2018 14:19:29 +0100 |
From: Thomas Huth <address@hidden>
There are two issues with the documentation of the --balloon parameter:
First, "--balloon none" is simply doing nothing. Even if a machine had a
balloon device by default, this option is not disabling anything, it is
simply ignored. Thus let's simply drop this option from the documentation
to avoid to confuse the users (but keep the code in vl.c for backward
compatibility).
Second, the documentation claims that "--balloon virtio" is the default
mode, but this is not true anymore since commit 382f074371f7dc32a34.
Since that commit, the option also has no real use case anymore, since
you can simply use "--device virtio-balloon" nowadays instead. Thus to
simplify our complex parameter zoo a little bit, let's deprecate the
the parameter now and tell the user to use "--device virtio-balloon"
instead.
Fixes: 382f074371f7dc32a34c944c845b1698e83d8c36
Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-doc.texi | 5 +++++
qemu-options.hx | 11 ++++-------
vl.c | 3 +++
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 589519a..39e38c8 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2707,6 +2707,11 @@ enabled via the ``-machine usb=on'' argument.
The ``-nodefconfig`` argument is a synonym for ``-no-user-config``.
address@hidden -balloon (since 2.12.0)
+
+The @option{--balloon virtio} argument has been superseded by
address@hidden virtio-balloon}.
+
@subsection -machine s390-squash-mcss=on|off (since 2.12.0)
The ``s390-squash-mcss=on`` property has been obsoleted by allowing the
diff --git a/qemu-options.hx b/qemu-options.hx
index 2a22a62..6585058 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -462,16 +462,13 @@ modprobe i810_audio clocking=48000
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)
+ " enable virtio balloon device (deprecated)\n",
QEMU_ARCH_ALL)
STEXI
address@hidden -balloon none
address@hidden -balloon
-Disable balloon device.
@item -balloon virtio[,address@hidden
-Enable virtio balloon device (default), optionally with PCI address
address@hidden
address@hidden -balloon
+Enable virtio balloon device, optionally with PCI address @var{addr}. This
+option is deprecated, use @option{--device virtio-balloon} instead.
ETEXI
DEF("device", HAS_ARG, QEMU_OPTION_device,
diff --git a/vl.c b/vl.c
index e648bed..dae986b 100644
--- a/vl.c
+++ b/vl.c
@@ -2209,6 +2209,9 @@ static int balloon_parse(const char *arg)
{
QemuOpts *opts;
+ warn_report("This option is deprecated. "
+ "Use '--device virtio-balloon' to enable the balloon device.");
+
if (strcmp(arg, "none") == 0) {
return 0;
}
--
1.8.3.1
- [Qemu-devel] [PULL 24/34] Revert "build-sys: compile with -Og or -O1 when --enable-debug", (continued)
- [Qemu-devel] [PULL 24/34] Revert "build-sys: compile with -Og or -O1 when --enable-debug", Paolo Bonzini, 2018/03/06
- [Qemu-devel] [PULL 25/34] Fixing WHPX casing to match SDK, Paolo Bonzini, 2018/03/06
- [Qemu-devel] [PULL 27/34] Remove unnecessary WHPX __debugbreak();, Paolo Bonzini, 2018/03/06
- [Qemu-devel] [PULL 26/34] Resolves WHPX breaking changes in SDK 17095, Paolo Bonzini, 2018/03/06
- [Qemu-devel] [PULL 29/34] Fix WHPX typo in 'mmio', Paolo Bonzini, 2018/03/06
- [Qemu-devel] [PULL 30/34] Fix WHPX issue leaking tpr values, Paolo Bonzini, 2018/03/06
- [Qemu-devel] [PULL 34/34] use g_path_get_basename instead of basename, Paolo Bonzini, 2018/03/06
- [Qemu-devel] [PULL 31/34] WHXP Removes the use of WHvGetExitContextSize, Paolo Bonzini, 2018/03/06
- [Qemu-devel] [PULL 32/34] WHPX improve interrupt notification registration, Paolo Bonzini, 2018/03/06
- [Qemu-devel] [PULL 33/34] balloon: Fix documentation of the --balloon parameter and deprecate it,
Paolo Bonzini <=
- [Qemu-devel] [PULL 28/34] Fix WHPX additional lock acquisition, Paolo Bonzini, 2018/03/06
- Re: [Qemu-devel] [PULL 00/34] Misc patches for 2018-03-06, no-reply, 2018/03/06
- Re: [Qemu-devel] [PULL 00/34] Misc patches for 2018-03-06, Peter Maydell, 2018/03/06
- Re: [Qemu-devel] [PULL 00/34] Misc patches for 2018-03-06, Thomas Huth, 2018/03/07