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>

blockdev.c

diff --git a/blockdev.c b/blockdev.c
index b250b9b..cd438e6 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1432,6 +1432,7 @@
 static void external_snapshot_prepare(BlkActionState *common,
                                       Error **errp)
 {
+    int ret;
     int flags = 0;
     QDict *options = NULL;
     Error *local_err = NULL;
@@ -1591,9 +1592,8 @@
      * can fail, so we need to do it in .prepare; undoing it for abort is
      * always possible. */
     bdrv_ref(state->new_bs);
-    bdrv_append(state->new_bs, state->old_bs, &local_err);
-    if (local_err) {
-        error_propagate(errp, local_err);
+    ret = bdrv_append(state->new_bs, state->old_bs, errp);
+    if (ret < 0) {
         goto out;
     }
     state->overlay_appended = true;