Commit a7333712 authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

qapi: add explicit null to string input and output visitors 



This may be used for deprecated object properties that are kept for
backwards compatibility.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Tested-by: default avatarAndrea Bolognani <abologna@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 6d034b7b

qapi/string-input-visitor.c

+11 −0
Original line number Diff line number Diff line
@@ -326,6 +326,16 @@ static void parse_type_number(Visitor *v, const char *name, double *obj, 
    *obj = val;

}



static void parse_type_null(Visitor *v, const char *name, Error **errp)

{

    StringInputVisitor *siv = to_siv(v);



    if (!siv->string || siv->string[0]) {

        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",

                   "null");

    }

}



static void string_input_free(Visitor *v)

{

    StringInputVisitor *siv = to_siv(v);
@@ -349,6 +359,7 @@ Visitor *string_input_visitor_new(const char *str) 
    v->visitor.type_bool = parse_type_bool;

    v->visitor.type_str = parse_type_str;

    v->visitor.type_number = parse_type_number;

    v->visitor.type_null = parse_type_null;

    v->visitor.start_list = start_list;

    v->visitor.next_list = next_list;

    v->visitor.check_list = check_list;

qapi/string-output-visitor.c

+14 −0
Original line number Diff line number Diff line
@@ -256,6 +256,19 @@ static void print_type_number(Visitor *v, const char *name, double *obj, 
    string_output_set(sov, g_strdup_printf("%f", *obj));

}



static void print_type_null(Visitor *v, const char *name, Error **errp)

{

    StringOutputVisitor *sov = to_sov(v);

    char *out;



    if (sov->human) {

        out = g_strdup("<null>");

    } else {

        out = g_strdup("");

    }

    string_output_set(sov, out);

}



static void

start_list(Visitor *v, const char *name, GenericList **list, size_t size,

           Error **errp)
@@ -341,6 +354,7 @@ Visitor *string_output_visitor_new(bool human, char **result) 
    v->visitor.type_bool = print_type_bool;

    v->visitor.type_str = print_type_str;

    v->visitor.type_number = print_type_number;

    v->visitor.type_null = print_type_null;

    v->visitor.start_list = start_list;

    v->visitor.next_list = next_list;

    v->visitor.end_list = end_list;