commit a4615ab31cade201641cbb17a81dcac1b3bea624
author Kevin Wolf <kwolf@redhat.com> Tue Mar 05 16:51:13 2019 +0100
committer Kevin Wolf <kwolf@redhat.com> Tue Mar 12 20:30:14 2019 +0100
tree d74466022ab727c44a4623e067c9504993d788f0
parent 12efe428c9e01f3e195e3ae801cfd9c814ee777d

block: Avoid useless local_err

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>

block.c

diff --git a/block.c b/block.c
index ccf008c..e18bd5e 100644
--- a/block.c
+++ b/block.c
@@ -3155,14 +3155,12 @@
 {
     int ret = -1;
     BlockReopenQueueEntry *bs_entry, *next;
-    Error *local_err = NULL;
 
     assert(bs_queue != NULL);
 
     QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {
         assert(bs_entry->state.bs->quiesce_counter > 0);
-        if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, &local_err)) {
-            error_propagate(errp, local_err);
+        if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, errp)) {
             goto cleanup;
         }
         bs_entry->prepared = true;