diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-06-26 18:22:59 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-07-24 13:35:11 +0200 |
| commit | d2f95f4d482374485234790a6fc3cca29ebb7355 (patch) | |
| tree | 4c95230bc64d9a294c9bc6de6696e887576a235a /qapi/qobject-input-visitor.c | |
| parent | 006ca09f3027d86346fce707e9295975c6558f42 (diff) | |
| download | focaccia-qemu-d2f95f4d482374485234790a6fc3cca29ebb7355.tar.gz focaccia-qemu-d2f95f4d482374485234790a6fc3cca29ebb7355.zip | |
qapi: Use QNull for a more regular visit_type_null()
Make visit_type_null() take an @obj argument like its buddies. This helps keep the next commit simple. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'qapi/qobject-input-visitor.c')
| -rw-r--r-- | qapi/qobject-input-visitor.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 35aff78f2b..ee9e47d911 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -587,11 +587,13 @@ static void qobject_input_type_any(Visitor *v, const char *name, QObject **obj, *obj = qobj; } -static void qobject_input_type_null(Visitor *v, const char *name, Error **errp) +static void qobject_input_type_null(Visitor *v, const char *name, + QNull **obj, Error **errp) { QObjectInputVisitor *qiv = to_qiv(v); QObject *qobj = qobject_input_get_object(qiv, name, true, errp); + *obj = NULL; if (!qobj) { return; } @@ -599,7 +601,9 @@ static void qobject_input_type_null(Visitor *v, const char *name, Error **errp) if (qobject_type(qobj) != QTYPE_QNULL) { error_setg(errp, QERR_INVALID_PARAMETER_TYPE, full_name(qiv, name), "null"); + return; } + *obj = qnull(); } static void qobject_input_type_size_keyval(Visitor *v, const char *name, |