diff options
author | Markus Armbruster <armbru@redhat.com> | 2020-07-07 18:05:42 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2020-07-10 15:17:35 +0200 |
commit | 235e59cf03ed75d0ce96c97343194ed11c146231 (patch) | |
tree | c2de9b6a66355d038fe4ccb4d79de13905101b52 /block/blkdebug.c | |
parent | c75d7f71918b8497a710f3f2b646567c09db3770 (diff) | |
download | qemu-235e59cf03ed75d0ce96c97343194ed11c146231.zip qemu-235e59cf03ed75d0ce96c97343194ed11c146231.tar.gz qemu-235e59cf03ed75d0ce96c97343194ed11c146231.tar.bz2 |
qemu-option: Use returned bool to check for failure
The previous commit enables conversion of
foo(..., &err);
if (err) {
...
}
to
if (!foo(..., &err)) {
...
}
for QemuOpts functions that now return true / false on success /
error. Coccinelle script:
@@
identifier fun = {
opts_do_parse, parse_option_bool, parse_option_number,
parse_option_size, qemu_opt_parse, qemu_opt_rename, qemu_opt_set,
qemu_opt_set_bool, qemu_opt_set_number, qemu_opts_absorb_qdict,
qemu_opts_do_parse, qemu_opts_from_qdict_entry, qemu_opts_set,
qemu_opts_validate
};
expression list args, args2;
typedef Error;
Error *err;
@@
- fun(args, &err, args2);
- if (err)
+ if (!fun(args, &err, args2))
{
...
}
A few line breaks tidied up manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-15-armbru@redhat.com>
[Conflict with commit 0b6786a9c1 "block/amend: refactor qcow2 amend
options" resolved by rerunning Coccinelle on master's version]
Diffstat (limited to 'block/blkdebug.c')
-rw-r--r-- | block/blkdebug.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/blkdebug.c b/block/blkdebug.c index 7194bc7..d473dcf 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -472,8 +472,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, uint64_t align; opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); - qemu_opts_absorb_qdict(opts, options, &local_err); - if (local_err) { + if (!qemu_opts_absorb_qdict(opts, options, &local_err)) { error_propagate(errp, local_err); ret = -EINVAL; goto out; |