From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGVaG-0003KT-DD for qemu-devel@nongnu.org; Tue, 25 Sep 2012 09:54:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGVa6-0006Kf-T8 for qemu-devel@nongnu.org; Tue, 25 Sep 2012 09:53:56 -0400 From: Kevin Wolf Date: Tue, 25 Sep 2012 15:53:39 +0200 Message-Id: <1348581219-8561-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] block-migration: Flush requests in blk_mig_cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pl@dlhnet.de, qemu-stable@nongnu.org When cancelling block migration, all in-flight requests of the block migration must be completed before the data can be freed. This was visible as failing assertions and segfaults. Reported-by: Peter Lieven Signed-off-by: Kevin Wolf --- block-migration.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/block-migration.c b/block-migration.c index 7def8ab..ed93301 100644 --- a/block-migration.c +++ b/block-migration.c @@ -519,6 +519,8 @@ static void blk_mig_cleanup(void) BlkMigDevState *bmds; BlkMigBlock *blk; + bdrv_drain_all(); + set_dirty_tracking(0); while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) { -- 1.7.6.5