Commit 337283df authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qapi: Drop unused 'kind' for struct/enum visit 



visit_start_struct() and visit_type_enum() had a 'kind' argument
that was usually set to either the stringized version of the
corresponding qapi type name, or to NULL (although some clients
didn't even get that right).  But nothing ever used the argument.
It's even hard to argue that it would be useful in a debugger,
as a stack backtrace also tells which type is being visited.

Therefore, drop the 'kind' argument as dead.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-22-git-send-email-eblake@redhat.com>
[Harmless rebase mistake cleaned up]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 0b2a0d6b

hmp.c

+1 −1
Original line number Diff line number Diff line
@@ -1670,7 +1670,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) 
    pdict = qdict_clone_shallow(qdict);

    v = opts_get_visitor(ov);



    visit_start_struct(v, NULL, NULL, NULL, 0, &err);

    visit_start_struct(v, NULL, NULL, 0, &err);

    if (err) {

        goto out_clean;

    }

hw/core/qdev-properties.c

+2 −4
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ static void get_enum(Object *obj, Visitor *v, const char *name, void *opaque, 
    Property *prop = opaque;

    int *ptr = qdev_get_prop_ptr(dev, prop);



    visit_type_enum(v, prop->name, ptr, prop->info->enum_table,

                    prop->info->name, errp);

    visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp);

}



static void set_enum(Object *obj, Visitor *v, const char *name, void *opaque,
@@ -65,8 +64,7 @@ static void set_enum(Object *obj, Visitor *v, const char *name, void *opaque, 
        return;

    }



    visit_type_enum(v, prop->name, ptr, prop->info->enum_table,

                    prop->info->name, errp);

    visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp);

}



/* Bit */

hw/ppc/spapr_drc.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name, 
    void *fdt;



    if (!drc->fdt) {

        visit_start_struct(v, name, NULL, NULL, 0, &err);

        visit_start_struct(v, name, NULL, 0, &err);

        if (!err) {

            visit_end_struct(v, &err);

        }
@@ -283,7 +283,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name, 
        case FDT_BEGIN_NODE:

            fdt_depth++;

            name = fdt_get_name(fdt, fdt_offset, &name_len);

            visit_start_struct(v, name, NULL, NULL, 0, &err);

            visit_start_struct(v, name, NULL, 0, &err);

            if (err) {

                error_propagate(errp, err);

                return;

hw/virtio/virtio-balloon.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name, 
    VirtIOBalloon *s = opaque;

    int i;



    visit_start_struct(v, name, NULL, "guest-stats", 0, &err);

    visit_start_struct(v, name, NULL, 0, &err);

    if (err) {

        goto out;

    }
@@ -129,7 +129,7 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name, 
        goto out_end;

    }



    visit_start_struct(v, "stats", NULL, NULL, 0, &err);

    visit_start_struct(v, "stats", NULL, 0, &err);

    if (err) {

        goto out_end;

    }

include/qapi/visitor-impl.h

+4 −7
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct Visitor 
{

    /* Must be set */

    void (*start_struct)(Visitor *v, const char *name, void **obj,

                         const char *kind, size_t size, Error **errp);

                         size_t size, Error **errp);

    void (*end_struct)(Visitor *v, Error **errp);



    void (*start_implicit_struct)(Visitor *v, void **obj, size_t size,
@@ -31,8 +31,7 @@ struct Visitor 
    void (*end_list)(Visitor *v, Error **errp);



    void (*type_enum)(Visitor *v, const char *name, int *obj,

                      const char *const strings[], const char *kind,

                      Error **errp);

                      const char *const strings[], Error **errp);

    /* May be NULL; only needed for input visitors. */

    void (*get_next_type)(Visitor *v, const char *name, QType *type,

                          bool promote_int, Error **errp);
@@ -61,10 +60,8 @@ struct Visitor 
};



void input_type_enum(Visitor *v, const char *name, int *obj,

                     const char *const strings[], const char *kind,

                     Error **errp);

                     const char *const strings[], Error **errp);

void output_type_enum(Visitor *v, const char *name, int *obj,

                      const char *const strings[], const char *kind,

                      Error **errp);

                      const char *const strings[], Error **errp);



#endif