yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-ui-switch-trivial-displays-to-qapi-parser.patch

26ba25
From 2bddc16c7c813e6166c9ca8545d5d2aaa1b28991 Mon Sep 17 00:00:00 2001
26ba25
From: Gerd Hoffmann <kraxel@redhat.com>
26ba25
Date: Fri, 14 Dec 2018 08:26:39 +0000
26ba25
Subject: [PATCH 2/5] ui: switch trivial displays to qapi parser
26ba25
MIME-Version: 1.0
26ba25
Content-Type: text/plain; charset=UTF-8
26ba25
Content-Transfer-Encoding: 8bit
26ba25
26ba25
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
26ba25
Message-id: <20181214082642.21878-3-kraxel@redhat.com>
26ba25
Patchwork-id: 83508
26ba25
O-Subject: [RHEL8/rhel qemu-kvm PATCH 2/5] ui: switch trivial displays to qapi parser
26ba25
Bugzilla: 1652871
26ba25
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
26ba25
RH-Acked-by: Daniel P. Berrange <berrange@redhat.com>
26ba25
RH-Acked-by: Erik Skultety <eskultet@redhat.com>
26ba25
26ba25
Drop the option-less display types (egl-headless, curses, none) from
26ba25
parse_display(), so they'll be handled by parse_display_qapi().
26ba25
26ba25
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
26ba25
Reviewed-by: Eric Blake <eblake@redhat.com>
26ba25
Message-id: 20180507095539.19584-3-kraxel@redhat.com
26ba25
(cherry picked from commit 2c9498c3e44cd5574df3baaebfb9d5a095252205)
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 vl.c | 6 ------
26ba25
 1 file changed, 6 deletions(-)
26ba25
26ba25
diff --git a/vl.c b/vl.c
26ba25
index 934e402..a4d1e3f 100644
26ba25
--- a/vl.c
26ba25
+++ b/vl.c
26ba25
@@ -2210,10 +2210,6 @@ static void parse_display(const char *p)
26ba25
             error_report("VNC requires a display argument vnc=<display>");
26ba25
             exit(1);
26ba25
         }
26ba25
-    } else if (strstart(p, "egl-headless", &opts)) {
26ba25
-        dpy.type = DISPLAY_TYPE_EGL_HEADLESS;
26ba25
-    } else if (strstart(p, "curses", &opts)) {
26ba25
-        dpy.type = DISPLAY_TYPE_CURSES;
26ba25
     } else if (strstart(p, "gtk", &opts)) {
26ba25
         dpy.type = DISPLAY_TYPE_GTK;
26ba25
         while (*opts) {
26ba25
@@ -2246,8 +2242,6 @@ static void parse_display(const char *p)
26ba25
             }
26ba25
             opts = nextopt;
26ba25
         }
26ba25
-    } else if (strstart(p, "none", &opts)) {
26ba25
-        dpy.type = DISPLAY_TYPE_NONE;
26ba25
     } else {
26ba25
         parse_display_qapi(p);
26ba25
     }
26ba25
-- 
26ba25
1.8.3.1
26ba25