From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIW6u-0004Dz-9D for qemu-devel@nongnu.org; Tue, 15 May 2018 05:19:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIW6r-0001UO-5s for qemu-devel@nongnu.org; Tue, 15 May 2018 05:19:08 -0400 From: Gerd Hoffmann Date: Tue, 15 May 2018 11:18:57 +0200 Message-Id: <20180515091901.27774-7-kraxel@redhat.com> In-Reply-To: <20180515091901.27774-1-kraxel@redhat.com> References: <20180515091901.27774-1-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 06/10] ui: switch trivial displays to qapi parser List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Paolo Bonzini , Michael Tokarev , qemu-trivial@nongnu.org, Gerd Hoffmann 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 Message-id: 20180507095539.19584-3-kraxel@redhat.com --- vl.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vl.c b/vl.c index c56f7f8046..6b8f946d58 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="); exit(1); } - } else if (strstart(p, "egl-headless", &opts)) { - dpy.type = DISPLAY_TYPE_EGL_HEADLESS; - } else if (strstart(p, "curses", &opts)) { - dpy.type = DISPLAY_TYPE_CURSES; } else if (strstart(p, "gtk", &opts)) { dpy.type = DISPLAY_TYPE_GTK; while (*opts) { @@ -2221,8 +2217,6 @@ static void parse_display(const char *p) } opts = nextopt; } - } else if (strstart(p, "none", &opts)) { - dpy.type = DISPLAY_TYPE_NONE; } else { parse_display_qapi(p); } -- 2.9.3