From nobody Sat Apr 27 23:20:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629883303; cv=none; d=zohomail.com; s=zohoarc; b=aoF77HaMGAzBHLQA+OiqCNYQr/sm6N/Yj2Hnf945CyCW6oOVGcdNnmu6mtoo18D1F1YStgam/1k0kyyf9i0ZQNiDV0GUetshdOsKKcIzJQgAfaxdcBghntUtJei3O0FZlnKA6vJYyhdOnRDDO3U+dLi31gu4qFeUgc2GVckyNiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629883303; 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=d/6FmMualMTN0dGd7iztwoD/vFe6KRsr9flcDFh2CFk=; b=KwTYa4NFMwaQPjSUHdrrYwq1QzVAImIdFrqwQirgDwnVTxWFWxHI1ZurUNxzxvsufecgLD/TZM4zqBqWFP6/azTdOXqywXeTLSO2xVow9muFS1z1QYpCmwSmwd4orzknPCpoIfE0RTsXbGacwFYPCJLk2ACUe+wHNP1HG0vuk7s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1629883303647144.05087107479812; Wed, 25 Aug 2021 02:21:43 -0700 (PDT) Received: from localhost ([::1]:34154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIp6L-0001c5-V8 for importer@patchew.org; Wed, 25 Aug 2021 05:21:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIp5L-0000EV-Rm for qemu-devel@nongnu.org; Wed, 25 Aug 2021 05:20:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIp5I-0004EG-S3 for qemu-devel@nongnu.org; Wed, 25 Aug 2021 05:20:39 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-479-DKkb98WMO4ubiTeJNxwcEw-1; Wed, 25 Aug 2021 05:20:34 -0400 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 D7BC5100A24F for ; Wed, 25 Aug 2021 09:20:33 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9174360C5A; Wed, 25 Aug 2021 09:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629883236; h=from:from: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; bh=d/6FmMualMTN0dGd7iztwoD/vFe6KRsr9flcDFh2CFk=; b=PjBKNcjyBowTxnSl2yC3zFBccpFSdMtHfide6XrTmdz5i8jo0CTs+aC7VyJWPzn6qNgLkQ jbFcLnUuNjK3gdcWTgibAQXhLUot0etAUBMu5v7YCOtp74g/U2fh2Wdw6avcZKH1Hg5IGD lm05W+LNS2OC0AonKYURP3beB7yGIlE= X-MC-Unique: DKkb98WMO4ubiTeJNxwcEw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH v2 1/3] softmmu/vl: Add a "grab-mod" parameter to the -display sdl option Date: Wed, 25 Aug 2021 11:20:21 +0200 Message-Id: <20210825092023.81396-2-thuth@redhat.com> In-Reply-To: <20210825092023.81396-1-thuth@redhat.com> References: <20210825092023.81396-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.747, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629883304971100002 Content-Type: text/plain; charset="utf-8" The -display sdl option is not using QAPI internally yet, and uses hand- crafted parsing instead (see parse_display() in vl.c), which is quite ugly, since most of the other code is using the QAPIfied DisplayOption already. Unfortunately, the "alt_grab" and "ctrl_grab" use underscores in their names which has recently been forbidden in new QAPI code, so a straight conversion is not possible. While we could add some exceptions to the QAPI schema parser for this, the way these parameters have been designed was maybe a bad idea anyway: First, it's not possible to enable both parameters at the same time, thus instead of two boolean parameters it would be better to have only one multi-choice parameter instead. Second, the naming is also somewhat unfortunate since the "alt_grab" parameter is not about the ALT key, but rather about the left SHIFT key that has to be used additionally when the parameter is enabled. So instead of trying to QAPIfy "alt_grab" and "ctrl_grab", let's rather introduce an alternative to these parameters instead, a new parameter called "grab-mod" which can either be set to "lshift-lctrl-lalt" or to "rctrl". In case we ever want to support additional modes later, we can then also simply extend the list of supported strings here. Signed-off-by: Thomas Huth Reviewed-by: Gerd Hoffmann --- qemu-options.hx | 6 +++++- softmmu/vl.c | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 83aa59a920..0bff756ded 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1834,7 +1834,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #endif #if defined(CONFIG_SDL) "-display sdl[,alt_grab=3Don|off][,ctrl_grab=3Don|off][,gl=3Don|core|e= s|off]\n" - " [,show-cursor=3Don|off][,window-close=3Don|off]\n" + " [,grab-mod=3D][,show-cursor=3Don|off][,window-close= =3Don|off]\n" #endif #if defined(CONFIG_GTK) "-display gtk[,full-screen=3Don|off][,gl=3Don|off][,grab-on-hover=3Don= |off]\n" @@ -1880,6 +1880,10 @@ SRST window; see the SDL documentation for other possibilities). Valid parameters are: =20 + ``grab-mod=3D`` : Used to select the modifier keys for toggl= ing + the mouse grabbing in conjunction with the "g" key. `` can be + either `lshift-lctrl-lalt` or `rctrl`. + ``alt_grab=3Don|off`` : Use Control+Alt+Shift-g to toggle mouse gr= abbing =20 ``ctrl_grab=3Don|off`` : Use Right-Control-g to toggle mouse grabb= ing diff --git a/softmmu/vl.c b/softmmu/vl.c index 5ca11e7469..294990debf 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1017,15 +1017,24 @@ static void parse_display(const char *p) * parse_display_qapi() due to some options not in * DisplayOptions, specifically: * - ctrl_grab + alt_grab - * Not clear yet what happens to them long-term. Should - * replaced by something better or deprecated and dropped. + * They can't be moved into the QAPI since they use underscore= s, + * thus they will get replaced by "grab-mod" in the long term */ #if defined(CONFIG_SDL) dpy.type =3D DISPLAY_TYPE_SDL; while (*opts) { const char *nextopt; =20 - if (strstart(opts, ",alt_grab=3D", &nextopt)) { + if (strstart(opts, ",grab-mod=3D", &nextopt)) { + opts =3D nextopt; + if (strstart(opts, "lshift-lctrl-lalt", &nextopt)) { + alt_grab =3D 1; + } else if (strstart(opts, "rctrl", &nextopt)) { + ctrl_grab =3D 1; + } else { + goto invalid_sdl_args; + } + } else if (strstart(opts, ",alt_grab=3D", &nextopt)) { opts =3D nextopt; if (strstart(opts, "on", &nextopt)) { alt_grab =3D 1; --=20 2.27.0 From nobody Sat Apr 27 23:20:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629883421; cv=none; d=zohomail.com; s=zohoarc; b=Koc5VujlWQh4WfljEP0CUqXFO6xYkAGfnbIG9ZOgI5nU/qo64dWkM5Vo1XGaIr7tE2JEn8DBp3Km9qS5H0bfrJJ1ZszHg2xsZcQDOpCjBec8A+xrAUqHLT1O4vyflU2XqvQqhqjITfvaxS3xnIkrKUKu48/PSGZVbeuM5oyko14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629883421; 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=dZhmLskMUtcpShR2iT8PutN0XrHNoW67Fu4IKLffoEY=; b=PlfqAL2NEFNR6CN32PQY3Hjpxxm6gNL/k2vp/fO8B/4hlvprDL5FigVC9mIX9fgDx3GgBdjD3GUMNeaeQW4HcJOAaJEobMa6r3C2nyLqLo9V5EaueOsRUffY8wIgnU4imN2kFuvL3ZLQ7N/Hvw/cftxn7e7BW2I/PpbVbiILZeY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1629883421753644.3886771750389; Wed, 25 Aug 2021 02:23:41 -0700 (PDT) Received: from localhost ([::1]:37990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIp8G-0004Ib-P1 for importer@patchew.org; Wed, 25 Aug 2021 05:23:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIp5M-0000Ep-Hy for qemu-devel@nongnu.org; Wed, 25 Aug 2021 05:20:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26418) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIp5K-0004GH-PD for qemu-devel@nongnu.org; Wed, 25 Aug 2021 05:20:40 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-425-9wpoBQIjPq2HrsHsQItKbg-1; Wed, 25 Aug 2021 05:20:36 -0400 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 804C0100A25C for ; Wed, 25 Aug 2021 09:20:35 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42F78687D5; Wed, 25 Aug 2021 09:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629883238; h=from:from: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; bh=dZhmLskMUtcpShR2iT8PutN0XrHNoW67Fu4IKLffoEY=; b=Kz+ABHXRlxBlkht5eua/cNfgkDKK8uDCEL7+XjKd+TaJrrOWlA+9qq/fGiVd8bwScUR044 YdE0iLzvuUZAB+DAUNVblfOepGP+wFA7xX8LJM+9uQUSgsfCW5IsYeTtASi/0hxqmJzgCd RcXn/B/BfrT7tLojCac3m71xGMcR4PQ= X-MC-Unique: 9wpoBQIjPq2HrsHsQItKbg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH v2 2/3] softmmu/vl: Deprecate the old grab options Date: Wed, 25 Aug 2021 11:20:22 +0200 Message-Id: <20210825092023.81396-3-thuth@redhat.com> In-Reply-To: <20210825092023.81396-1-thuth@redhat.com> References: <20210825092023.81396-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.747, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629883422030100001 Content-Type: text/plain; charset="utf-8" The alt_grab and ctrl_grab parameter of the -display sdl option prevent the QAPIfication of the "sdl" part of the -display option, so we should eventually remove them. And since this feature is also rather niche anyway, we should not clutter the top-level option list with these, so let's also deprecate the "-alt-grab" and the "-ctrl-grab" options while we're at it. Once the deprecation period of "alt_grab" and "ctrl_grab" is over, we then can finally switch the -display sdl option to use QAPI internally, too. Acked-by: Peter Krempa Signed-off-by: Thomas Huth Reviewed-by: Gerd Hoffmann --- docs/about/deprecated.rst | 10 ++++++++++ qemu-options.hx | 12 ++++++++---- softmmu/vl.c | 6 ++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 6d438f1c8d..868eca0dd4 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -138,6 +138,16 @@ an underscore between "window" and "close"). The ``-no-quit`` is a synonym for ``-display ...,window-close=3Doff`` which should be used instead. =20 +``-alt-grab`` and ``-display sdl,alt_grab=3Don`` (since 6.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` instead. + +``-ctrl-grab`` and ``-display sdl,ctrl_grab=3Don`` (since 6.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,grab-mod=3Drctrl`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index 0bff756ded..4f46233527 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1884,9 +1884,11 @@ SRST the mouse grabbing in conjunction with the "g" key. `` can be either `lshift-lctrl-lalt` or `rctrl`. =20 - ``alt_grab=3Don|off`` : Use Control+Alt+Shift-g to toggle mouse gr= abbing + ``alt_grab=3Don|off`` : Use Control+Alt+Shift-g to toggle mouse gr= abbing. + This parameter is deprecated - use ``grab-mod`` instead. =20 - ``ctrl_grab=3Don|off`` : Use Right-Control-g to toggle mouse grabb= ing + ``ctrl_grab=3Don|off`` : Use Right-Control-g to toggle mouse grabb= ing. + This parameter is deprecated - use ``grab-mod`` instead. =20 ``gl=3Don|off|core|es`` : Use OpenGL for displaying =20 @@ -1971,7 +1973,8 @@ SRST ``-alt-grab`` Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). Note that this also affects the special keys (for fullscreen, monitor-mode - switching, etc). + switching, etc). This option is deprecated - please use + ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` instead. ERST =20 DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab, @@ -1981,7 +1984,8 @@ SRST ``-ctrl-grab`` Use Right-Ctrl to grab mouse (instead of Ctrl-Alt). Note that this also affects the special keys (for fullscreen, monitor-mode - switching, etc). + switching, etc). This option is deprecated - please use + ``-display sdl,grab-mod=3Drctrl`` instead. ERST =20 DEF("no-quit", 0, QEMU_OPTION_no_quit, diff --git a/softmmu/vl.c b/softmmu/vl.c index 294990debf..613948ab46 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1043,6 +1043,7 @@ static void parse_display(const char *p) } else { goto invalid_sdl_args; } + warn_report("alt_grab is deprecated, use grab-mod instead.= "); } else if (strstart(opts, ",ctrl_grab=3D", &nextopt)) { opts =3D nextopt; if (strstart(opts, "on", &nextopt)) { @@ -1052,6 +1053,7 @@ static void parse_display(const char *p) } else { goto invalid_sdl_args; } + warn_report("ctrl_grab is deprecated, use grab-mod instead= ."); } else if (strstart(opts, ",window_close=3D", &nextopt) || strstart(opts, ",window-close=3D", &nextopt)) { if (strstart(opts, ",window_close=3D", NULL)) { @@ -3253,9 +3255,13 @@ void qemu_init(int argc, char **argv, char **envp) break; case QEMU_OPTION_alt_grab: alt_grab =3D 1; + warn_report("-alt-grab is deprecated, please use " + "-display sdl,grab-mod=3Dlshift-lctrl-lalt ins= tead."); break; case QEMU_OPTION_ctrl_grab: ctrl_grab =3D 1; + 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; --=20 2.27.0 From nobody Sat Apr 27 23:20:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629883477; cv=none; d=zohomail.com; s=zohoarc; b=HEB7aznJrQp/RM5xPzQLtg8aNhx9CyFOVZUjYDU38CYuO+HFEWA1kwoXV8pcmUo2VzGEcPYtWgzV2bxe2//JrdnamlsgxczdyTpo6Y1MH8emjMKSYYejcsgTHCQYW3lC37n7KfOHtoro+0lut+tVOzUgtvI96w6kJfDUR4Ze6Dk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629883477; 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=b2r+sNKZveAJyVotRFL1AhlEuBAZPLoJQigcwQ154ww=; b=ada3Len6u5Ddl4UqQn5ounplMUk/xFeNGCv4426E45bt6vBzuRRm+yyoS+shOTLj106itWM7i58JLueqs6/B9OTj5+MuuNWPnuPyn+N6Wt4qpYtGUN5sieGsTfQ7qqbc3G6ZVYj81fzguXquTokzpj3Wi6z91/1/V2sY8iCDqHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1629883477065284.3618102401231; Wed, 25 Aug 2021 02:24:37 -0700 (PDT) Received: from localhost ([::1]:40150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIp99-0005kN-R2 for importer@patchew.org; Wed, 25 Aug 2021 05:24:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIp5N-0000F5-9P for qemu-devel@nongnu.org; Wed, 25 Aug 2021 05:20:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIp5L-0004Gq-RC for qemu-devel@nongnu.org; Wed, 25 Aug 2021 05:20:41 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-219-f9zMpQdmPvijGHurpYt-TA-1; Wed, 25 Aug 2021 05:20:37 -0400 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 0E632189CD03 for ; Wed, 25 Aug 2021 09:20:37 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id DEF8E687D5; Wed, 25 Aug 2021 09:20:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629883239; h=from:from: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; bh=b2r+sNKZveAJyVotRFL1AhlEuBAZPLoJQigcwQ154ww=; b=BZGTOx4o+a9Zco9TDIEO2WBYklVKnxM2biiwryCQeR7nuykH+XCnVKJV7sOE7YxQnRcfQD pbQEjW4gYzF2aatTtq3PFlTwkWsoLFdz8sLY1oJ2gBSHZnQ6H8x/FNM/HWjQS/HySh7t4y AWwobibqMnd8AX/4mvvKMTInm9y0aQs= X-MC-Unique: f9zMpQdmPvijGHurpYt-TA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH v2 3/3] softmmu/vl: Deprecate the -sdl and -curses option Date: Wed, 25 Aug 2021 11:20:23 +0200 Message-Id: <20210825092023.81396-4-thuth@redhat.com> In-Reply-To: <20210825092023.81396-1-thuth@redhat.com> References: <20210825092023.81396-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.747, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629883477282100001 Content-Type: text/plain; charset="utf-8" It's not that much complicated to type "-display sdl" or "-display curses", so we should not clutter our main option name space with such simple wrapper options and rather present the users with a concise interface instead. Thus let's deprecate the "-sdl" and "-curses" wrapper options now. Acked-by: Peter Krempa Signed-off-by: Thomas Huth Reviewed-by: Gerd Hoffmann --- docs/about/deprecated.rst | 10 ++++++++++ softmmu/vl.c | 3 +++ 2 files changed, 13 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 868eca0dd4..d5bec67a78 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -148,6 +148,16 @@ Use ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` inst= ead. =20 Use ``-display sdl,grab-mod=3Drctrl`` instead. =20 +``-sdl`` (since 6.2) +'''''''''''''''''''' + +Use ``-display sdl`` instead. + +``-curses`` (since 6.2) +''''''''''''''''''''''' + +Use ``-display curses`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/softmmu/vl.c b/softmmu/vl.c index 613948ab46..bb59dbf0de 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2897,6 +2897,8 @@ void qemu_init(int argc, char **argv, char **envp) 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 @@ -3270,6 +3272,7 @@ void qemu_init(int argc, char **argv, char **envp) "-display ...,window-close=3Doff instead."); break; case QEMU_OPTION_sdl: + warn_report("-sdl is deprecated, use -display sdl instead.= "); #ifdef CONFIG_SDL dpy.type =3D DISPLAY_TYPE_SDL; break; --=20 2.27.0