Commit 776d1344 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

ui: add qapi parser for -display 



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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 20180507095539.19584-2-kraxel@redhat.com
parent f31f9c10

vl.c

+22 −2
Original line number Diff line number Diff line
@@ -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);

    }

}