| Message ID | 1410477659-9163-3-git-send-email-mdroth@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 09/11/2014 05:20 PM, Michael Roth wrote: > If the .data field of a QAPI Union is NULL, we don't need to free > any of the union fields.. intentional double dot? > > Make use of the new visit_start_union interface to access this > information and instruct the generated code to not visit these > fields when this occurs. > > Cc: qemu-stable@nongnu.org > Reported-by: Fam Zheng <famz@redhat.com> > Suggested-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > --- > qapi/qapi-dealloc-visitor.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c > index dc53545..eb77078 100644 > --- a/qapi/qapi-dealloc-visitor.c > +++ b/qapi/qapi-dealloc-visitor.c > @@ -162,6 +162,11 @@ static void qapi_dealloc_type_enum(Visitor *v, int *obj, const char *strings[], > { > } > > +static bool qapi_dealloc_start_union(Visitor *v, bool data_present, Error **errp) Long line. > +{ > + return data_present; Okay, so this is a case where you can return false without setting errp. It would be nice to document the interactions and contract of this visitor here or in patch 1.
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index dc53545..eb77078 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -162,6 +162,11 @@ static void qapi_dealloc_type_enum(Visitor *v, int *obj, const char *strings[], { } +static bool qapi_dealloc_start_union(Visitor *v, bool data_present, Error **errp) +{ + return data_present; +} + Visitor *qapi_dealloc_get_visitor(QapiDeallocVisitor *v) { return &v->visitor; @@ -191,6 +196,7 @@ QapiDeallocVisitor *qapi_dealloc_visitor_new(void) v->visitor.type_str = qapi_dealloc_type_str; v->visitor.type_number = qapi_dealloc_type_number; v->visitor.type_size = qapi_dealloc_type_size; + v->visitor.start_union = qapi_dealloc_start_union; QTAILQ_INIT(&v->stack);
If the .data field of a QAPI Union is NULL, we don't need to free any of the union fields.. Make use of the new visit_start_union interface to access this information and instruct the generated code to not visit these fields when this occurs. Cc: qemu-stable@nongnu.org Reported-by: Fam Zheng <famz@redhat.com> Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> --- qapi/qapi-dealloc-visitor.c | 6 ++++++ 1 file changed, 6 insertions(+)