yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From bc78ee07bf400cbff0021367e05d308870471710 Mon Sep 17 00:00:00 2001
902636
From: Sergio Lopez Pascual <slp@redhat.com>
902636
Date: Fri, 7 Feb 2020 11:27:45 +0000
902636
Subject: [PATCH 12/18] backup-top: Begin drain earlier
902636
902636
RH-Author: Sergio Lopez Pascual <slp@redhat.com>
902636
Message-id: <20200207112749.25073-6-slp@redhat.com>
902636
Patchwork-id: 93757
902636
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH v2 5/9] backup-top: Begin drain earlier
902636
Bugzilla: 1745606 1746217 1773517 1779036 1782111 1782175 1783965
902636
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
902636
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
902636
RH-Acked-by: Max Reitz <mreitz@redhat.com>
902636
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
902636
From: Max Reitz <mreitz@redhat.com>
902636
902636
When dropping backup-top, we need to drain the node before freeing the
902636
BlockCopyState.  Otherwise, requests may still be in flight and then the
902636
assertion in shres_destroy() will fail.
902636
902636
(This becomes visible in intermittent failure of 056.)
902636
902636
Cc: qemu-stable@nongnu.org
902636
Signed-off-by: Max Reitz <mreitz@redhat.com>
902636
Message-id: 20191219182638.104621-1-mreitz@redhat.com
902636
Signed-off-by: Max Reitz <mreitz@redhat.com>
902636
(cherry picked from commit 503ca1262bab2c11c533a4816d1ff4297d4f58a6)
902636
Signed-off-by: Sergio Lopez <slp@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 block/backup-top.c | 4 ++--
902636
 1 file changed, 2 insertions(+), 2 deletions(-)
902636
902636
diff --git a/block/backup-top.c b/block/backup-top.c
902636
index 7cdb1f8..818d3f2 100644
902636
--- a/block/backup-top.c
902636
+++ b/block/backup-top.c
902636
@@ -257,12 +257,12 @@ void bdrv_backup_top_drop(BlockDriverState *bs)
902636
     BDRVBackupTopState *s = bs->opaque;
902636
     AioContext *aio_context = bdrv_get_aio_context(bs);
902636
 
902636
-    block_copy_state_free(s->bcs);
902636
-
902636
     aio_context_acquire(aio_context);
902636
 
902636
     bdrv_drained_begin(bs);
902636
 
902636
+    block_copy_state_free(s->bcs);
902636
+
902636
     s->active = false;
902636
     bdrv_child_refresh_perms(bs, bs->backing, &error_abort);
902636
     bdrv_replace_node(bs, backing_bs(bs), &error_abort);
902636
-- 
902636
1.8.3.1
902636