From patchwork Mon Feb 7 12:40:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 82238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ABC2FB70FF for ; Tue, 8 Feb 2011 10:41:07 +1100 (EST) Received: from localhost ([127.0.0.1]:43973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQeX-0005FY-0v for incoming@patchwork.ozlabs.org; Mon, 07 Feb 2011 07:57:13 -0500 Received: from [140.186.70.92] (port=59156 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQN2-00059R-GN for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:39:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PmQMx-0008EI-Ep for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:39:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmQMx-0008Dy-6x for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:39:03 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p17Cd1Mh008099 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 7 Feb 2011 07:39:01 -0500 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p17CcjI3025718; Mon, 7 Feb 2011 07:39:00 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 7 Feb 2011 13:40:28 +0100 Message-Id: <1297082430-628-13-git-send-email-kwolf@redhat.com> In-Reply-To: <1297082430-628-1-git-send-email-kwolf@redhat.com> References: <1297082430-628-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 12/14] block-migration: add reference to target DriveInfo X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 --- 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); }