[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/28] block: Simplify bdrv_append_temp_snapshot() lo
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 09/28] block: Simplify bdrv_append_temp_snapshot() logic |
Date: |
Thu, 4 May 2017 17:23:46 +0200 |
From: Eric Blake <address@hidden>
Noticed while checking Coccinelle results. Naming a label 'out:'
when it is only used on error paths is weird. Also, we had some
dead stores to 'ret'. Meanwhile we know that snapshot_options
is NULL on success and that QDECREF(NULL) is safe. So merge the
two exit paths into one by careful control over bs_snapshot.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
block.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/block.c b/block.c
index 5b70f58..1ee9db2 100644
--- a/block.c
+++ b/block.c
@@ -2195,7 +2195,7 @@ static BlockDriverState
*bdrv_append_temp_snapshot(BlockDriverState *bs,
char *tmp_filename = g_malloc0(PATH_MAX + 1);
int64_t total_size;
QemuOpts *opts = NULL;
- BlockDriverState *bs_snapshot;
+ BlockDriverState *bs_snapshot = NULL;
Error *local_err = NULL;
int ret;
@@ -2235,28 +2235,25 @@ static BlockDriverState
*bdrv_append_temp_snapshot(BlockDriverState *bs,
bs_snapshot = bdrv_open(NULL, NULL, snapshot_options, flags, errp);
snapshot_options = NULL;
if (!bs_snapshot) {
- ret = -EINVAL;
goto out;
}
- /* bdrv_append() consumes a strong reference to bs_snapshot (i.e. it will
- * call bdrv_unref() on it), so in order to be able to return one, we have
- * to increase bs_snapshot's refcount here */
+ /* bdrv_append() consumes a strong reference to bs_snapshot
+ * (i.e. it will call bdrv_unref() on it) even on error, so in
+ * order to be able to return one, we have to increase
+ * bs_snapshot's refcount here */
bdrv_ref(bs_snapshot);
bdrv_append(bs_snapshot, bs, &local_err);
if (local_err) {
error_propagate(errp, local_err);
- ret = -EINVAL;
+ bs_snapshot = NULL;
goto out;
}
+out:
+ QDECREF(snapshot_options);
g_free(tmp_filename);
return bs_snapshot;
-
-out:
- QDECREF(snapshot_options);
- g_free(tmp_filename);
- return NULL;
}
/*
--
2.7.4
- [Qemu-devel] [PULL 00/28] QAPI patches for 2017-05-04, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 09/28] block: Simplify bdrv_append_temp_snapshot() logic,
Markus Armbruster <=
- [Qemu-devel] [PULL 03/28] pci: Use struct instead of QDict to pass back parameters, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 07/28] qobject: Add helper macros for common scalar insertions, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 05/28] coccinelle: Add script to remove useless QObject casts, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 10/28] QemuOpts: Simplify qemu_opts_to_qdict(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 21/28] qobject-input-visitor: Document full_name_nth(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 01/28] tests/check-qdict: Fix missing brackets, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 04/28] pci: Reduce scope of error injection, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 22/28] qapi: Document intended use of @name within alternate visits, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 02/28] test-keyval: fix leaks, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 11/28] fdc-test: Avoid deprecated 'change' command, Markus Armbruster, 2017/05/04