[v9,17/37] qapi: Drop unused 'kind' for struct/enum visit

Message ID	1453219845-30939-18-git-send-email-eblake@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> From: Eric Blake <eblake@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 19 Jan 2016 09:10:25 -0700 Message-Id: <1453219845-30939-18-git-send-email-eblake@redhat.com> In-Reply-To: <1453219845-30939-1-git-send-email-eblake@redhat.com> References: <1453219845-30939-1-git-send-email-eblake@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Michael Roth <mdroth@linux.vnet.ibm.com>, "Michael S. Tsirkin" <mst@redhat.com>, Alexander Graf <agraf@suse.de>, armbru@redhat.com, "open list:sPAPR" <qemu-ppc@nongnu.org>, Paolo Bonzini <pbonzini@redhat.com>, marcandre.lureau@redhat.com, Luiz Capitulino <lcapitulino@redhat.com>, =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>, David Gibson <david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH v9 17/37] qapi: Drop unused 'kind' for struct/enum visit Precedence: list Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org

diff --git a/hmp.c b/hmp.c index 3beea3a..a4b74df 100644 --- a/hmp.c +++ b/hmp.c @@ -1669,7 +1669,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; } diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index de927c6..e7c7719 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -48,8 +48,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, @@ -64,8 +63,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 */ diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 9ef603b..78d71e2 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -259,7 +259,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); } @@ -282,7 +282,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; diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index dc44088..24ecd87 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -117,7 +117,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; } @@ -126,7 +126,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; } diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h index 0257359..6abfda7 100644 --- a/include/qapi/visitor-impl.h +++ b/include/qapi/visitor-impl.h @@ -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); @@ -62,10 +61,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 diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index eb50116..4abc180 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -28,7 +28,7 @@ typedef struct GenericList } GenericList; void visit_start_struct(Visitor *v, const char *name, void **obj, - const char *kind, size_t size, Error **errp); + size_t size, Error **errp); void visit_end_struct(Visitor *v, Error **errp); void visit_start_implicit_struct(Visitor *v, void **obj, size_t size, Error **errp); @@ -54,8 +54,7 @@ bool visit_optional(Visitor *v, const char *name, bool *present); void visit_get_next_type(Visitor *v, const char *name, QType *type, bool promote_int, Error **errp); void visit_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 visit_type_int(Visitor *v, const char *name, int64_t *obj, Error **errp); void visit_type_uint8(Visitor *v, const char *name, uint8_t *obj, Error **errp); diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index b1c8e50..6d4a91e 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -124,7 +124,7 @@ opts_visitor_insert(GHashTable *unprocessed_opts, const QemuOpt *opt) static void -opts_start_struct(Visitor *v, const char *name, void **obj, const char *kind, +opts_start_struct(Visitor *v, const char *name, void **obj, size_t size, Error **errp) { OptsVisitor *ov = to_ov(v); diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index b521f7c..49e7cf0 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -59,8 +59,7 @@ static void *qapi_dealloc_pop(QapiDeallocVisitor *qov) } static void qapi_dealloc_start_struct(Visitor *v, const char *name, void **obj, - const char *kind, size_t unused, - Error **errp) + size_t unused, Error **errp) { QapiDeallocVisitor *qov = to_qov(v); qapi_dealloc_push(qov, obj); @@ -164,8 +163,7 @@ static void qapi_dealloc_type_anything(Visitor *v, const char *name, } static void qapi_dealloc_type_enum(Visitor *v, const char *name, int *obj, - const char * const strings[], - const char *kind, Error **errp) + const char * const strings[], Error **errp) { } diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 7bc3de6..b0452cf 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -2,6 +2,7 @@ * Core Definitions for QAPI Visitor Classes * * Copyright IBM, Corp. 2011 + * Copyright (C) 2015 Red Hat, Inc. * * Authors: * Anthony Liguori <aliguori@us.ibm.com> @@ -18,9 +19,9 @@ #include "qapi/visitor-impl.h" void visit_start_struct(Visitor *v, const char *name, void **obj, - const char *kind, size_t size, Error **errp) + size_t size, Error **errp) { - v->start_struct(v, name, obj, kind, size, errp); + v->start_struct(v, name, obj, size, errp); } void visit_end_struct(Visitor *v, Error **errp) @@ -90,10 +91,9 @@ void visit_get_next_type(Visitor *v, const char *name, QType *type, } void visit_type_enum(Visitor *v, const char *name, int *obj, - const char *const strings[], const char *kind, - Error **errp) + const char *const strings[], Error **errp) { - v->type_enum(v, name, obj, strings, kind, errp); + v->type_enum(v, name, obj, strings, errp); } void visit_type_int(Visitor *v, const char *name, int64_t *obj, Error **errp) @@ -227,8 +227,7 @@ void visit_type_any(Visitor *v, const char *name, QObject **obj, 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) { int i = 0; int value = *obj; @@ -246,8 +245,7 @@ void output_type_enum(Visitor *v, const char *name, int *obj, } 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) { Error *local_err = NULL; int64_t value = 0; diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c index de77740..bf25249 100644 --- a/qapi/qmp-input-visitor.c +++ b/qapi/qmp-input-visitor.c @@ -115,7 +115,7 @@ static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp) } static void qmp_input_start_struct(Visitor *v, const char *name, void **obj, - const char *kind, size_t size, Error **errp) + size_t size, Error **errp) { QmpInputVisitor *qiv = to_qiv(v); QObject *qobj = qmp_input_get_object(qiv, name, true); diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c index af600a9..db5e618 100644 --- a/qapi/qmp-output-visitor.c +++ b/qapi/qmp-output-visitor.c @@ -111,8 +111,7 @@ static void qmp_output_add_obj(QmpOutputVisitor *qov, const char *name, } static void qmp_output_start_struct(Visitor *v, const char *name, void **obj, - const char *kind, size_t unused, - Error **errp) + size_t unused, Error **errp) { QmpOutputVisitor *qov = to_qov(v); QDict *dict = qdict_new(); diff --git a/qom/object.c b/qom/object.c index 55b3955..e5b0566 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1244,7 +1244,7 @@ int object_property_get_enum(Object *obj, const char *name, siv = string_input_visitor_new(str); string_output_visitor_cleanup(sov); visit_type_enum(string_input_get_visitor(siv), name, &ret, - enumprop->strings, NULL, errp); + enumprop->strings, errp); g_free(str); string_input_visitor_cleanup(siv); @@ -1915,7 +1915,7 @@ static void property_get_enum(Object *obj, Visitor *v, const char *name, return; } - visit_type_enum(v, name, &value, prop->strings, NULL, errp); + visit_type_enum(v, name, &value, prop->strings, errp); } static void property_set_enum(Object *obj, Visitor *v, const char *name, @@ -1925,7 +1925,7 @@ static void property_set_enum(Object *obj, Visitor *v, const char *name, int value; Error *err = NULL; - visit_type_enum(v, name, &value, prop->strings, NULL, &err); + visit_type_enum(v, name, &value, prop->strings, &err); if (err) { error_propagate(errp, err); return; @@ -2006,7 +2006,7 @@ static void property_get_tm(Object *obj, Visitor *v, const char *name, goto out; } - visit_start_struct(v, name, NULL, "struct tm", 0, &err); + visit_start_struct(v, name, NULL, 0, &err); if (err) { goto out; } diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index fd03e38..a1dca29 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -63,7 +63,7 @@ def gen_event_send(name, arg_type): qov = qmp_output_visitor_new(); v = qmp_output_get_visitor(qov); - visit_start_struct(v, "%(name)s", NULL, NULL, 0, &err); + visit_start_struct(v, "%(name)s", NULL, 0, &err); ''', name=name) ret += gen_err_check() diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index ca28b08..8a741b6 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -122,7 +122,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error { Error *err = NULL; - visit_start_struct(v, name, (void **)obj, "%(name)s", sizeof(%(c_name)s), &err); + visit_start_struct(v, name, (void **)obj, sizeof(%(c_name)s), &err); if (err) { goto out; } @@ -138,7 +138,7 @@ out: error_propagate(errp, err); } ''', - name=name, c_name=c_name(name)) + c_name=c_name(name)) return ret @@ -183,11 +183,11 @@ def gen_visit_enum(name): void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s *obj, Error **errp) { int tmp = *obj; - visit_type_enum(v, name, &tmp, %(c_name)s_lookup, "%(name)s", errp); + visit_type_enum(v, name, &tmp, %(c_name)s_lookup, errp); *obj = tmp; } ''', - c_name=c_name(name), name=name) + c_name=c_name(name)) def gen_visit_alternate(name, variants): @@ -259,7 +259,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error { Error *err = NULL; - visit_start_struct(v, name, (void **)obj, "%(name)s", sizeof(%(c_name)s), &err); + visit_start_struct(v, name, (void **)obj, sizeof(%(c_name)s), &err); if (err) { goto out; } @@ -267,7 +267,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error goto out_obj; } ''', - c_name=c_name(name), name=name) + c_name=c_name(name)) if base: ret += mcgen(''' diff --git a/vl.c b/vl.c index 49ec0de..22062b5 100644 --- a/vl.c +++ b/vl.c @@ -2834,7 +2834,7 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp) pdict = qemu_opts_to_qdict(opts, NULL); 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; }

[v9,17/37] qapi: Drop unused 'kind' for struct/enum visit

Commit Message

Comments

Patch