From 2bddc16c7c813e6166c9ca8545d5d2aaa1b28991 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 14 Dec 2018 08:26:39 +0000 Subject: [PATCH 2/5] ui: switch trivial displays to qapi parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Gerd Hoffmann Message-id: <20181214082642.21878-3-kraxel@redhat.com> Patchwork-id: 83508 O-Subject: [RHEL8/rhel qemu-kvm PATCH 2/5] ui: switch trivial displays to qapi parser Bugzilla: 1652871 RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Daniel P. Berrange RH-Acked-by: Erik Skultety 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 (cherry picked from commit 2c9498c3e44cd5574df3baaebfb9d5a095252205) Signed-off-by: Danilo C. L. de Paula --- vl.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vl.c b/vl.c index 934e402..a4d1e3f 100644 --- a/vl.c +++ b/vl.c @@ -2210,10 +2210,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) { @@ -2246,8 +2242,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); } -- 1.8.3.1