| Message ID | 1354047085-12401-1-git-send-email-brogers@suse.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Nov 27, 2012 at 01:11:25PM -0700, Bruce Rogers wrote: > The second parameter to qapi_dealloc_type_size should be a uint64_t *, > not a size_t *. This was causing our 32 bit x86 build to fail, since > warnings are treated as errors. > > Signed-off-by: Bruce Rogers <brogers@suse.com> Doh, I should've caught this in review. Yes, qapi's type generator uses uint64_t as the underlying type for 'size', and the visitor interface calls for uint64_t*, so that's what the implementation should use. Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> > --- > qapi/qapi-dealloc-visitor.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c > index a07b171..75214e7 100644 > --- a/qapi/qapi-dealloc-visitor.c > +++ b/qapi/qapi-dealloc-visitor.c > @@ -132,7 +132,7 @@ static void qapi_dealloc_type_number(Visitor *v, double *obj, const char *name, > { > } > > -static void qapi_dealloc_type_size(Visitor *v, size_t *obj, const char *name, > +static void qapi_dealloc_type_size(Visitor *v, uint64_t *obj, const char *name, > Error **errp) > { > } > -- > 1.7.7 >
Am 27.11.2012 21:54, schrieb mdroth: > On Tue, Nov 27, 2012 at 01:11:25PM -0700, Bruce Rogers wrote: >> The second parameter to qapi_dealloc_type_size should be a uint64_t *, >> not a size_t *. This was causing our 32 bit x86 build to fail, since >> warnings are treated as errors. >> >> Signed-off-by: Bruce Rogers <brogers@suse.com> > Doh, I should've caught this in review. Yes, qapi's type generator uses > uint64_t as the underlying type for 'size', and the visitor interface > calls for uint64_t*, so that's what the implementation should use. > > Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> I have sent a similar patch this morning but just noticed that I forgot to cc qemu-devel. Only Stefan H. and Anthony got it :-( Anthony, as Bruce' patch was already reviewed, please commit this one instead of my patch. Reviewed-by: Stefan Weil <sw@weilnetz.de> >> --- >> qapi/qapi-dealloc-visitor.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c >> index a07b171..75214e7 100644 >> --- a/qapi/qapi-dealloc-visitor.c >> +++ b/qapi/qapi-dealloc-visitor.c >> @@ -132,7 +132,7 @@ static void qapi_dealloc_type_number(Visitor *v, double *obj, const char *name, >> { >> } >> >> -static void qapi_dealloc_type_size(Visitor *v, size_t *obj, const char *name, >> +static void qapi_dealloc_type_size(Visitor *v, uint64_t *obj, const char *name, >> Error **errp) >> { >> } >> -- >> 1.7.7 >>
On Tue, Nov 27, 2012 at 01:11:25PM -0700, Bruce Rogers wrote: > The second parameter to qapi_dealloc_type_size should be a uint64_t *, > not a size_t *. This was causing our 32 bit x86 build to fail, since > warnings are treated as errors. > > Signed-off-by: Bruce Rogers <brogers@suse.com> > --- > qapi/qapi-dealloc-visitor.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Sorry for the broken build. Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index a07b171..75214e7 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -132,7 +132,7 @@ static void qapi_dealloc_type_number(Visitor *v, double *obj, const char *name, { } -static void qapi_dealloc_type_size(Visitor *v, size_t *obj, const char *name, +static void qapi_dealloc_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp) { }
The second parameter to qapi_dealloc_type_size should be a uint64_t *, not a size_t *. This was causing our 32 bit x86 build to fail, since warnings are treated as errors. Signed-off-by: Bruce Rogers <brogers@suse.com> --- qapi/qapi-dealloc-visitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)