[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 05/10] ui: add qapi parser for -display
From: |
Gerd Hoffmann |
Subject: |
[Qemu-trivial] [PULL 05/10] ui: add qapi parser for -display |
Date: |
Tue, 15 May 2018 11:18:56 +0200 |
Add parse_display_qapi() function which parses the -display command line
using a qapi visitor for DisplayOptions. Wire up as default catch in
parse_display().
Improves the error message for unknown display types.
Also enables json as -display argument, i.e. -display "{ 'type': 'gtk' }"
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
---
vl.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/vl.c b/vl.c
index b9f6b42779..c56f7f8046 100644
--- a/vl.c
+++ b/vl.c
@@ -120,12 +120,14 @@ int main(int argc, char **argv)
#include "ui/qemu-spice.h"
#include "qapi/string-input-visitor.h"
#include "qapi/opts-visitor.h"
+#include "qapi/clone-visitor.h"
#include "qom/object_interfaces.h"
#include "exec/semihost.h"
#include "crypto/init.h"
#include "sysemu/replay.h"
#include "qapi/qapi-events-run-state.h"
#include "qapi/qapi-visit-block-core.h"
+#include "qapi/qapi-visit-ui.h"
#include "qapi/qapi-commands-block-core.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-run-state.h"
@@ -2088,6 +2090,25 @@ static void select_vgahw(const char *p)
}
}
+static void parse_display_qapi(const char *optarg)
+{
+ Error *err = NULL;
+ DisplayOptions *opts;
+ Visitor *v;
+
+ v = qobject_input_visitor_new_str(optarg, "type", &err);
+ if (!v) {
+ error_report_err(err);
+ exit(1);
+ }
+
+ visit_type_DisplayOptions(v, NULL, &opts, &error_fatal);
+ QAPI_CLONE_MEMBERS(DisplayOptions, &dpy, opts);
+
+ qapi_free_DisplayOptions(opts);
+ visit_free(v);
+}
+
static void parse_display(const char *p)
{
const char *opts;
@@ -2203,8 +2224,7 @@ static void parse_display(const char *p)
} else if (strstart(p, "none", &opts)) {
dpy.type = DISPLAY_TYPE_NONE;
} else {
- error_report("unknown display type");
- exit(1);
+ parse_display_qapi(p);
}
}
--
2.9.3
- [Qemu-trivial] [PULL 00/10] Ui 20180515 patches, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 01/10] sdl2: move opts assignment into loop, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 08/10] ui: document non-qapi parser cases., Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 05/10] ui: add qapi parser for -display,
Gerd Hoffmann <=
- [Qemu-trivial] [PULL 10/10] gtk: disable the F10 menubar key, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 04/10] vnc: add magic cookie to VncState, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 03/10] ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 02/10] gtk: make it possible to hide the menu bar, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 06/10] ui: switch trivial displays to qapi parser, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 09/10] console: use linked list for QemuConsoles, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 07/10] ui: switch gtk display to qapi parser, Gerd Hoffmann, 2018/05/15
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/10] Ui 20180515 patches, Peter Maydell, 2018/05/15