diff options
author | Eric Blake <eblake@redhat.com> | 2016-01-29 06:48:58 -0700 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2016-02-08 17:29:57 +0100 |
commit | bdd8e6b5d8a9def83d491a3f41c10424fc366258 (patch) | |
tree | 5dbd184d2b8afebddee58a26f2b996f7cc95552c | |
parent | 337283dffbb5ad5860ed00408a5fd0665c21be07 (diff) | |
download | qemu-bdd8e6b5d8a9def83d491a3f41c10424fc366258.tar.gz qemu-bdd8e6b5d8a9def83d491a3f41c10424fc366258.tar.bz2 qemu-bdd8e6b5d8a9def83d491a3f41c10424fc366258.zip |
qapi: Tighten qmp_input_end_list()
The only way that qmp_input_pop() will set errp is if a dictionary
was the most recent thing pushed. Since we don't have any
push(struct)/pop(list) or push(list)/pop(struct) mismatches (such
a mismatch is a programming bug), we therefore cannot set errp
inside qmp_input_end_list(). Make this obvious by
using &error_abort. A later patch will then remove the errp
parameter of qmp_input_pop(), but that will first require the
larger task of splitting visit_end_struct().
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-23-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r-- | qapi/qmp-input-visitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c index 92eee26438..4563c20c13 100644 --- a/qapi/qmp-input-visitor.c +++ b/qapi/qmp-input-visitor.c @@ -206,7 +206,7 @@ static void qmp_input_end_list(Visitor *v, Error **errp) { QmpInputVisitor *qiv = to_qiv(v); - qmp_input_pop(qiv, errp); + qmp_input_pop(qiv, &error_abort); } static void qmp_input_get_next_type(Visitor *v, const char *name, QType *type, |