commit 934aee14d36e67468260635af61c387227cdaf78
author Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Tue Feb 02 15:49:44 2021 +0300
committer Eric Blake <eblake@redhat.com> Fri Feb 12 15:39:44 2021 -0600
tree baa87d2a9264822f6fe7ebcd71f5523ff989a9df
parent a1e708fcda5eab10c866a7d6a4fad4f80b69ad15

block: use return status of bdrv_append()

Now bdrv_append returns status and we can drop all the local_err things
around it.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20210202124956.63146-3-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>

block.c

diff --git a/block.c b/block.c
index fdb0261..c682c3e 100644
--- a/block.c
+++ b/block.c
@@ -3118,7 +3118,6 @@
     int64_t total_size;
     QemuOpts *opts = NULL;
     BlockDriverState *bs_snapshot = NULL;
-    Error *local_err = NULL;
     int ret;
 
     /* if snapshot, we create a temporary backing file and open it
@@ -3165,9 +3164,8 @@
      * 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 = bdrv_append(bs_snapshot, bs, errp);
+    if (ret < 0) {
         bs_snapshot = NULL;
         goto out;
     }