From nobody Wed Oct 29 17:11:31 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 152545340604519.74846613376758; Fri, 4 May 2018 10:03:26 -0700 (PDT) Received: from localhost ([::1]:35520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEe72-0005wY-Fq for importer@patchew.org; Fri, 04 May 2018 13:03:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEe5E-00054U-Ey for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEe5A-0003dG-Gm for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:24 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39088 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 1fEe5A-0003cl-D9 for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13F6EB0065 for ; Fri, 4 May 2018 17:01:18 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-204-196.brq.redhat.com [10.40.204.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id C109A7C49; Fri, 4 May 2018 17:01:15 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Date: Fri, 4 May 2018 19:01:06 +0200 Message-Id: <1525453270-23074-2-git-send-email-thuth@redhat.com> In-Reply-To: <1525453270-23074-1-git-send-email-thuth@redhat.com> References: <1525453270-23074-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 04 May 2018 17:01:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 04 May 2018 17:01:18 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 1/5] qemu-options: Remove remainders of the -tdf 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: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The -tdf options has been removed with d07aa197c5a1556449361a0cbb5108e2, but apparently I forgot to remove the corresponding two lines from qemu-options.hx, so this option is still "available" and just silently ignored. Kill it now for good. Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- qemu-options.hx | 3 --- 1 file changed, 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index c611766..44daa10 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3924,9 +3924,6 @@ DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_p= it_reinjection, HXCOMM Deprecated by -machine kernel_irqchip=3Don|off property DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386) =20 -HXCOMM Deprecated (ignored) -DEF("tdf", 0, QEMU_OPTION_tdf,"", QEMU_ARCH_ALL) - DEF("msg", HAS_ARG, QEMU_OPTION_msg, "-msg timestamp[=3Don|off]\n" " change the format of messages\n" --=20 1.8.3.1 From nobody Wed Oct 29 17:11:31 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525453689990418.60521386072287; Fri, 4 May 2018 10:08:09 -0700 (PDT) Received: from localhost ([::1]:35555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEeBl-0001Np-A2 for importer@patchew.org; Fri, 04 May 2018 13:08:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEe5E-00054X-FV for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEe5A-0003dV-Ih for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:24 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42592 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 1fEe5A-0003co-Dd for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AEF6C8182D24 for ; Fri, 4 May 2018 17:01:19 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-204-196.brq.redhat.com [10.40.204.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71EB97C3E; Fri, 4 May 2018 17:01:18 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Date: Fri, 4 May 2018 19:01:07 +0200 Message-Id: <1525453270-23074-3-git-send-email-thuth@redhat.com> In-Reply-To: <1525453270-23074-1-git-send-email-thuth@redhat.com> References: <1525453270-23074-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 04 May 2018 17:01:19 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 04 May 2018 17:01:19 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 2/5] qemu-options: Bail out on unsupported options instead of silently ignoring them 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: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The dangling remainder of the -tdf option revealed a deficiency in our option parsing: Options that have been declared, but are not supported in the switch-case statement in vl.c and not handled in the OS-specifc os_parse_cmd_args() functions are currently silently ignored. We should rather tell the users that they specified something that we can not handle, so let's print an error message and exit instead. Reported-by: Markus Armbruster Signed-off-by: Thomas Huth --- include/qemu-common.h | 2 +- os-posix.c | 6 +++++- os-win32.c | 4 ++-- vl.c | 5 ++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 8a4f63c..85f4749 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -137,7 +137,7 @@ char *qemu_find_file(int type, const char *name); /* OS specific functions */ void os_setup_early_signal_handling(void); char *os_find_datadir(void); -void os_parse_cmd_args(int index, const char *optarg); +int os_parse_cmd_args(int index, const char *optarg); =20 #include "qemu/module.h" =20 diff --git a/os-posix.c b/os-posix.c index 24eb700..9ce6f74 100644 --- a/os-posix.c +++ b/os-posix.c @@ -165,7 +165,7 @@ static bool os_parse_runas_uid_gid(const char *optarg) * Parse OS specific command line options. * return 0 if option handled, -1 otherwise */ -void os_parse_cmd_args(int index, const char *optarg) +int os_parse_cmd_args(int index, const char *optarg) { switch (index) { #ifdef CONFIG_SLIRP @@ -199,7 +199,11 @@ void os_parse_cmd_args(int index, const char *optarg) fips_set_state(true); break; #endif + default: + return -1; } + + return 0; } =20 static void change_process_uid(void) diff --git a/os-win32.c b/os-win32.c index 586a7c7..0674f94 100644 --- a/os-win32.c +++ b/os-win32.c @@ -93,9 +93,9 @@ void os_set_line_buffering(void) * Parse OS specific command line options. * return 0 if option handled, -1 otherwise */ -void os_parse_cmd_args(int index, const char *optarg) +int os_parse_cmd_args(int index, const char *optarg) { - return; + return -1; } =20 int qemu_create_pidfile(const char *filename) diff --git a/vl.c b/vl.c index 806eec2..457e93b 100644 --- a/vl.c +++ b/vl.c @@ -4042,7 +4042,10 @@ int main(int argc, char **argv, char **envp) } break; default: - os_parse_cmd_args(popt->index, optarg); + if (os_parse_cmd_args(popt->index, optarg)) { + error_report("Option not supported in this build"); + exit(1); + } } } } --=20 1.8.3.1 From nobody Wed Oct 29 17:11:31 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525453555274727.2353509453975; Fri, 4 May 2018 10:05:55 -0700 (PDT) Received: from localhost ([::1]:35535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEe9V-0007l2-Cn for importer@patchew.org; Fri, 04 May 2018 13:05:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEe5E-00054W-FD for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEe5B-0003em-Uo for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:24 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51314 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 1fEe5B-0003eK-Qp for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 56261406FA17 for ; Fri, 4 May 2018 17:01:21 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-204-196.brq.redhat.com [10.40.204.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19A917C49; Fri, 4 May 2018 17:01:19 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Date: Fri, 4 May 2018 19:01:08 +0200 Message-Id: <1525453270-23074-4-git-send-email-thuth@redhat.com> In-Reply-To: <1525453270-23074-1-git-send-email-thuth@redhat.com> References: <1525453270-23074-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 04 May 2018 17:01:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 04 May 2018 17:01:21 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 3/5] qemu-options: Remove deprecated -no-kvm-pit-reinjection 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: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Deprecated since the beginning when it was added for compatibility with the ancient qemu-kvm fork of QEMU, and it even printed out the deprecation warning since right from the start (i.e. QEMU v1.3.0), so it's really time to remove this now. Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- qemu-doc.texi | 5 ----- qemu-options.hx | 4 ---- vl.c | 12 ------------ 3 files changed, 21 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index 0ed0f19..2047ba5 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2786,11 +2786,6 @@ which is the default. =20 @section System emulator command line arguments =20 -@subsection -no-kvm-pit-reinjection (since 1.3.0) - -The ``-no-kvm-pit-reinjection'' argument is now a -synonym for setting ``-global kvm-pit.lost_tick_policy=3Ddiscard''. - @subsection -no-kvm-irqchip (since 1.3.0) =20 The ``-no-kvm-irqchip'' argument is now a synonym for diff --git a/qemu-options.hx b/qemu-options.hx index 44daa10..9c0d60d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3917,10 +3917,6 @@ ETEXI HXCOMM Deprecated by -machine accel=3Dtcg property DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) =20 -HXCOMM Deprecated by kvm-pit driver properties -DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_pit_reinjection, - "", QEMU_ARCH_I386) - HXCOMM Deprecated by -machine kernel_irqchip=3Don|off property DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386) =20 diff --git a/vl.c b/vl.c index 457e93b..bbe94ba 100644 --- a/vl.c +++ b/vl.c @@ -3705,18 +3705,6 @@ int main(int argc, char **argv, char **envp) olist =3D qemu_find_opts("machine"); qemu_opts_parse_noisily(olist, "accel=3Dtcg", false); break; - case QEMU_OPTION_no_kvm_pit_reinjection: { - static GlobalProperty kvm_pit_lost_tick_policy =3D { - .driver =3D "kvm-pit", - .property =3D "lost_tick_policy", - .value =3D "discard", - }; - - warn_report("deprecated, replaced by " - "-global kvm-pit.lost_tick_policy=3Ddiscard"); - qdev_prop_register_global(&kvm_pit_lost_tick_policy); - break; - } case QEMU_OPTION_accel: accel_opts =3D qemu_opts_parse_noisily(qemu_find_opts("acc= el"), optarg, true); --=20 1.8.3.1 From nobody Wed Oct 29 17:11:31 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 1525453406324555.0824069114637; Fri, 4 May 2018 10:03:26 -0700 (PDT) Received: from localhost ([::1]:35519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEe6y-0005tF-Uu for importer@patchew.org; Fri, 04 May 2018 13:03:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEe5E-00054Y-LT for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEe5D-0003g0-T1 for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:24 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51316 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 1fEe5D-0003fT-Of for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49BDB406C776 for ; Fri, 4 May 2018 17:01:23 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-204-196.brq.redhat.com [10.40.204.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5A787C3E; Fri, 4 May 2018 17:01:21 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Date: Fri, 4 May 2018 19:01:09 +0200 Message-Id: <1525453270-23074-5-git-send-email-thuth@redhat.com> In-Reply-To: <1525453270-23074-1-git-send-email-thuth@redhat.com> References: <1525453270-23074-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 04 May 2018 17:01:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 04 May 2018 17:01:23 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 4/5] qemu-options: Remove deprecated -no-kvm-irqchip 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: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We've never documented this option in our qemu-doc, so apart from the users that already used the old qemu-kvm fork before, most users should not be aware of this option at all. It's been marked as deprecated in the source code for a long time already, and officially marked as deprecated in the documentation since QEMU v2.10, so it should be fine to remove this now. Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- qemu-doc.texi | 5 ----- qemu-options.hx | 3 --- vl.c | 5 ----- 3 files changed, 13 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index 2047ba5..9db156b 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2786,11 +2786,6 @@ which is the default. =20 @section System emulator command line arguments =20 -@subsection -no-kvm-irqchip (since 1.3.0) - -The ``-no-kvm-irqchip'' argument is now a synonym for -setting ``-machine kernel_irqchip=3Doff''. - @subsection -no-kvm (since 1.3.0) =20 The ``-no-kvm'' argument is now a synonym for setting diff --git a/qemu-options.hx b/qemu-options.hx index 9c0d60d..870a363 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3917,9 +3917,6 @@ ETEXI HXCOMM Deprecated by -machine accel=3Dtcg property DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) =20 -HXCOMM Deprecated by -machine kernel_irqchip=3Don|off property -DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386) - DEF("msg", HAS_ARG, QEMU_OPTION_msg, "-msg timestamp[=3Don|off]\n" " change the format of messages\n" diff --git a/vl.c b/vl.c index bbe94ba..d8c3b09 100644 --- a/vl.c +++ b/vl.c @@ -3149,11 +3149,6 @@ int main(int argc, char **argv, char **envp) exit(1); } switch(popt->index) { - case QEMU_OPTION_no_kvm_irqchip: { - olist =3D qemu_find_opts("machine"); - qemu_opts_parse_noisily(olist, "kernel_irqchip=3Doff", fal= se); - break; - } case QEMU_OPTION_cpu: /* hw initialization will check this */ cpu_model =3D optarg; --=20 1.8.3.1 From nobody Wed Oct 29 17:11:31 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 1525453406157827.9280033946462; Fri, 4 May 2018 10:03:26 -0700 (PDT) Received: from localhost ([::1]:35521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEe75-0005yR-Tw for importer@patchew.org; Fri, 04 May 2018 13:03:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEe5G-00054t-AC for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEe5F-0003iK-GI for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:26 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51318 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 1fEe5F-0003hm-D1 for qemu-devel@nongnu.org; Fri, 04 May 2018 13:01:25 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5ABD406C749 for ; Fri, 4 May 2018 17:01:24 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-204-196.brq.redhat.com [10.40.204.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id A86CC83B8D; Fri, 4 May 2018 17:01:23 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Date: Fri, 4 May 2018 19:01:10 +0200 Message-Id: <1525453270-23074-6-git-send-email-thuth@redhat.com> In-Reply-To: <1525453270-23074-1-git-send-email-thuth@redhat.com> References: <1525453270-23074-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 04 May 2018 17:01:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 04 May 2018 17:01:24 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 5/5] qemu-options: Remove deprecated -no-kvm 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: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We've never documented this option in our qemu-doc, so apart from the users that already used the old qemu-kvm fork before, most users should not be aware of this option at all. It's been marked as deprecated in the source code for a long time already, and officially marked as deprecated in the documentation since QEMU v2.10, so it should be fine to remove this now. Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- qemu-doc.texi | 5 ----- qemu-options.hx | 3 --- vl.c | 4 ---- 3 files changed, 12 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index 9db156b..b6e0a18 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2786,11 +2786,6 @@ which is the default. =20 @section System emulator command line arguments =20 -@subsection -no-kvm (since 1.3.0) - -The ``-no-kvm'' argument is now a synonym for setting -``-machine accel=3Dtcg''. - @subsection -vnc tls (since 2.5.0) =20 The ``-vnc tls'' argument is now a synonym for setting diff --git a/qemu-options.hx b/qemu-options.hx index 870a363..d77a968 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3914,9 +3914,6 @@ STEXI Enable FIPS 140-2 compliance mode. ETEXI =20 -HXCOMM Deprecated by -machine accel=3Dtcg property -DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) - DEF("msg", HAS_ARG, QEMU_OPTION_msg, "-msg timestamp[=3Don|off]\n" " change the format of messages\n" diff --git a/vl.c b/vl.c index d8c3b09..2ac41e2 100644 --- a/vl.c +++ b/vl.c @@ -3696,10 +3696,6 @@ int main(int argc, char **argv, char **envp) exit(1); } break; - case QEMU_OPTION_no_kvm: - olist =3D qemu_find_opts("machine"); - qemu_opts_parse_noisily(olist, "accel=3Dtcg", false); - break; case QEMU_OPTION_accel: accel_opts =3D qemu_opts_parse_noisily(qemu_find_opts("acc= el"), optarg, true); --=20 1.8.3.1