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