From nobody Wed Nov 5 16:15:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 153570591364645.90595280330581; Fri, 31 Aug 2018 01:58:33 -0700 (PDT) Received: from localhost ([::1]:52569 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fvfG7-0006af-9j for importer@patchew.org; Fri, 31 Aug 2018 04:58:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fvf3l-0001A2-ND for qemu-devel@nongnu.org; Fri, 31 Aug 2018 04:45:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fvexR-0007Ho-E9 for qemu-devel@nongnu.org; Fri, 31 Aug 2018 04:39:10 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:38292 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fvexR-0007H4-77 for qemu-devel@nongnu.org; Fri, 31 Aug 2018 04:39:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AE2F840241CF; Fri, 31 Aug 2018 08:39:08 +0000 (UTC) Received: from thuth.com (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09FF710CD791; Fri, 31 Aug 2018 08:39:06 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Fri, 31 Aug 2018 10:38:50 +0200 Message-Id: <1535704738-8986-2-git-send-email-thuth@redhat.com> In-Reply-To: <1535704738-8986-1-git-send-email-thuth@redhat.com> References: <1535704738-8986-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 31 Aug 2018 08:39:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 31 Aug 2018 08:39:08 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 1/9] Remove the deprecated -balloon option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The "-balloon" option has been replaced by "-device virtio-balloon". It's been marked as deprecated since two releases, and nobody complained, so let's remove it now. Acked-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Cornelia Huck Reviewed-by: Michael S. Tsirkin Reviewed-by: David Hildenbrand Acked-by: Peter Krempa Acked-by: J=C3=A1n Tomko Signed-off-by: Thomas Huth --- docs/virtio-balloon-stats.txt | 6 +++--- qemu-deprecated.texi | 5 ----- qemu-options.hx | 10 ---------- vl.c | 36 ------------------------------------ 4 files changed, 3 insertions(+), 54 deletions(-) diff --git a/docs/virtio-balloon-stats.txt b/docs/virtio-balloon-stats.txt index 9985e1d..1732cc8 100644 --- a/docs/virtio-balloon-stats.txt +++ b/docs/virtio-balloon-stats.txt @@ -61,9 +61,9 @@ It's also important to note the following: respond to the request the timer will never be re-armed, which has the same effect as disabling polling =20 -Here are a few examples. QEMU is started with '-balloon virtio', which -generates '/machine/peripheral-anon/device[1]' as the QOM path for the -balloon device. +Here are a few examples. QEMU is started with '-device virtio-balloon', +which generates '/machine/peripheral-anon/device[1]' as the QOM path for +the balloon device. =20 Enable polling with 2 seconds interval: =20 diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 1b9c007..98f5062 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -86,11 +86,6 @@ enabled via the ``-machine usb=3Don'' argument. =20 The ``-nodefconfig`` argument is a synonym for ``-no-user-config``. =20 -@subsection -balloon (since 2.12.0) - -The @option{--balloon virtio} argument has been superseded by -@option{--device virtio-balloon}. - @subsection -fsdev handle (since 2.12.0) =20 The ``handle'' fsdev backend does not support symlinks and causes the 9p diff --git a/qemu-options.hx b/qemu-options.hx index 654ef48..ccf7155 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -454,16 +454,6 @@ modprobe i810_audio clocking=3D48000 @end example ETEXI =20 -DEF("balloon", HAS_ARG, QEMU_OPTION_balloon, - "-balloon virtio[,addr=3Dstr]\n" - " enable virtio balloon device (deprecated)\n", QEMU_AR= CH_ALL) -STEXI -@item -balloon virtio[,addr=3D@var{addr}] -@findex -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, "-device driver[,prop[=3Dvalue][,...]]\n" " add device (based on driver)\n" diff --git a/vl.c b/vl.c index 5ba06ad..674c42f 100644 --- a/vl.c +++ b/vl.c @@ -2127,36 +2127,6 @@ static void parse_display(const char *p) } } =20 -static int balloon_parse(const char *arg) -{ - QemuOpts *opts; - - warn_report("This option is deprecated. " - "Use '--device virtio-balloon' to enable the balloon devic= e."); - - if (strcmp(arg, "none") =3D=3D 0) { - return 0; - } - - if (!strncmp(arg, "virtio", 6)) { - if (arg[6] =3D=3D ',') { - /* have params -> parse them */ - opts =3D qemu_opts_parse_noisily(qemu_find_opts("device"), arg= + 7, - false); - if (!opts) - return -1; - } else { - /* create empty opts */ - opts =3D qemu_opts_create(qemu_find_opts("device"), NULL, 0, - &error_abort); - } - qemu_opt_set(opts, "driver", "virtio-balloon", &error_abort); - return 0; - } - - return -1; -} - char *qemu_find_file(int type, const char *name) { int i; @@ -3660,12 +3630,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_no_hpet: no_hpet =3D 1; break; - case QEMU_OPTION_balloon: - if (balloon_parse(optarg) < 0) { - error_report("unknown -balloon argument %s", optarg); - exit(1); - } - break; case QEMU_OPTION_no_reboot: no_reboot =3D 1; break; --=20 1.8.3.1