summaryrefslogtreecommitdiff
path: root/block/quorum.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-04-25 16:50:31 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2014-04-25 18:05:06 +0200
commit0fb6395c0cb5046432a80d608ddde7a3b2f8a9ae (patch)
treebc4d5b75394733d277652b127066461b7197c360 /block/quorum.c
parenta28315ebaf3910b65ef51abefc4ef040265afc19 (diff)
downloadqemu-0fb6395c0cb5046432a80d608ddde7a3b2f8a9ae.tar.gz
Use error_is_set() only when necessary (again)
error_is_set(&var) is the same as var != NULL, but it takes whole-program analysis to figure that out. Unnecessarily hard for optimizers, static checkers, and human readers. Commit 84d18f0 dumbed it down to obvious, but a few more have crept in since, and documentation was overlooked. Dumb these down, too. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/quorum.c')
-rw-r--r--block/quorum.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/quorum.c b/block/quorum.c
index 7f580a83b5..ecec3a5407 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -753,7 +753,7 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
opts = qemu_opts_create(&quorum_runtime_opts, NULL, 0, &error_abort);
qemu_opts_absorb_qdict(opts, options, &local_err);
- if (error_is_set(&local_err)) {
+ if (local_err) {
ret = -EINVAL;
goto exit;
}
@@ -828,7 +828,7 @@ close_exit:
g_free(opened);
exit:
/* propagate error */
- if (error_is_set(&local_err)) {
+ if (local_err) {
error_propagate(errp, local_err);
}
QDECREF(list);