From patchwork Mon Nov 26 12:10:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [1.3] qapi: handle visitor->type_size() in QapiDeallocVisitor Date: Mon, 26 Nov 2012 02:10:12 -0000 From: Stefan Hajnoczi X-Patchwork-Id: 201664 Message-Id: <1353931812-4451-1-git-send-email-stefanha@redhat.com> To: Cc: 1079713@bugs.launchpad.net, Anthony Liguori , Michael Roth , Stefan Hajnoczi visit_type_size() requires either visitor->type_size() or visitor_uint64() to be implemented, otherwise a NULL function pointer is invoked. It is possible to trigger this crash as follows: $ qemu-system-x86_64 -netdev tap,sndbuf=0,id=netdev0 \ -device virtio-blk-pci,netdev=netdev0 The 'sndbuf' option has type "size". Signed-off-by: Stefan Hajnoczi Reviewed-by: Andreas Färber Reviewed-by: Michael Roth --- This patch ensures that -netdev tap,sndbuf=X works in QEMU 1.3. 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 a154523..a07b171 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -132,6 +132,11 @@ 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, + Error **errp) +{ +} + static void qapi_dealloc_type_enum(Visitor *v, int *obj, const char *strings[], const char *kind, const char *name, Error **errp) @@ -164,6 +169,7 @@ QapiDeallocVisitor *qapi_dealloc_visitor_new(void) v->visitor.type_bool = qapi_dealloc_type_bool; v->visitor.type_str = qapi_dealloc_type_str; v->visitor.type_number = qapi_dealloc_type_number; + v->visitor.type_size = qapi_dealloc_type_size; QTAILQ_INIT(&v->stack);