From nobody Fri Apr 26 11:18:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549545516659132.8932395961334; Thu, 7 Feb 2019 05:18:36 -0800 (PST) Received: from localhost ([127.0.0.1]:39889 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjZY-0006MM-Hj for importer@patchew.org; Thu, 07 Feb 2019 08:18:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjWG-0004Bt-7m for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:15:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grjWF-0007de-BI for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:15:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54726) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grjWE-0007d5-Ve; Thu, 07 Feb 2019 08:15:07 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 28956369CD; Thu, 7 Feb 2019 13:15:06 +0000 (UTC) Received: from thuth.com (ovpn-116-84.ams2.redhat.com [10.36.116.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8340E18780; Thu, 7 Feb 2019 13:15:00 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Peter Maydell , qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 14:14:55 +0100 Message-Id: <1549545296-18903-2-git-send-email-thuth@redhat.com> In-Reply-To: <1549545296-18903-1-git-send-email-thuth@redhat.com> References: <1549545296-18903-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 07 Feb 2019 13:15:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] qemu-deprecated: Remove -virtioconsole and -no-frame for good 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: qemu-trivial@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The two sections have accidentally been added again during the merge of Paolo's and Gerd's trees. Fixes: 3e29da9fd81002a0c03041aaa26dea6d9dd9bd65 Signed-off-by: Thomas Huth Reviewed-by: Peter Maydell --- qemu-deprecated.texi | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 80b0702..90e5860 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -37,18 +37,6 @@ would automatically enable USB support on the machine ty= pe. If using the new syntax, USB support must be explicitly enabled via the ``-machine usb=3Don'' argument. =20 -@subsection -virtioconsole (since 3.0.0) - -Option @option{-virtioconsole} has been replaced by -@option{-device virtconsole}. - -@subsection -no-frame (since 2.12.0) - -The @code{--no-frame} argument works with SDL 1.2 only. The other user -interfaces never implemented this in the first place. So this will be -removed together with SDL 1.2 support. ->>>>>>> remotes/bonzini/tags/for-upstream - @subsection -clock (since 3.0.0) =20 The @code{-clock} option is ignored since QEMU version 1.7.0. There is no --=20 1.8.3.1 From nobody Fri Apr 26 11:18:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549545459996689.7435808673806; Thu, 7 Feb 2019 05:17:39 -0800 (PST) Received: from localhost ([127.0.0.1]:39885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjYb-0005dG-SH for importer@patchew.org; Thu, 07 Feb 2019 08:17:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjWP-0004Jq-8v for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:15:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grjWJ-0007lW-OR for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:15:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60328) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grjWJ-0007h8-IZ; Thu, 07 Feb 2019 08:15:11 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C53F2AB403; Thu, 7 Feb 2019 13:15:10 +0000 (UTC) Received: from thuth.com (ovpn-116-84.ams2.redhat.com [10.36.116.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E8157C82B; Thu, 7 Feb 2019 13:15:06 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Peter Maydell , qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 14:14:56 +0100 Message-Id: <1549545296-18903-3-git-send-email-thuth@redhat.com> In-Reply-To: <1549545296-18903-1-git-send-email-thuth@redhat.com> References: <1549545296-18903-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 07 Feb 2019 13:15:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] qemu-options: Remove deprecated option -clock 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: qemu-trivial@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The option is only a dummy since a long time. We've finally deprecated it in QEMU v3.0, so it's time to remove it now. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qemu-deprecated.texi | 5 ----- qemu-options.hx | 3 --- vl.c | 6 ------ 3 files changed, 14 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 90e5860..fe90555 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -37,11 +37,6 @@ would automatically enable USB support on the machine ty= pe. If using the new syntax, USB support must be explicitly enabled via the ``-machine usb=3Don'' argument. =20 -@subsection -clock (since 3.0.0) - -The @code{-clock} option is ignored since QEMU version 1.7.0. There is no -replacement since it is not needed anymore. - @subsection -drive file=3Djson:@{...@{'driver':'file'@}@} (since 3.0) =20 The 'file' driver for drives is no longer appropriate for character or host diff --git a/qemu-options.hx b/qemu-options.hx index 06ef1a7..77bd98e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3444,9 +3444,6 @@ Load the contents of @var{file} as an option ROM. This option is useful to load things like EtherBoot. ETEXI =20 -HXCOMM Silently ignored for compatibility -DEF("clock", HAS_ARG, QEMU_OPTION_clock, "", QEMU_ARCH_ALL) - DEF("rtc", HAS_ARG, QEMU_OPTION_rtc, \ "-rtc [base=3Dutc|localtime|][,clock=3Dhost|rt|vm][,driftfix= =3Dnone|slew]\n" \ " set the RTC base and clock, enable drift fix for cloc= k ticks (x86 only)\n", diff --git a/vl.c b/vl.c index 9e4dba7..90ff233 100644 --- a/vl.c +++ b/vl.c @@ -3735,12 +3735,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_old_param: old_param =3D 1; break; - case QEMU_OPTION_clock: - /* Clock options no longer exist. Keep this option for - * backward compatibility. - */ - warn_report("This option is ignored and will be removed so= on"); - break; case QEMU_OPTION_rtc: opts =3D qemu_opts_parse_noisily(qemu_find_opts("rtc"), op= targ, false); --=20 1.8.3.1