diff options
author | Markus Armbruster <armbru@redhat.com> | 2020-07-07 18:06:07 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2020-07-10 15:18:08 +0200 |
commit | b11a093c6025635b4504d79d30daa334a01279a5 (patch) | |
tree | ba15ee5016a149a5fc3d302417398cd585754f13 /hw/block/xen-block.c | |
parent | 4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7 (diff) | |
download | qemu-b11a093c6025635b4504d79d30daa334a01279a5.zip qemu-b11a093c6025635b4504d79d30daa334a01279a5.tar.gz qemu-b11a093c6025635b4504d79d30daa334a01279a5.tar.bz2 |
qapi: Smooth another visitor error checking pattern
Convert
visit_type_FOO(v, ..., &ptr, &err);
...
if (err) {
...
}
to
visit_type_FOO(v, ..., &ptr, errp);
...
if (!ptr) {
...
}
for functions that set @ptr to non-null / null on success / error.
Eliminate error_propagate() that are now unnecessary. Delete @err
that are now unused.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-40-armbru@redhat.com>
Diffstat (limited to 'hw/block/xen-block.c')
-rw-r--r-- | hw/block/xen-block.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 96c6c00..a775fba 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -682,11 +682,9 @@ static char *xen_block_blockdev_add(const char *id, QDict *qdict, trace_xen_block_blockdev_add(node_name); v = qobject_input_visitor_new(QOBJECT(qdict)); - visit_type_BlockdevOptions(v, NULL, &options, &local_err); + visit_type_BlockdevOptions(v, NULL, &options, errp); visit_free(v); - - if (local_err) { - error_propagate(errp, local_err); + if (!options) { goto fail; } |