block/mirror: don't install backing chain on abort
authorJohn Snow <jsnow@redhat.com>
Thu, 6 Sep 2018 13:02:14 +0000 (09:02 -0400)
committerMax Reitz <mreitz@redhat.com>
Tue, 25 Sep 2018 13:31:15 +0000 (15:31 +0200)
In cases where we abort the block/mirror job, there's no point in
installing the new backing chain before we finish aborting.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20180906130225.5118-6-jsnow@redhat.com
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
block/mirror.c

index cba555b4efba915674700c77faa529a10fcb6ed1..bd3e9087100967b60637040925353b70d15bd2e8 100644 (file)
@@ -642,7 +642,7 @@ static void mirror_exit(Job *job)
      * required before it could become a backing file of target_bs. */
     bdrv_child_try_set_perm(mirror_top_bs->backing, 0, BLK_PERM_ALL,
                             &error_abort);
-    if (s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
+    if (ret == 0 && s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
         BlockDriverState *backing = s->is_none_mode ? src : s->base;
         if (backing_bs(target_bs) != backing) {
             bdrv_set_backing_hd(target_bs, backing, &local_err);