From nobody Mon Feb 9 02:12:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652291527; cv=none; d=zohomail.com; s=zohoarc; b=iHRnrqDJ7L/A726Ov1UrA/KMAov89GylqjnEV8MnXguZjv/LQDTZMGm/LOaIipHqINdRAV3sueJZR4Ymu5JIALIlkZhx4mWS+eRWFBaEMim8BK5nizf+gIXoFf2caBA4XWl+39KyHmv8nHm7HnROhVXTGzzGVm5UMm2GEsfr3jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652291527; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w1Qa8eWiKw7oxT4a4786YMEFlQyElPX/kzcM6YGI3EA=; b=lH/d29L6po/uLwObvFSuWQbShJpcjluE24sa2tfhlf7zGiUcLPdd4ueWKYp9axjmjrmqTSz8rJAG5NDOZa7bRCcZ7zZ/Gxyrz1q+Dt0J2gOwyuF2Vf6LzH9QwLXdwP45N/3XpLR/ThZ4ClBquVGcf8DnUsCrWUsypZBl6I/1s80= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 16522915275641016.3447763165171; Wed, 11 May 2022 10:52:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-85-bYsDwTSzORqfjBX6Xp8Wgw-1; Wed, 11 May 2022 13:52:03 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 55BEF2932489; Wed, 11 May 2022 17:52:00 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F54D416385; Wed, 11 May 2022 17:51:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 159CB194707A; Wed, 11 May 2022 17:51:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0A4821947041 for ; Wed, 11 May 2022 17:51:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E1D8D40CF8EE; Wed, 11 May 2022 17:51:57 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59A2B400E872; Wed, 11 May 2022 17:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652291526; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=w1Qa8eWiKw7oxT4a4786YMEFlQyElPX/kzcM6YGI3EA=; b=G5SBGWVIDFTMGIvzKlWm5WX4dU7J+oLgekKkfW9sdr9O3gUwpt9wVoGmBV2kkqBJQLryUG BDpqnboOV3R1O+ICJtnCK9bVFUfnb1sJELFp73tjOOyZQnvVW5GrH+l/iCnHi+BgjZWB/j 8p70BGRDqSV6lH0HrAaapc7PjI7sIGo= X-MC-Unique: bYsDwTSzORqfjBX6Xp8Wgw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH 3/3] ui: Remove deprecated options "-sdl" and "-curses" Date: Wed, 11 May 2022 19:51:47 +0200 Message-Id: <20220511175147.917707-4-thuth@redhat.com> In-Reply-To: <20220511175147.917707-1-thuth@redhat.com> References: <20220511175147.917707-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: libvir-list@redhat.com, Paolo Bonzini , Eric Blake , Markus Armbruster Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652291528898100007 Content-Type: text/plain; charset="utf-8"; x-default="true" We have "-sdl" and "-curses", but no "-gtk" and no "-cocoa" ... these old-style options are rather confusing than helpful nowadays. Now that the deprecation period is over, let's remove them, so we get a cleaner interface (where "-display" is the only way to select the user interface). Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/about/deprecated.rst | 10 ---------- docs/about/removed-features.rst | 10 ++++++++++ softmmu/vl.c | 19 ------------------- qemu-options.hx | 24 ++---------------------- 4 files changed, 12 insertions(+), 51 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ce7a5b97fc..0ed0e9cb13 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -109,16 +109,6 @@ other options have been processed. This will either h= ave no effect (if if they were not given. The property is therefore useless and should not = be specified. =20 -``-sdl`` (since 6.2) -'''''''''''''''''''' - -Use ``-display sdl`` instead. - -``-curses`` (since 6.2) -''''''''''''''''''''''' - -Use ``-display curses`` instead. - ``-watchdog`` (since 6.2) ''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 51bfc844f6..0d5ffb353e 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -371,6 +371,16 @@ Use ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` inst= ead. =20 Use ``-display sdl,grab-mod=3Drctrl`` instead. =20 +``-sdl`` (removed in 7.1) +''''''''''''''''''''''''' + +Use ``-display sdl`` instead. + +``-curses`` (removed in 7.1) +'''''''''''''''''''''''''''' + +Use ``-display curses`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/softmmu/vl.c b/softmmu/vl.c index 90a0a4d393..9887c71791 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2845,16 +2845,6 @@ void qemu_init(int argc, char **argv, char **envp) nographic =3D true; dpy.type =3D DISPLAY_TYPE_NONE; break; - case QEMU_OPTION_curses: - warn_report("-curses is deprecated, " - "use -display curses instead."); -#ifdef CONFIG_CURSES - dpy.type =3D DISPLAY_TYPE_CURSES; -#else - error_report("curses or iconv support is disabled"); - exit(1); -#endif - break; case QEMU_OPTION_portrait: graphic_rotate =3D 90; break; @@ -3205,15 +3195,6 @@ void qemu_init(int argc, char **argv, char **envp) dpy.has_full_screen =3D true; dpy.full_screen =3D true; break; - case QEMU_OPTION_sdl: - warn_report("-sdl is deprecated, use -display sdl instead.= "); -#ifdef CONFIG_SDL - dpy.type =3D DISPLAY_TYPE_SDL; - break; -#else - error_report("SDL support is disabled"); - exit(1); -#endif case QEMU_OPTION_pidfile: pid_file =3D optarg; break; diff --git a/qemu-options.hx b/qemu-options.hx index 0fa873d088..1abf3e500f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1946,9 +1946,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, , QEMU_ARCH_ALL) SRST ``-display type`` - Select type of display to use. This option is a replacement for the - old style -sdl/-curses/... options. Use ``-display help`` to list - the available display types. Valid values for type are + Select type of display to use. Use ``-display help`` to list the avail= able + display types. Valid values for type are =20 ``spice-app[,gl=3Don|off]`` Start QEMU as a Spice server and launch the default Spice client @@ -2050,25 +2049,6 @@ SRST Use C-a h for help on switching between the console and monitor. ERST =20 -DEF("curses", 0, QEMU_OPTION_curses, - "-curses shorthand for -display curses\n", - QEMU_ARCH_ALL) -SRST -``-curses`` - Normally, if QEMU is compiled with graphical window support, it - displays output such as guest graphics, guest console, and the QEMU - monitor in a window. With this option, QEMU can display the VGA - output when in text mode using a curses/ncurses interface. Nothing - is displayed in graphical mode. -ERST - -DEF("sdl", 0, QEMU_OPTION_sdl, - "-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL) -SRST -``-sdl`` - Enable SDL. -ERST - #ifdef CONFIG_SPICE DEF("spice", HAS_ARG, QEMU_OPTION_spice, "-spice [port=3Dport][,tls-port=3Dsecured-port][,x509-dir=3D]\n" --=20 2.27.0