From nobody Wed Nov 13 07:27:10 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=1705053700; cv=none; d=zohomail.com; s=zohoarc; b=O4yuUK7RMzYDXM8PSkWNxADKxBM3y9u3ZZ8uGm35JoSoIX7qdDTkBwcI4vi0HkMLwrfkTs+1cAyOF6zLHcOunc21tHEd7xdqSlI8E2Ci3Ar9pnOkAzog8Ybmd8hvCgHnMmhCxinDp1mZbTISpfM7lXjirZ+Tt5Ako56SU8OUEpY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705053700; 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=d4i9ybCEKfWI7bat3jDhZCQiNSkA8c2SdRIVc4iohQk=; b=YyPsBUH39LpF3ZIwo9z75WqX77/o2xdDXgsUZc+Yh+VUWSikk53qfdVgFr3rdprXguRWSwsFtmmmca4I80OxHry1LF6UoU1B73fd+WDqWSbPonv/6QKoZIpwfihg+9Nb5xsUz7chVhiUCYdEaCJID7l/eu6JUwjZ3C0ziw8YCiM= 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 1705053700380858.4958789956282; Fri, 12 Jan 2024 02:01:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOELf-00046V-LY; Fri, 12 Jan 2024 05:01:11 -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 1rOELe-00045T-0b for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOELb-0005c4-1l for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:09 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-471-9UZpRvMqNuGDoT6tnU-qeQ-1; Fri, 12 Jan 2024 05:01:03 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 775F13C025B7; Fri, 12 Jan 2024 10:01:03 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F1CDC08ED4; Fri, 12 Jan 2024 10:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705053665; 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=d4i9ybCEKfWI7bat3jDhZCQiNSkA8c2SdRIVc4iohQk=; b=RTvYH3EmOUozrBozNKzVaNMjN5VfjnhrvgifeVc/CCj6VG1x0JYncJIsskeMojOpiW+Uic KwNdEzrkLNGjLT8rUl+FcrLv1W6iyvdTH71NGq79YDxYUmvdrGE7H2IZyrm7e2HLUbDhGh c1NwBSCiIKz9e9Sxm5ympTf2HLeL220= X-MC-Unique: 9UZpRvMqNuGDoT6tnU-qeQ-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?= , Claudio Imbrenda Subject: [PATCH 1/5] qemu-options: Remove the deprecated -no-hpet option Date: Fri, 12 Jan 2024 11:00:55 +0100 Message-ID: <20240112100059.965041-2-thuth@redhat.com> In-Reply-To: <20240112100059.965041-1-thuth@redhat.com> References: <20240112100059.965041-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.467, 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_H4=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=ham 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: 1705053700976100002 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 --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 8 ++++++++ system/vl.c | 4 ---- qemu-options.hx | 7 ------- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 7fdd2239b4..6c668b8531 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-hpet`` (since 8.0) -'''''''''''''''''''''''' - -The HPET setting has been turned into a machine property. -Use ``-machine hpet=3Doff`` instead. - ``-no-acpi`` (since 8.0) '''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index f04036987b..52d240ade9 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -460,6 +460,14 @@ in this case. Note that the default audio backend must be configured on the command line if the ``-nodefaults`` options is used. =20 +``-no-hpet`` (removed in 9.0) +''''''''''''''''''''''''''''' + +The HPET setting has been turned into a machine property. +Use ``-machine hpet=3Doff`` instead. + + + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/system/vl.c b/system/vl.c index 53850a1daf..f08c4c8193 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3373,10 +3373,6 @@ void qemu_init(int argc, char **argv) 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_hpet: - warn_report("-no-hpet is deprecated, use '-machine hpet=3D= off' instead"); - qdict_put_str(machine_opts_dict, "hpet", "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 b66570ae00..57e447065a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2654,13 +2654,6 @@ SRST machine only). ERST =20 -DEF("no-hpet", 0, QEMU_OPTION_no_hpet, - "-no-hpet disable HPET\n", QEMU_ARCH_I386) -SRST -``-no-hpet`` - Disable HPET support. Deprecated, use '-machine hpet=3Doff' instead. -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 From nobody Wed Nov 13 07:27:10 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=1705053762; cv=none; d=zohomail.com; s=zohoarc; b=A/CgslIktEQAa/zqVFlA9aIQcHZdD8MePsDFWvvOBJdCDjE0BRpZzWZwobQyMNhpzGAZq1WGU4/r1nf7GH1fkZDyqM2PDA1vcrlt3NZLl2ZwalJuajuXisVcHaaasLOw4+fC5sfOfn3Cj6CKWp2odIhJsxzVuEWrGsgaZnHqWZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705053762; 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=gbxVZxR72NOA9P1voQAwoc/yPJ1UDHYRmtFd2UrWJbE=; b=B79p6GyrX/4t0y+KtiM2NvSllQWUsisaq94++BVF3A9W3L/fSwDmdgIpNYoC5MAJg9UrBKp9peftaCuaVipnoW3c6x4j72r0skGngMVi5cJL/qEHc8KE1ZbZQm/xQvh2uyxdajx6ouTyx74LudNF4A2mjXRIRi7KlKGHkrAJdH8= 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 170505376237692.9254879847058; Fri, 12 Jan 2024 02:02:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOEM0-0004Ae-VF; Fri, 12 Jan 2024 05:01:33 -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 1rOELe-00045U-3c for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:10 -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 1rOELb-0005d4-OZ for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:09 -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-164-ErD2EX8_PmOZiOsGAH85LQ-1; Fri, 12 Jan 2024 05:01:05 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 698BA185A781; Fri, 12 Jan 2024 10:01:05 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1DE0C08ED4; Fri, 12 Jan 2024 10:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705053667; 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=gbxVZxR72NOA9P1voQAwoc/yPJ1UDHYRmtFd2UrWJbE=; b=VP5UKdeTGMHCRbthTgqNP5kSiPLBNRLCWZIw3ZnrTt5N1XgGdPpmU/p8f8EbL4Q5hy24Dy 3bMlUgBa82QtoUrD8jyeHEdZ9L+SNnfL1jxmfuuFiJrGKm81WQlNbdOtIXKfNEip/lrhhk vsT6NXfvH18ZntPosY+44EW1+nEWxw0= X-MC-Unique: ErD2EX8_PmOZiOsGAH85LQ-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?= , Claudio Imbrenda Subject: [PATCH 2/5] qemu-options: Remove the deprecated -no-acpi option Date: Fri, 12 Jan 2024 11:00:56 +0100 Message-ID: <20240112100059.965041-3-thuth@redhat.com> In-Reply-To: <20240112100059.965041-1-thuth@redhat.com> References: <20240112100059.965041-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.467, 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=ham 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: 1705053763235100002 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 --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 5 +++++ system/vl.c | 4 ---- qemu-options.hx | 9 --------- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 6c668b8531..dff4c76f1b 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/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 From nobody Wed Nov 13 07:27:10 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=1705053753; cv=none; d=zohomail.com; s=zohoarc; b=ZOCG/UhHjbnIHqflt2kufq2c9w0sgOhZgU/w75/kC+Ylsh6ntjvpBs0pgcold7SvV8V8gHS1Opfmnrn8XGeBGp5yE7LlDRQRrdb+hB54CMyS3gyPzkjYZWrtkeh7hX901+I5osQyOu1eO6shBE+5ZvtoXPgHrZj6iBLKpO8Iurs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705053753; 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=ZezQOkaCFvzDoxDo92QWEpbfXzEdmNEq7sirNHX4KuY=; b=bSLaNJ9bKGDUikmtzn9o8ZAy5RNuPH97LVyBFRCilF8dI6C3JZNzuyDaL/p9buh4u5tzdwszb+JQTMtOL3TnCwvccWMirlW3jgIyDlLsJoBB6HC29ZMc2uKRss89ms2JyG9/WCKSyIMPhwxi22rAY7cZ0YWrdWrNvsnZPwZn9Cg= 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 1705053753690197.21998345493785; Fri, 12 Jan 2024 02:02:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOEMD-0004Ek-Nz; Fri, 12 Jan 2024 05:01:47 -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 1rOELm-00048z-4a for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOELj-0005hF-KO for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:17 -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-227-fGNa1nlUMWCQ7941YSYP6Q-1; Fri, 12 Jan 2024 05:01:08 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 CED5586EB60; Fri, 12 Jan 2024 10:01:07 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0331C08ED4; Fri, 12 Jan 2024 10:01:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705053674; 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=ZezQOkaCFvzDoxDo92QWEpbfXzEdmNEq7sirNHX4KuY=; b=WMLcbrD2nhRx1GjOkvEeGaKgkjluWW5sjWkpmIAmhD/g5xdKqRizt1MMx79UPJWyqDgy92 DEv/iRs8kwLOV3wImlg4t3as2c8U7OJHS3gM4MJ7K27cZynG5bzjI6HhtIF9dFR+d92bZI VqBOhntV+D6RCenXphaOUp9h01eCKAU= X-MC-Unique: fGNa1nlUMWCQ7941YSYP6Q-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?= , Claudio Imbrenda Subject: [PATCH 3/5] qemu-options: Remove the deprecated -async-teardown option Date: Fri, 12 Jan 2024 11:00:57 +0100 Message-ID: <20240112100059.965041-4-thuth@redhat.com> In-Reply-To: <20240112100059.965041-1-thuth@redhat.com> References: <20240112100059.965041-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.467, 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_H4=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: 1705053755180100002 Content-Type: text/plain; charset="utf-8" It's been marked as deprecated since QEMU 8.1 (and was only available since QEMU 8.0 anyway), so it should be fine to remove this now. Signed-off-by: Thomas Huth Reviewed-by: Claudio Imbrenda Reviewed-by: Markus Armbruster --- docs/about/deprecated.rst | 5 ----- docs/about/removed-features.rst | 5 +++++ system/vl.c | 6 ------ qemu-options.hx | 10 ---------- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index dff4c76f1b..80eacd40ba 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -63,11 +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 -``-async-teardown`` (since 8.1) -''''''''''''''''''''''''''''''' - -Use ``-run-with async-teardown=3Don`` instead. - ``-chroot`` (since 8.1) ''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index ae728b6130..43f64a26ba 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -472,6 +472,11 @@ Use ``-machine hpet=3Doff`` instead. The ``-no-acpi`` setting has been turned into a machine property. Use ``-machine acpi=3Doff`` instead. =20 +``-async-teardown`` (removed in 9.0) +'''''''''''''''''''''''''''''''''''' + +Use ``-run-with async-teardown=3Don`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/system/vl.c b/system/vl.c index 7e258889f3..924356f864 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3600,12 +3600,6 @@ void qemu_init(int argc, char **argv) case QEMU_OPTION_daemonize: os_set_daemonize(true); break; -#if defined(CONFIG_LINUX) - /* deprecated */ - case QEMU_OPTION_asyncteardown: - init_async_teardown(); - break; -#endif case QEMU_OPTION_run_with: { const char *str; opts =3D qemu_opts_parse_noisily(qemu_find_opts("run-with"= ), diff --git a/qemu-options.hx b/qemu-options.hx index dafecf47d6..10c952ba3f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4975,16 +4975,6 @@ HXCOMM Internal use DEF("qtest", HAS_ARG, QEMU_OPTION_qtest, "", QEMU_ARCH_ALL) DEF("qtest-log", HAS_ARG, QEMU_OPTION_qtest_log, "", QEMU_ARCH_ALL) =20 -#ifdef __linux__ -DEF("async-teardown", 0, QEMU_OPTION_asyncteardown, - "-async-teardown enable asynchronous teardown\n", - QEMU_ARCH_ALL) -SRST -``-async-teardown`` - This option is deprecated and should no longer be used. The new option - ``-run-with async-teardown=3Don`` is a replacement. -ERST -#endif #ifdef CONFIG_POSIX DEF("run-with", HAS_ARG, QEMU_OPTION_run_with, "-run-with [async-teardown=3Don|off][,chroot=3Ddir]\n" --=20 2.43.0 From nobody Wed Nov 13 07:27:10 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=1705053763; cv=none; d=zohomail.com; s=zohoarc; b=IGwbNU9/Zt2D4HYdbQJ8lnY9OxoFEYAULK+9my7kPrGcBy31UWpoGKSV4t5j/QQCfxPZiPAB9XO19VQtBmegMlXvGBhS25JajM8973QL44Da5gAxwHIxrTBwLKR/DUtsi5y0WTBhzssHzqhtMH6UcZVKXfZNSwgfS58v2LHaEeg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705053763; 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=t9q/1fP6B5/Fr/WdjYFW30bFD0l49qIgksjeahzvbOg=; b=WPXWh/qBlB4FyfRqlZr+PZhVKl6AgkdD3gbfy0rlp2tFPT44uwoyHjHtlKZUt8sotMJLEFgjVjBEBEPT+ELJIkdgCcK8yPE/ZzoOuZGG3dGQsglajFmjhuKz/oCKXhZi6cR5rnNxi/gfgj55juHspJ1Zc3eQytto1Nl+1tMizKI= 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 1705053763483109.7173701112896; Fri, 12 Jan 2024 02:02:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOEM4-0004EF-T5; Fri, 12 Jan 2024 05:01:36 -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 1rOELj-00048H-OS for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOELh-0005gf-Aj for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:14 -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-537-P3uL-XnLOgq6ord1A2R58A-1; Fri, 12 Jan 2024 05:01:10 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 0CBC485A588; Fri, 12 Jan 2024 10:01:10 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39DCBC08ED4; Fri, 12 Jan 2024 10:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705053672; 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=t9q/1fP6B5/Fr/WdjYFW30bFD0l49qIgksjeahzvbOg=; b=A65NK20UHr7H55vlfeLH8rZcJAbslVQE0EJ14j1hPG/wNs722qTbXsgdNZIfvWtNi3qb4g IMhv9JF1S0VArIpwuihAVHuHuc9jeGVJ1cHmMZrtQEPNn0XbL9veFagHVRvQ5HsN5Wbz0O QC2leOZZVLU4xMG1jafOnqKIw/BWwnM= X-MC-Unique: P3uL-XnLOgq6ord1A2R58A-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?= , Claudio Imbrenda Subject: [PATCH 4/5] qemu-options: Remove the deprecated -chroot option Date: Fri, 12 Jan 2024 11:00:58 +0100 Message-ID: <20240112100059.965041-5-thuth@redhat.com> In-Reply-To: <20240112100059.965041-1-thuth@redhat.com> References: <20240112100059.965041-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.467, 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_H4=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=ham 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: 1705053765147100005 Content-Type: text/plain; charset="utf-8" It's been marked as deprecated since QEMU 8.1, so it should be fine to remove this now. Signed-off-by: Thomas Huth Reviewed-by: Markus Armbruster --- docs/about/deprecated.rst | 5 ----- docs/about/removed-features.rst | 5 +++++ system/vl.c | 5 ----- qemu-options.hx | 12 ------------ 4 files changed, 5 insertions(+), 22 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 80eacd40ba..b50cfe596b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -63,11 +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 -``-chroot`` (since 8.1) -''''''''''''''''''''''' - -Use ``-run-with chroot=3Ddir`` instead. - ``-singlestep`` (since 8.1) ''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 43f64a26ba..a8546f4787 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -477,6 +477,11 @@ Use ``-machine acpi=3Doff`` instead. =20 Use ``-run-with async-teardown=3Don`` instead. =20 +``-chroot`` (removed in 9.0) +'''''''''''''''''''''''''''' + +Use ``-run-with chroot=3Ddir`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/system/vl.c b/system/vl.c index 924356f864..c125fb9079 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3592,11 +3592,6 @@ void qemu_init(int argc, char **argv) exit(1); } break; - case QEMU_OPTION_chroot: - warn_report("option is deprecated," - " use '-run-with chroot=3D...' instead"); - os_set_chroot(optarg); - break; case QEMU_OPTION_daemonize: os_set_daemonize(true); break; diff --git a/qemu-options.hx b/qemu-options.hx index 10c952ba3f..9be6beb5a0 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4790,18 +4790,6 @@ SRST ``-nodefaults`` option will disable all those default devices. ERST =20 -#ifndef _WIN32 -DEF("chroot", HAS_ARG, QEMU_OPTION_chroot, \ - "-chroot dir chroot to dir just before starting the VM (deprecated= )\n", - QEMU_ARCH_ALL) -#endif -SRST -``-chroot dir`` - Deprecated, use '-run-with chroot=3D...' instead. - Immediately before starting guest execution, chroot to the specified - directory. Especially useful in combination with -runas. -ERST - #ifndef _WIN32 DEF("runas", HAS_ARG, QEMU_OPTION_runas, \ "-runas user change to user id user just before starting the VM\n"= \ --=20 2.43.0 From nobody Wed Nov 13 07:27:10 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=1705053776; cv=none; d=zohomail.com; s=zohoarc; b=AejM2pHzQmFxveTX7/8cT7xb2JKMyfhsRWI6dl4AhCBFDBF1D9aVxLMiEiO8cXVqcKuT/Z9aCuzBwB/N/vzwQGpRu7LhEzedQsDQoo7jW9Dnz61bDxk5dWrP5EV6m8q9QGfq+SMR0DXDxtBCjoTH91AbjEuFLommoK8eDaz2kKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705053776; 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=xVy7qsKJPjI2/wKvXRpiG+jBXe0T6eGOpYnuJmahC8g=; b=UB87LRzV+JfLaDc77RG2Uh5RiAXIdsX+1bOrlsvqckFcBMRH4K6D7djOvcFEBRt+ZZvTc6vL0NWCcp0/pZD8pLbd/2XlXzXAEtILYzlPeOJiah+XUtyUbTDdUdgcep9cZDJBDaT2iE9p9JZy0KWZaBvEZazm1OE3jB5NcUNPue8= 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 1705053776045498.8453237871588; Fri, 12 Jan 2024 02:02:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOEML-0004PF-Ie; Fri, 12 Jan 2024 05:01:55 -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 1rOELm-00048y-4c for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOELk-0005hI-0w for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:01:17 -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-587-C_05SQ0gOliezulKB9qyOA-1; Fri, 12 Jan 2024 05:01:12 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 DF84E8A4401; Fri, 12 Jan 2024 10:01:11 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 681DDC08ED4; Fri, 12 Jan 2024 10:01:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705053675; 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=xVy7qsKJPjI2/wKvXRpiG+jBXe0T6eGOpYnuJmahC8g=; b=AG2hyFO5DSFGJVQDqGW+SApuDUI3zsRhhcaa1MkRDHK6v/SVjIY3+WxF3qzbphVJRFwG83 gM4OYD8D6Z/UF7xaVuRJRvXo5r58sdw546UNzYjneQ8PG1iX4uIP7qYnZh8riGag9tj/aj WuSJF0cj0x1VhsRTY1Jiyp28jKyNPRc= X-MC-Unique: C_05SQ0gOliezulKB9qyOA-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?= , Claudio Imbrenda Subject: [PATCH 5/5] qemu-options: Remove the deprecated -singlestep option Date: Fri, 12 Jan 2024 11:00:59 +0100 Message-ID: <20240112100059.965041-6-thuth@redhat.com> In-Reply-To: <20240112100059.965041-1-thuth@redhat.com> References: <20240112100059.965041-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.467, 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_H4=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: 1705053777205100001 Content-Type: text/plain; charset="utf-8" It's been marked as deprecated since QEMU 8.1, so it should be fine to remove this now. Signed-off-by: Thomas Huth --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 7 +++++++ system/vl.c | 18 +----------------- qemu-options.hx | 8 -------- 4 files changed, 8 insertions(+), 31 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index b50cfe596b..81a5149f1e 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 -``-singlestep`` (since 8.1) -''''''''''''''''''''''''''' - -The ``-singlestep`` option has been turned into an accelerator property, -and given a name that better reflects what it actually does. -Use ``-accel tcg,one-insn-per-tb=3Don`` instead. =20 User-mode emulator command line arguments ----------------------------------------- diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index a8546f4787..d5c60ff47f 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -482,6 +482,13 @@ Use ``-run-with async-teardown=3Don`` instead. =20 Use ``-run-with chroot=3Ddir`` instead. =20 +``-singlestep`` (removed in 9.0) +'''''''''''''''''''''''''''''''' + +The ``-singlestep`` option has been turned into an accelerator property, +and given a name that better reflects what it actually does. +Use ``-accel tcg,one-insn-per-tb=3Don`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/system/vl.c b/system/vl.c index c125fb9079..809f867bcc 100644 --- a/system/vl.c +++ b/system/vl.c @@ -181,7 +181,6 @@ static const char *log_file; static bool list_data_dirs; static const char *qtest_chrdev; static const char *qtest_log; -static bool opt_one_insn_per_tb; =20 static int has_defaults =3D 1; static int default_audio =3D 1; @@ -2308,19 +2307,7 @@ static int do_configure_accelerator(void *opaque, Qe= muOpts *opts, Error **errp) qemu_opt_foreach(opts, accelerator_set_property, accel, &error_fatal); - /* - * If legacy -singlestep option is set, honour it for TCG and - * silently ignore for any other accelerator (which is how this - * option has always behaved). - */ - if (opt_one_insn_per_tb) { - /* - * This will always succeed for TCG, and we want to ignore - * the error from trying to set a nonexistent property - * on any other accelerator. - */ - object_property_set_bool(OBJECT(accel), "one-insn-per-tb", true, N= ULL); - } + ret =3D accel_init_machine(accel, current_machine); if (ret < 0) { if (!qtest_with_kvm || ret !=3D -ENOENT) { @@ -3057,9 +3044,6 @@ void qemu_init(int argc, char **argv) case QEMU_OPTION_bios: qdict_put_str(machine_opts_dict, "firmware", optarg); break; - case QEMU_OPTION_singlestep: - opt_one_insn_per_tb =3D true; - break; case QEMU_OPTION_S: autostart =3D 0; break; diff --git a/qemu-options.hx b/qemu-options.hx index 9be6beb5a0..033fa873e4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4357,14 +4357,6 @@ SRST from a script. ERST =20 -DEF("singlestep", 0, QEMU_OPTION_singlestep, \ - "-singlestep deprecated synonym for -accel tcg,one-insn-per-tb=3Do= n\n", QEMU_ARCH_ALL) -SRST -``-singlestep`` - This is a deprecated synonym for the TCG accelerator property - ``one-insn-per-tb``. -ERST - DEF("preconfig", 0, QEMU_OPTION_preconfig, \ "--preconfig pause QEMU before machine is initialized (experimenta= l)\n", QEMU_ARCH_ALL) --=20 2.43.0