From nobody Fri May 3 17:16:40 2024 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=1639556680; cv=none; d=zohomail.com; s=zohoarc; b=UoanM2Z/jRyFi2DJm1mCciQOi/VeiuInNtvP/OSxrQNmftOr1TCxeMajmAAIQDbgPcGZ7qDshfOEdNVxIc+8W34q5Ugaxt/Foj15qBuyn1ETwCtUtN8RU/9O2bHPL31PMMbx2JisX3TlNjuWa64JNxf3e18NVMsQoKsxYxFQ1CA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639556680; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=p07RHNvWzcBrZLANCifZrsrSFZCVpN3ffkhLC49rsmk=; b=DEIL6qwBNVrJ7OC+oCApvSiQ3rJ5RbHqSb/mbcGDH7r9jLKsZIyDV2tfFt48kHJv4ineKvFUJ44fLikF3MnGIqyhS89xuTR64R+RN8rXLR9OzHEU9ZPouey44jtMEeje52hLEmxVzBSg+FCnBBwz5ozq6MGUe8GO0OkmMgZIVCs= 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 1639556680817658.7504828554725; Wed, 15 Dec 2021 00:24:40 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-269-9i9wblFeM7ODY8Iz2g-3zg-1; Wed, 15 Dec 2021 03:24:36 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7921439382; Wed, 15 Dec 2021 08:24:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2473F88860; Wed, 15 Dec 2021 08:24:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 216814BB7C; Wed, 15 Dec 2021 08:24:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BF8ORWR016274 for ; Wed, 15 Dec 2021 03:24:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 857F72B5BD; Wed, 15 Dec 2021 08:24:27 +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 C325F2AA9D; Wed, 15 Dec 2021 08:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639556679; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=p07RHNvWzcBrZLANCifZrsrSFZCVpN3ffkhLC49rsmk=; b=USdevtNjSxXbfgvoCNA0ONibYhsgt0rEkz7LXZ8A+4Sh/JZqi4za9tvVfJ5/B7pLQqNWBM 2uRegW19Ew7Pom8I9hPnd5S0Epo+2ZUFVXkbmLtaAwA8FzJPPhsIgcYwTwrxq7yHKvpixb rcF0W2LWqV1BaFFFC34VgUdbeHXnIC0= X-MC-Unique: 9i9wblFeM7ODY8Iz2g-3zg-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PATCH] qemu-options: Remove the deprecated -no-quit option Date: Wed, 15 Dec 2021 09:24:17 +0100 Message-Id: <20211215082417.180735-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: qemu-trivial@nongnu.org, Paolo Bonzini , John Snow , Gerd Hoffmann , libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: 1639556682235100003 Content-Type: text/plain; charset="utf-8" This option was just a wrapper around the -display ...,window-close=3Doff parameter, and the name "no-quit" is rather confusing compared to "window-close" (since there are still other means to quit the emulator), so let's remove this now. Signed-off-by: Thomas Huth Reviewed-by: Markus Armbruster --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 7 +++++++ qemu-options.hx | 8 -------- softmmu/vl.c | 8 +------- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 7f12f53713..6f85afdee4 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -134,12 +134,6 @@ specified. Use ``-display sdl,window-close=3D...`` instead (i.e. with a minus instead= of an underscore between "window" and "close"). =20 -``-no-quit`` (since 6.1) -'''''''''''''''''''''''' - -The ``-no-quit`` is a synonym for ``-display ...,window-close=3Doff`` which -should be used instead. - ``-alt-grab`` and ``-display sdl,alt_grab=3Don`` (since 6.2) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index f92b8bd738..380a1b30ea 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -330,6 +330,13 @@ RISC-V firmware not booted by default (removed in 5.1) QEMU 5.1 changes the default behaviour from ``-bios none`` to ``-bios defa= ult`` for the RISC-V ``virt`` machine and ``sifive_u`` machine. =20 +``-no-quit`` (removed in 7.0) +''''''''''''''''''''''''''''' + +The ``-no-quit`` was a synonym for ``-display ...,window-close=3Doff`` whi= ch +should be used instead. + + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/qemu-options.hx b/qemu-options.hx index ae2c6dbbfc..e2b73f6e5d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2002,14 +2002,6 @@ SRST ``-display sdl,grab-mod=3Drctrl`` instead. ERST =20 -DEF("no-quit", 0, QEMU_OPTION_no_quit, - "-no-quit disable SDL/GTK window close capability (deprecated)\= n", QEMU_ARCH_ALL) -SRST -``-no-quit`` - Disable window close capability (SDL and GTK only). This option is - deprecated, please use ``-display ...,window-close=3Doff`` instead. -ERST - DEF("sdl", 0, QEMU_OPTION_sdl, "-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL) SRST diff --git a/softmmu/vl.c b/softmmu/vl.c index 620a1f1367..163ab355f5 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1938,7 +1938,7 @@ static void qemu_create_early_backends(void) "for SDL, ignoring option"); } if (dpy.has_window_close && !use_gtk && !use_sdl) { - error_report("-no-quit is only valid for GTK and SDL, " + error_report("window-close is only valid for GTK and SDL, " "ignoring option"); } =20 @@ -3298,12 +3298,6 @@ void qemu_init(int argc, char **argv, char **envp) warn_report("-ctrl-grab is deprecated, please use " "-display sdl,grab-mod=3Drctrl instead."); break; - case QEMU_OPTION_no_quit: - dpy.has_window_close =3D true; - dpy.window_close =3D false; - warn_report("-no-quit is deprecated, please use " - "-display ...,window-close=3Doff instead."); - break; case QEMU_OPTION_sdl: warn_report("-sdl is deprecated, use -display sdl instead.= "); #ifdef CONFIG_SDL --=20 2.27.0