aboutsummaryrefslogtreecommitdiff
path: root/block/ssh.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-07-07 18:06:07 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-07-10 15:18:08 +0200
commitb11a093c6025635b4504d79d30daa334a01279a5 (patch)
treeba15ee5016a149a5fc3d302417398cd585754f13 /block/ssh.c
parent4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7 (diff)
downloadqemu-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 'block/ssh.c')
-rw-r--r--block/ssh.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/block/ssh.c b/block/ssh.c
index f00b896..ebe3d8b 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -616,7 +616,6 @@ static BlockdevOptionsSsh *ssh_parse_options(QDict *options, Error **errp)
{
BlockdevOptionsSsh *result = NULL;
QemuOpts *opts = NULL;
- Error *local_err = NULL;
const QDictEntry *e;
Visitor *v;
@@ -636,11 +635,9 @@ static BlockdevOptionsSsh *ssh_parse_options(QDict *options, Error **errp)
goto fail;
}
- visit_type_BlockdevOptionsSsh(v, NULL, &result, &local_err);
+ visit_type_BlockdevOptionsSsh(v, NULL, &result, errp);
visit_free(v);
-
- if (local_err) {
- error_propagate(errp, local_err);
+ if (!result) {
goto fail;
}