From nobody Tue Feb 10 18:21:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525687064049202.35265843544573; Mon, 7 May 2018 02:57:44 -0700 (PDT) Received: from localhost ([::1]:44987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFctr-0003R0-7k for importer@patchew.org; Mon, 07 May 2018 05:57:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcrx-0002AL-Ag for qemu-devel@nongnu.org; Mon, 07 May 2018 05:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFcrv-0005Dh-Aq for qemu-devel@nongnu.org; Mon, 07 May 2018 05:55:45 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33244 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFcrv-0005DE-6t; Mon, 07 May 2018 05:55:43 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A7EA384250; Mon, 7 May 2018 09:55:42 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-99.ams2.redhat.com [10.36.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D83F108471; Mon, 7 May 2018 09:55:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A301651BA6; Mon, 7 May 2018 11:55:39 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 May 2018 11:55:36 +0200 Message-Id: <20180507095539.19584-2-kraxel@redhat.com> In-Reply-To: <20180507095539.19584-1-kraxel@redhat.com> References: <20180507095539.19584-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 07 May 2018 09:55:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 07 May 2018 09:55:42 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 1/4] ui: add qapi parser for -display 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, Michael Tokarev , Laurent Vivier , Markus Armbruster , Gerd Hoffmann , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add parse_display_qapi() function which parses the -display command line using a qapi visitor for DisplayOptions. Wire up as default catch in parse_display(). Improves the error message for unknown display types. Also enables json as -display argument, i.e. -display "{ 'type': 'gtk' }" Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- vl.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 806eec2ef6..d53ea078bd 100644 --- a/vl.c +++ b/vl.c @@ -120,12 +120,14 @@ int main(int argc, char **argv) #include "ui/qemu-spice.h" #include "qapi/string-input-visitor.h" #include "qapi/opts-visitor.h" +#include "qapi/clone-visitor.h" #include "qom/object_interfaces.h" #include "exec/semihost.h" #include "crypto/init.h" #include "sysemu/replay.h" #include "qapi/qapi-events-run-state.h" #include "qapi/qapi-visit-block-core.h" +#include "qapi/qapi-visit-ui.h" #include "qapi/qapi-commands-block-core.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-run-state.h" @@ -2088,6 +2090,25 @@ static void select_vgahw(const char *p) } } =20 +static void parse_display_qapi(const char *optarg) +{ + Error *err =3D NULL; + DisplayOptions *opts; + Visitor *v; + + v =3D qobject_input_visitor_new_str(optarg, "type", &err); + if (!v) { + error_report_err(err); + exit(1); + } + + visit_type_DisplayOptions(v, NULL, &opts, &error_fatal); + QAPI_CLONE_MEMBERS(DisplayOptions, &dpy, opts); + + qapi_free_DisplayOptions(opts); + visit_free(v); +} + static void parse_display(const char *p) { const char *opts; @@ -2203,8 +2224,7 @@ static void parse_display(const char *p) } else if (strstart(p, "none", &opts)) { dpy.type =3D DISPLAY_TYPE_NONE; } else { - error_report("unknown display type"); - exit(1); + parse_display_qapi(p); } } =20 --=20 2.9.3 From nobody Tue Feb 10 18:21:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525687221128533.1661461011101; Mon, 7 May 2018 03:00:21 -0700 (PDT) Received: from localhost ([::1]:45002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcwO-0005Vs-En for importer@patchew.org; Mon, 07 May 2018 06:00:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcrx-0002AR-HB for qemu-devel@nongnu.org; Mon, 07 May 2018 05:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFcrw-0005F9-Hb for qemu-devel@nongnu.org; Mon, 07 May 2018 05:55:45 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52016 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFcrw-0005Ea-Dh; Mon, 07 May 2018 05:55:44 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E04F3818F6E2; Mon, 7 May 2018 09:55:43 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-99.ams2.redhat.com [10.36.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A37F111F3B6; Mon, 7 May 2018 09:55:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id AA75151BA7; Mon, 7 May 2018 11:55:39 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 May 2018 11:55:37 +0200 Message-Id: <20180507095539.19584-3-kraxel@redhat.com> In-Reply-To: <20180507095539.19584-1-kraxel@redhat.com> References: <20180507095539.19584-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 07 May 2018 09:55:43 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 07 May 2018 09:55:43 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 2/4] ui: switch trivial displays to qapi parser 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, Michael Tokarev , Laurent Vivier , Markus Armbruster , Gerd Hoffmann , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the option-less display types (egl-headless, curses, none) from parse_display(), so they'll be handled by parse_display_qapi(). Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- vl.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vl.c b/vl.c index d53ea078bd..1bd6758f3a 100644 --- a/vl.c +++ b/vl.c @@ -2185,10 +2185,6 @@ static void parse_display(const char *p) error_report("VNC requires a display argument vnc=3D"= ); exit(1); } - } else if (strstart(p, "egl-headless", &opts)) { - dpy.type =3D DISPLAY_TYPE_EGL_HEADLESS; - } else if (strstart(p, "curses", &opts)) { - dpy.type =3D DISPLAY_TYPE_CURSES; } else if (strstart(p, "gtk", &opts)) { dpy.type =3D DISPLAY_TYPE_GTK; while (*opts) { @@ -2221,8 +2217,6 @@ static void parse_display(const char *p) } opts =3D nextopt; } - } else if (strstart(p, "none", &opts)) { - dpy.type =3D DISPLAY_TYPE_NONE; } else { parse_display_qapi(p); } --=20 2.9.3 From nobody Tue Feb 10 18:21:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525687085315380.1473697098007; Mon, 7 May 2018 02:58:05 -0700 (PDT) Received: from localhost ([::1]:44989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcuC-0003k6-Ea for importer@patchew.org; Mon, 07 May 2018 05:58:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcrx-0002AH-AJ for qemu-devel@nongnu.org; Mon, 07 May 2018 05:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFcrw-0005Ee-5n for qemu-devel@nongnu.org; Mon, 07 May 2018 05:55:45 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41654 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFcrv-0005E3-W7; Mon, 07 May 2018 05:55:44 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 80B23406E970; Mon, 7 May 2018 09:55:43 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-99.ams2.redhat.com [10.36.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 547C3111F3DA; Mon, 7 May 2018 09:55:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B2ECF51BA8; Mon, 7 May 2018 11:55:39 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 May 2018 11:55:38 +0200 Message-Id: <20180507095539.19584-4-kraxel@redhat.com> In-Reply-To: <20180507095539.19584-1-kraxel@redhat.com> References: <20180507095539.19584-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 07 May 2018 09:55:43 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 07 May 2018 09:55:43 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 3/4] ui: switch gtk display to qapi parser 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, Michael Tokarev , Laurent Vivier , Markus Armbruster , Gerd Hoffmann , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the gtk option parser from parse_display(), so parse_display_qapi() will handle it instead. With this change the parser will accept gl=3Dcore and gl=3Des too, gtk must catch the unsupported gles variant now. Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 6 +++++- vl.c | 32 -------------------------------- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index bb3214cffb..7859b506ea 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2434,7 +2434,11 @@ static void early_gtk_display_init(DisplayOptions *o= pts) } =20 assert(opts->type =3D=3D DISPLAY_TYPE_GTK); - if (opts->has_gl && opts->gl) { + if (opts->has_gl && opts->gl !=3D DISPLAYGL_MODE_OFF) { + if (opts->gl =3D=3D DISPLAYGL_MODE_ES) { + error_report("gtk: opengl es not supported"); + return; + } #if defined(CONFIG_OPENGL) #if defined(CONFIG_GTK_GL) && defined(GDK_WINDOWING_WAYLAND) if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) { diff --git a/vl.c b/vl.c index 1bd6758f3a..03ac9a2cbb 100644 --- a/vl.c +++ b/vl.c @@ -2185,38 +2185,6 @@ static void parse_display(const char *p) error_report("VNC requires a display argument vnc=3D"= ); exit(1); } - } else if (strstart(p, "gtk", &opts)) { - dpy.type =3D DISPLAY_TYPE_GTK; - while (*opts) { - const char *nextopt; - - if (strstart(opts, ",grab_on_hover=3D", &nextopt)) { - opts =3D nextopt; - dpy.u.gtk.has_grab_on_hover =3D true; - if (strstart(opts, "on", &nextopt)) { - dpy.u.gtk.grab_on_hover =3D true; - } else if (strstart(opts, "off", &nextopt)) { - dpy.u.gtk.grab_on_hover =3D false; - } else { - goto invalid_gtk_args; - } - } else if (strstart(opts, ",gl=3D", &nextopt)) { - opts =3D nextopt; - dpy.has_gl =3D true; - if (strstart(opts, "on", &nextopt)) { - dpy.gl =3D DISPLAYGL_MODE_ON; - } else if (strstart(opts, "off", &nextopt)) { - dpy.gl =3D DISPLAYGL_MODE_OFF; - } else { - goto invalid_gtk_args; - } - } else { - invalid_gtk_args: - error_report("invalid GTK option string"); - exit(1); - } - opts =3D nextopt; - } } else { parse_display_qapi(p); } --=20 2.9.3 From nobody Tue Feb 10 18:21:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525687153100520.980793778316; Mon, 7 May 2018 02:59:13 -0700 (PDT) Received: from localhost ([::1]:44997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcvI-0004mL-BH for importer@patchew.org; Mon, 07 May 2018 05:59:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcrx-0002AJ-AT for qemu-devel@nongnu.org; Mon, 07 May 2018 05:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFcrv-0005Db-87 for qemu-devel@nongnu.org; Mon, 07 May 2018 05:55:45 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52010 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFcrv-0005D9-3i; Mon, 07 May 2018 05:55:43 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B56081A43B6; Mon, 7 May 2018 09:55:42 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-99.ams2.redhat.com [10.36.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5809C7C4B; Mon, 7 May 2018 09:55:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BA5CA51BA9; Mon, 7 May 2018 11:55:39 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 May 2018 11:55:39 +0200 Message-Id: <20180507095539.19584-5-kraxel@redhat.com> In-Reply-To: <20180507095539.19584-1-kraxel@redhat.com> References: <20180507095539.19584-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 07 May 2018 09:55:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 07 May 2018 09:55:42 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 4/4] ui: document non-qapi parser cases. 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, Michael Tokarev , Laurent Vivier , Markus Armbruster , Gerd Hoffmann , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add comments to the cases not (yet) switched over to parse_display_qapi(). Signed-off-by: Gerd Hoffmann --- vl.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/vl.c b/vl.c index 03ac9a2cbb..041b3836d7 100644 --- a/vl.c +++ b/vl.c @@ -2114,6 +2114,16 @@ static void parse_display(const char *p) const char *opts; =20 if (strstart(p, "sdl", &opts)) { + /* + * sdl DisplayType needs hand-crafted parser instead of + * parse_display_qapi() due to some options not in + * DisplayOptions, specifically: + * - frame + * Already deprecated. + * - ctrl_grab + alt_grab + * Not clear yet what happens to them long-term. Should + * replaced by something better or deprecated and dropped. + */ dpy.type =3D DISPLAY_TYPE_SDL; while (*opts) { const char *nextopt; @@ -2179,6 +2189,10 @@ static void parse_display(const char *p) opts =3D nextopt; } } else if (strstart(p, "vnc", &opts)) { + /* + * vnc isn't a (local) DisplayType but a protocol for remote + * display access. + */ if (*opts =3D=3D '=3D') { vnc_parse(opts + 1, &error_fatal); } else { --=20 2.9.3