diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-03-03 13:32:32 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-03-05 09:14:19 +0100 |
| commit | b8874fbfd329b5084463bcacd1418d493a93c383 (patch) | |
| tree | 455423d282f24773cb0d21f0a51d11a107fe4523 /qapi/qobject-input-visitor.c | |
| parent | 910f738b851a263396fc85b2052e47f884ffead3 (diff) | |
| download | qemu-b8874fbfd329b5084463bcacd1418d493a93c383.tar.gz | |
qapi: Clean up after commit 3d344c2
Drop unused QIV_STACK_SIZE and unused qobject_input_start_struct()
parameter errp.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1488544368-30622-13-git-send-email-armbru@redhat.com>
Diffstat (limited to 'qapi/qobject-input-visitor.c')
| -rw-r--r-- | qapi/qobject-input-visitor.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index f3b6713f94..2c2f88338f 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -21,8 +21,6 @@ #include "qapi/qmp/types.h" #include "qapi/qmp/qerror.h" -#define QIV_STACK_SIZE 1024 - typedef struct StackObject { QObject *obj; /* Object being visited */ @@ -103,8 +101,7 @@ static void qdict_add_key(const char *key, QObject *obj, void *opaque) } static const QListEntry *qobject_input_push(QObjectInputVisitor *qiv, - QObject *obj, void *qapi, - Error **errp) + QObject *obj, void *qapi) { GHashTable *h; StackObject *tos = g_new0(StackObject, 1); @@ -170,7 +167,6 @@ static void qobject_input_start_struct(Visitor *v, const char *name, void **obj, { QObjectInputVisitor *qiv = to_qiv(v); QObject *qobj = qobject_input_get_object(qiv, name, true, errp); - Error *err = NULL; if (obj) { *obj = NULL; @@ -184,11 +180,7 @@ static void qobject_input_start_struct(Visitor *v, const char *name, void **obj, return; } - qobject_input_push(qiv, qobj, obj, &err); - if (err) { - error_propagate(errp, err); - return; - } + qobject_input_push(qiv, qobj, obj); if (obj) { *obj = g_malloc0(size); @@ -216,7 +208,7 @@ static void qobject_input_start_list(Visitor *v, const char *name, return; } - entry = qobject_input_push(qiv, qobj, list, errp); + entry = qobject_input_push(qiv, qobj, list); if (list) { if (entry) { *list = g_malloc0(size); |