From 247a511c4ac962b4d4c275cfce8ed7e059cfa71b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 3 Mar 2018 17:26:13 -0500 Subject: [PATCH] qapi: Factor out common part of qobject input visitor creation Backports commit abe81bc21a6996c62e66ed2d051373c0df24f870 from qemu --- qemu/qapi/qobject-input-visitor.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/qemu/qapi/qobject-input-visitor.c b/qemu/qapi/qobject-input-visitor.c index e7085842..e475f023 100644 --- a/qemu/qapi/qobject-input-visitor.c +++ b/qemu/qapi/qobject-input-visitor.c @@ -482,12 +482,11 @@ static void qobject_input_free(Visitor *v) g_free(qiv); } -Visitor *qobject_input_visitor_new(QObject *obj) +static QObjectInputVisitor *qobject_input_visitor_base_new(QObject *obj) { - QObjectInputVisitor *v; + QObjectInputVisitor *v = g_malloc0(sizeof(*v)); assert(obj); - v = g_malloc0(sizeof(*v)); v->visitor.type = VISITOR_INPUT; v->visitor.start_struct = qobject_input_start_struct; @@ -498,6 +497,19 @@ Visitor *qobject_input_visitor_new(QObject *obj) v->visitor.next_list = qobject_input_next_list; v->visitor.check_list = qobject_input_check_list; v->visitor.end_list = qobject_input_pop; + v->visitor.optional = qobject_input_optional; + v->visitor.free = qobject_input_free; + + v->root = obj; + qobject_incref(obj); + + return v; +} + +Visitor *qobject_input_visitor_new(QObject *obj) +{ + QObjectInputVisitor *v = qobject_input_visitor_base_new(obj); + v->visitor.type_int64 = qobject_input_type_int64; v->visitor.type_uint64 = qobject_input_type_uint64; v->visitor.type_bool = qobject_input_type_bool; @@ -505,11 +517,6 @@ Visitor *qobject_input_visitor_new(QObject *obj) v->visitor.type_number = qobject_input_type_number; v->visitor.type_any = qobject_input_type_any; v->visitor.type_null = qobject_input_type_null; - v->visitor.optional = qobject_input_optional; - v->visitor.free = qobject_input_free; - - v->root = obj; - qobject_incref(obj); return &v->visitor; }