From nobody Thu Nov 14 17:57:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1705574359; cv=none; d=zohomail.com; s=zohoarc; b=HYK4wvC9CbeWspEWQa1WUnclz77de5oPwWNfTJIiikv8TU+lmHasfwrSBclP9GW6RFqSwtOyyrQcKI6FY3pWckfvPfm3LskDUe/ocQbq0cCHDPJ26PsSMXbMEyBgXKeB6/ott8YK0ODuO+rU7OCIhEjcUbRbgDWlZfSk4mTds+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705574359; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rmlBhcrd+2DIZi3lO8RMzoCHYJ3nL5ANUIVn8ZPtM3k=; b=M6yrXcS6I+gqSTBnfHIXdgRUMyRL7ANWA1sOc4k/aGV6RxIYlwcX4N9Snf9zuwH0kYXD7YeKb8wHJipebqGzM5P5m7iCtcf/6L0Z906HdjBLNNU+KFo+Mv9uXveLBYtUrMJpyZ2L5BMPKsIPs/xAY39WBlPkB5/UuthDwwiJfkU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705574359351435.3392805073796; Thu, 18 Jan 2024 02:39:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQPmq-0003f5-IM; Thu, 18 Jan 2024 05:38:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQPmn-0003e7-GK for qemu-devel@nongnu.org; Thu, 18 Jan 2024 05:38:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQPml-0006w5-SU for qemu-devel@nongnu.org; Thu, 18 Jan 2024 05:38:13 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-156-zZVyPaR8MAy1h2v74IVJXA-1; Thu, 18 Jan 2024 05:38:07 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1A412108BD45; Thu, 18 Jan 2024 10:38:07 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E25D492BC6; Thu, 18 Jan 2024 10:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705574291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rmlBhcrd+2DIZi3lO8RMzoCHYJ3nL5ANUIVn8ZPtM3k=; b=Fk/oT+utzx6qW0EEKIY0Fl6RppWx9z8cA9AdE00QgzggqXDN4L4PlsUgNyBYO4V0kLvlNA wL9V36vs3iOevs3CbSu8UzSZcyn510suYkSNdyFmv84ZX4ZKgQdZS2T2zejQ/zrhM2nSOP vS8noM656xYB5ANIABVEo5eEHPtJS/g= X-MC-Unique: zZVyPaR8MAy1h2v74IVJXA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Markus Armbruster , qemu-trivial@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/4] qemu-options: Remove the deprecated -no-acpi option Date: Thu, 18 Jan 2024 11:37:57 +0100 Message-ID: <20240118103759.130748-3-thuth@redhat.com> In-Reply-To: <20240118103759.130748-1-thuth@redhat.com> References: <20240118103759.130748-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.806, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1705574360258100002 Content-Type: text/plain; charset="utf-8" It's been marked as deprecated since QEMU 8.0, so it should be fine to remove this now. Signed-off-by: Thomas Huth Reviewed-by: Markus Armbruster Reviewed-by: Michael Tokarev --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 5 +++++ docs/specs/tpm.rst | 4 ++-- hw/i386/pc.c | 4 ++-- system/vl.c | 4 ---- qemu-options.hx | 9 --------- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index bf2150f00c..3f8e505df6 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -63,12 +63,6 @@ as short-form boolean values, and passed to plugins as `= `arg_name=3Don``. However, short-form booleans are deprecated and full explicit ``arg_name= =3Don`` form is preferred. =20 -``-no-acpi`` (since 8.0) -'''''''''''''''''''''''' - -The ``-no-acpi`` setting has been turned into a machine property. -Use ``-machine acpi=3Doff`` instead. - ``-async-teardown`` (since 8.1) ''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 52d240ade9..ae728b6130 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -466,6 +466,11 @@ line if the ``-nodefaults`` options is used. The HPET setting has been turned into a machine property. Use ``-machine hpet=3Doff`` instead. =20 +``-no-acpi`` (removed in 9.0) +''''''''''''''''''''''''''''' + +The ``-no-acpi`` setting has been turned into a machine property. +Use ``-machine acpi=3Doff`` instead. =20 =20 QEMU Machine Protocol (QMP) commands diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index c96776a369..68cb8cf7e6 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -343,9 +343,9 @@ In case an Arm virt machine is emulated, use the follow= ing command line: =20 .. code-block:: console =20 - qemu-system-aarch64 -machine virt,gic-version=3D3,accel=3Dkvm \ + qemu-system-aarch64 -machine virt,gic-version=3D3,acpi=3Doff \ -cpu host -m 4G \ - -nographic -no-acpi \ + -nographic -accel kvm \ -chardev socket,id=3Dchrtpm,path=3D/tmp/mytpm1/swtpm-sock \ -tpmdev emulator,id=3Dtpm0,chardev=3Dchrtpm \ -device tpm-tis-device,tpmdev=3Dtpm0 \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 496498df3a..058d7fce9f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1348,7 +1348,7 @@ static void pc_memory_pre_plug(HotplugHandler *hotplu= g_dev, DeviceState *dev, Error *local_err =3D NULL; =20 /* - * When -no-acpi is used with Q35 machine type, no ACPI is built, + * When "-M acpi=3Doff" is used with Q35 machine type, no ACPI is buil= t, * but pcms->acpi_dev is still created. Check !acpi_enabled in * addition to cover this case. */ @@ -1396,7 +1396,7 @@ static void pc_memory_unplug_request(HotplugHandler *= hotplug_dev, X86MachineState *x86ms =3D X86_MACHINE(hotplug_dev); =20 /* - * When -no-acpi is used with Q35 machine type, no ACPI is built, + * When "-M acpi=3Doff" is used with Q35 machine type, no ACPI is buil= t, * but pcms->acpi_dev is still created. Check !acpi_enabled in * addition to cover this case. */ diff --git a/system/vl.c b/system/vl.c index f08c4c8193..7e258889f3 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3369,10 +3369,6 @@ void qemu_init(int argc, char **argv) display_remote++; break; #endif - case QEMU_OPTION_no_acpi: - warn_report("-no-acpi is deprecated, use '-machine acpi=3D= off' instead"); - qdict_put_str(machine_opts_dict, "acpi", "off"); - break; case QEMU_OPTION_no_reboot: olist =3D qemu_find_opts("action"); qemu_opts_parse_noisily(olist, "reboot=3Dshutdown", false); diff --git a/qemu-options.hx b/qemu-options.hx index 57e447065a..dafecf47d6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2645,15 +2645,6 @@ SRST needed to boot from old floppy disks. ERST =20 -DEF("no-acpi", 0, QEMU_OPTION_no_acpi, - "-no-acpi disable ACPI\n", QEMU_ARCH_I386 | QEMU_ARCH_AR= M) -SRST -``-no-acpi`` - Disable ACPI (Advanced Configuration and Power Interface) support. - Use it if your guest OS complains about ACPI problems (PC target - machine only). -ERST - DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, "-acpitable [sig=3Dstr][,rev=3Dn][,oem_id=3Dstr][,oem_table_id=3Dstr][= ,oem_rev=3Dn][,asl_compiler_id=3Dstr][,asl_compiler_rev=3Dn][,{data|file}= =3Dfile1[:file2]...]\n" " ACPI table description\n", QEMU_ARCH_I386) --=20 2.43.0