From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37030 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQSt-0008LV-IS for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:45:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PmQSq-0001aZ-S5 for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:45:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmQSq-0001aG-Jb for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:45:08 -0500 From: Kevin Wolf Date: Mon, 7 Feb 2011 13:46:34 +0100 Message-Id: <1297082796-1369-13-git-send-email-kwolf@redhat.com> In-Reply-To: <1297082796-1369-1-git-send-email-kwolf@redhat.com> References: <1297082796-1369-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE 0.14][PATCH 12/14] block-migration: add reference to target DriveInfo List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Marcelo Tosatti So that ejection of attached device by guest does not free data in use by block migration instance. Signed-off-by: Marcelo Tosatti CC: Markus Armbruster Signed-off-by: Kevin Wolf (cherry picked from commit f48905d44f670cd83227b3a8d06ae1406f0c771c) --- block-migration.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/block-migration.c b/block-migration.c index 483ca7b..323e1e2 100644 --- a/block-migration.c +++ b/block-migration.c @@ -19,6 +19,7 @@ #include "monitor.h" #include "block-migration.h" #include "migration.h" +#include "blockdev.h" #include #define BLOCK_SIZE (BDRV_SECTORS_PER_DIRTY_CHUNK << BDRV_SECTOR_BITS) @@ -299,6 +300,7 @@ static void init_blk_migration_it(void *opaque, BlockDriverState *bs) bmds->completed_sectors = 0; bmds->shared_base = block_mig_state.shared_base; alloc_aio_bitmap(bmds); + drive_get_ref(drive_get_by_blockdev(bs)); block_mig_state.total_sector_sum += sectors; @@ -537,6 +539,7 @@ static void blk_mig_cleanup(Monitor *mon) while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) { QSIMPLEQ_REMOVE_HEAD(&block_mig_state.bmds_list, entry); + drive_put_ref(drive_get_by_blockdev(bmds->bs)); qemu_free(bmds->aio_bitmap); qemu_free(bmds); } -- 1.7.2.3