Received: from eggs.gnu.org ([2001:4830:134:3::10]:35647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLxuc-0001zA-1s for qemu-devel@nongnu.org; Wed, 20 Jan 2016 13:55:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLxua-0007lF-Fi for qemu-devel@nongnu.org; Wed, 20 Jan 2016 13:55:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLxua-0007l4-8o for qemu-devel@nongnu.org; Wed, 20 Jan 2016 13:55:20 -0500 From: Markus Armbruster References: <1453219845-30939-1-git-send-email-eblake@redhat.com> <1453219845-30939-17-git-send-email-eblake@redhat.com> Date: Wed, 20 Jan 2016 19:55:17 +0100 In-Reply-To: <1453219845-30939-17-git-send-email-eblake@redhat.com> (Eric Blake's message of "Tue, 19 Jan 2016 09:10:24 -0700") Message-ID: <87wpr4krmy.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v9 16/37] qapi: Swap 'name' in visit_* callbacks to match public API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: marcandre.lureau@redhat.com, qemu-devel@nongnu.org, Michael Roth Eric Blake writes: > As explained in the previous patches, matching argument order of > 'name, &value' to JSON's "name":value makes sense. However, > while the last two patches were easy with Coccinelle, I ended up > doing this one all by hand. Now all the visitor callbacks match > the main interface. > > Signed-off-by: Eric Blake > Reviewed-by: Marc-Andr=C3=A9 Lureau > > --- > v9: no change > v8: new patch > --- > include/qapi/visitor-impl.h | 39 +++++++++++++++++++++------------------ > qapi/opts-visitor.c | 16 ++++++++-------- > qapi/qapi-dealloc-visitor.c | 25 ++++++++++++------------- > qapi/qapi-visit-core.c | 38 +++++++++++++++++++------------------- > qapi/qmp-input-visitor.c | 22 +++++++++++----------- > qapi/qmp-output-visitor.c | 16 ++++++++-------- > qapi/string-input-visitor.c | 16 ++++++++-------- > qapi/string-output-visitor.c | 16 ++++++++-------- > 8 files changed, 95 insertions(+), 93 deletions(-) > > diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h > index e6399d1..0257359 100644 > --- a/include/qapi/visitor-impl.h > +++ b/include/qapi/visitor-impl.h > @@ -18,8 +18,8 @@ > struct Visitor > { > /* Must be set */ > - void (*start_struct)(Visitor *v, void **obj, const char *kind, > - const char *name, size_t size, Error **errp); > + void (*start_struct)(Visitor *v, const char *name, void **obj, > + const char *kind, size_t size, Error **errp); > void (*end_struct)(Visitor *v, Error **errp); > > void (*start_implicit_struct)(Visitor *v, void **obj, size_t size, > @@ -30,39 +30,42 @@ struct Visitor > GenericList *(*next_list)(Visitor *v, GenericList **list, Error **er= rp); > void (*end_list)(Visitor *v, Error **errp); > > - void (*type_enum)(Visitor *v, int *obj, const char * const strings[], > - const char *kind, const char *name, Error **errp); > + void (*type_enum)(Visitor *v, const char *name, int *obj, > + const char * const strings[], const char *kind, Opportunity to change to 'const char *const'. I prefer that, because it makes the fact that this is a pointer-* and not a binary operator-* visually obvious. Same elsewhere. > + Error **errp); > /* May be NULL; only needed for input visitors. */ > - void (*get_next_type)(Visitor *v, QType *type, bool promote_int, > - const char *name, Error **errp); > + void (*get_next_type)(Visitor *v, const char *name, QType *type, > + bool promote_int, Error **errp); > > /* Must be set. */ > - void (*type_int64)(Visitor *v, int64_t *obj, const char *name, > + void (*type_int64)(Visitor *v, const char *name, int64_t *obj, > Error **errp); > /* Must be set. */ > - void (*type_uint64)(Visitor *v, uint64_t *obj, const char *name, > + void (*type_uint64)(Visitor *v, const char *name, uint64_t *obj, > Error **errp); > /* Optional; fallback is type_uint64(). */ > - void (*type_size)(Visitor *v, uint64_t *obj, const char *name, > + void (*type_size)(Visitor *v, const char *name, uint64_t *obj, > Error **errp); > /* Must be set. */ > - void (*type_bool)(Visitor *v, bool *obj, const char *name, Error **e= rrp); > - void (*type_str)(Visitor *v, char **obj, const char *name, Error **e= rrp); > - void (*type_number)(Visitor *v, double *obj, const char *name, > + void (*type_bool)(Visitor *v, const char *name, bool *obj, Error **e= rrp); > + void (*type_str)(Visitor *v, const char *name, char **obj, Error **e= rrp); > + void (*type_number)(Visitor *v, const char *name, double *obj, > Error **errp); > - void (*type_any)(Visitor *v, QObject **obj, const char *name, > + void (*type_any)(Visitor *v, const char *name, QObject **obj, > Error **errp); > > /* May be NULL; most useful for input visitors. */ > - void (*optional)(Visitor *v, bool *present, const char *name); > + void (*optional)(Visitor *v, const char *name, bool *present); > > bool (*start_union)(Visitor *v, bool data_present, Error **errp); > void (*end_union)(Visitor *v, bool data_present, Error **errp); > }; > > -void input_type_enum(Visitor *v, int *obj, const char * const strings[], > - const char *kind, const char *name, Error **errp); > -void output_type_enum(Visitor *v, int *obj, const char * const strings[], > - const char *kind, const char *name, Error **errp); > +void input_type_enum(Visitor *v, const char *name, int *obj, > + const char * const strings[], const char *kind, > + Error **errp); > +void output_type_enum(Visitor *v, const char *name, int *obj, > + const char * const strings[], const char *kind, > + Error **errp); > > #endif I checked the changes to this file carefully. Can we rely on the compiler to flag mistakes in the rest of the patch?