From nobody Sun Feb 8 14:53:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1652881503; cv=none; d=zohomail.com; s=zohoarc; b=CTPe+AC+dIUWYvGza5huJcqc4qNTG2+IMQ8VaVU5MQZmkOa3n4Z2TMygdjdE8TojkyP56zG7mKqpgGmAs8Nk/WNXPwpj7a0TlQdAquMQt3EV3TRlgcUIXuEGqnKNFp6HlA3qKM3GX5/eqeN9UN4NxejUe+/47jLC29nOK+y7PSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652881503; 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=l/YOvuA6DmKdusT6myqPAnHY1w4jnyI9kECwm3LA2BY=; b=T6quhhFE1d2Fk0Ix/x5cyXrTM8aX+mUV6yxllFLV8Q8klDvcnQmYSp69TRb3nf4i5xS9sPr4NlQj5P448HaugUUZ6qFND3rBy6bVfVydvtv6Upk0KZjVk0jq4A41XhiGjsvD550tE2J/kp3JJRjStpD3CjYF2c4T/aY5w/CSsuI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1652881503548343.65450196666336; Wed, 18 May 2022 06:45:03 -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-56-HN8roNVEP36tNMUxqf3m_A-1; Wed, 18 May 2022 09:44:56 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C1571C161AC; Wed, 18 May 2022 13:44:54 +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 853DB1415100; Wed, 18 May 2022 13:44:54 +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 40E2B1947B91; Wed, 18 May 2022 13:44:54 +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 E17591947B90 for ; Wed, 18 May 2022 13:44:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AFD1540CF8F6; Wed, 18 May 2022 13:44:52 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id C113A40CF8EE; Wed, 18 May 2022 13:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652881502; 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=l/YOvuA6DmKdusT6myqPAnHY1w4jnyI9kECwm3LA2BY=; b=L/TTRISOi5cW56JR+Mj/sxUJpugJIRLf6pGcVev+f6KJZrhJ0P+BmeK16if8vX83HbXyh+ jQeua/TULp6VbjCd95W/Cbw4d9kL1ZUEJxRb8W15lUb+SqTh1i3lAL595ErMMPyQ3JPOAH BoH7JwUD2Jab8ZinVhPEMFIJ4NWrTe0= X-MC-Unique: HN8roNVEP36tNMUxqf3m_A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH v2 3/3] ui: Remove deprecated options "-sdl" and "-curses" Date: Wed, 18 May 2022 15:44:46 +0200 Message-Id: <20220518134446.211632-4-thuth@redhat.com> In-Reply-To: <20220518134446.211632-1-thuth@redhat.com> References: <20220518134446.211632-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.7 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652881504449100001 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). Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- 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 562a133f18..e19bcba242 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -81,16 +81,6 @@ the process listing. This is replaced by the new ``passw= ord-secret`` option which lets the password be securely provided on the command line using a ``secret`` object instance. =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 4c9e001c35..c7b9dadd5d 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -386,6 +386,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 484e9d9921..4c1e94b00e 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2800,16 +2800,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; @@ -3176,15 +3166,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 011caad530..3efca0e7f9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1981,9 +1981,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 @@ -2085,25 +2084,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