[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 3/4] ui: switch gtk display to qapi parser
From: |
Gerd Hoffmann |
Subject: |
[Qemu-trivial] [PATCH 3/4] ui: switch gtk display to qapi parser |
Date: |
Thu, 19 Apr 2018 15:20:25 +0200 |
Drop the gtk option parser from parse_display(), so parse_display_qapi()
will handle it instead.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
vl.c | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/vl.c b/vl.c
index 39303d6b55..1123cd792e 100644
--- a/vl.c
+++ b/vl.c
@@ -2188,38 +2188,6 @@ static void parse_display(const char *p)
error_report("VNC requires a display argument vnc=<display>");
exit(1);
}
- } else if (strstart(p, "gtk", &opts)) {
- dpy.type = DISPLAY_TYPE_GTK;
- while (*opts) {
- const char *nextopt;
-
- if (strstart(opts, ",grab_on_hover=", &nextopt)) {
- opts = nextopt;
- dpy.u.gtk.has_grab_on_hover = true;
- if (strstart(opts, "on", &nextopt)) {
- dpy.u.gtk.grab_on_hover = true;
- } else if (strstart(opts, "off", &nextopt)) {
- dpy.u.gtk.grab_on_hover = false;
- } else {
- goto invalid_gtk_args;
- }
- } else if (strstart(opts, ",gl=", &nextopt)) {
- opts = nextopt;
- dpy.has_gl = true;
- if (strstart(opts, "on", &nextopt)) {
- dpy.gl = true;
- } else if (strstart(opts, "off", &nextopt)) {
- dpy.gl = false;
- } else {
- goto invalid_gtk_args;
- }
- } else {
- invalid_gtk_args:
- error_report("invalid GTK option string");
- exit(1);
- }
- opts = nextopt;
- }
} else {
parse_display_qapi(p);
}
--
2.9.3