From nobody Sat Oct 25 09:04:21 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; dkim=fail; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520344126355861.9194838872921; Tue, 6 Mar 2018 05:48:46 -0800 (PST) Received: from localhost ([::1]:55875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etCxR-0006Pf-JJ for importer@patchew.org; Tue, 06 Mar 2018 08:48:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etCVy-0005te-2p for qemu-devel@nongnu.org; Tue, 06 Mar 2018 08:20:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etCVs-0006iR-0h for qemu-devel@nongnu.org; Tue, 06 Mar 2018 08:20:22 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35478) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etCVr-0006hd-Kp for qemu-devel@nongnu.org; Tue, 06 Mar 2018 08:20:15 -0500 Received: by mail-wm0-x242.google.com with SMTP id x7so22126670wmc.0 for ; Tue, 06 Mar 2018 05:20:15 -0800 (PST) Received: from 640k.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id l38sm25652538wrc.96.2018.03.06.05.20.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 05:20:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uGdYCr7++73u6ogXAqiohwj7e8Q+kY89vb653r6xBSI=; b=aISno239Udv5sSr2RkYp54Z6+BNS59MFuBTbhATAxe+x/579e3mXI1qiO58+XNKE2c I+9uUEFcLYsVrGdC8Q+H/wBIAEB+EKhLGtJa9YBkr7qsed8639/gdMK+mssuwCxqOlTH gUMSW3CaXl6Es5VDPx5D3DCYTzvYH6127/nUZIg2sAomHdF+oKHGPQQty7RRramnHlcw eN8pe75xRmKyPhKLXHv/T7kTOGyaohDs6xtYlOo4PT8UIwviTYu/iyHz/XeFtD2/Yysu tKRFrRmASmwHgn8KSpeBGwtojp5KxQb465fIFVZrKy7q2bjyqnsukG/dPR6nGmtryw8/ gTFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uGdYCr7++73u6ogXAqiohwj7e8Q+kY89vb653r6xBSI=; b=pzyodwVjwearMlTIEmsc5JiDIH6+AQ1+kjJUVT5n6FazyCuRK0V3z9oyCxAiY2TqRQ Le4XgBFqDCeXw2QH1AGBqAy561CPlhKjFcZqYFy9EzHQorKFM8Qe5JrF0BhC6J/QMaCW 7IDT4PYVJvFcj5XIJB/U4R2OO1PUxYizY9EcK/wMzKS2fiLsam0A+vfeyLWU67ppaHDL ms2kxP4+77JqQ5k3bFE5MnzSWz2pXhTQJgJX92zkl32i4GDZc9JNNl7DSOdyORQzXTep 4SXOLblxX3gI39Dsh1pBW0HA38pvPqb1TVnSOiRI1GxFMp0EQ9uh7gkAjeTnMdki0k/c MoMw== X-Gm-Message-State: AElRT7GN4aojhPSjpO3oPD3yZIAqV0U19pCVi8K5wmL06r5orhRByCFs igjTDJNoA1EqIj/9yFascQ4cIj7S X-Google-Smtp-Source: AG47ELudB7fQboOO66z2GxgQeqx5nCsa08V+4hsHkpBy6KdFNDOzZl15tAka90hixAcCjHXE76p3hA== X-Received: by 10.28.6.83 with SMTP id 80mr11099138wmg.12.1520342414304; Tue, 06 Mar 2018 05:20:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Mar 2018 14:19:29 +0100 Message-Id: <1520342370-123606-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520342370-123606-1-git-send-email-pbonzini@redhat.com> References: <1520342370-123606-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 33/34] balloon: Fix documentation of the --balloon parameter and deprecate it 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: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth 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 Message-Id: <1519796303-13257-1-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- 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=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 -machine s390-squash-mcss=3Don|off (since 2.12.0) =20 The ``s390-squash-mcss=3Don`` 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=3D48000 ETEXI =20 DEF("balloon", HAS_ARG, QEMU_OPTION_balloon, - "-balloon none disable balloon device\n" "-balloon virtio[,addr=3Dstr]\n" - " enable virtio balloon device (default)\n", QEMU_ARCH_= ALL) + " enable virtio balloon device (deprecated)\n", QEMU_AR= CH_ALL) STEXI -@item -balloon none -@findex -balloon -Disable balloon device. @item -balloon virtio[,addr=3D@var{addr}] -Enable virtio balloon device (default), optionally with PCI address -@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 =20 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; =20 + 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; } --=20 1.8.3.1