From patchwork Mon Feb 7 12:40:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 82231 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 2FED1B7143 for ; Tue, 8 Feb 2011 10:25:21 +1100 (EST) Received: from localhost ([127.0.0.1]:51627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQlD-00088l-0N for incoming@patchwork.ozlabs.org; Mon, 07 Feb 2011 08:04:07 -0500 Received: from [140.186.70.92] (port=59177 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQN3-0005AI-LO for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:39:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PmQMz-0008FL-JF for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:39:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51392) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmQMz-0008F3-9e for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:39:05 -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 p17Cd4Mp005907 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 7 Feb 2011 07:39:04 -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 p17CcjI5025718; Mon, 7 Feb 2011 07:39:03 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 7 Feb 2011 13:40:30 +0100 Message-Id: <1297082430-628-15-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 14/14] block: enable in_use flag 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 Set block device in use during block migration, disallow drive_del and bdrv_truncate for in use devices. Signed-off-by: Marcelo Tosatti Signed-off-by: Kevin Wolf --- block-migration.c | 2 ++ block.c | 2 ++ blockdev.c | 4 ++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/block-migration.c b/block-migration.c index 323e1e2..8218bac 100644 --- a/block-migration.c +++ b/block-migration.c @@ -301,6 +301,7 @@ static void init_blk_migration_it(void *opaque, BlockDriverState *bs) bmds->shared_base = block_mig_state.shared_base; alloc_aio_bitmap(bmds); drive_get_ref(drive_get_by_blockdev(bs)); + bdrv_set_in_use(bs, 1); block_mig_state.total_sector_sum += sectors; @@ -539,6 +540,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); + bdrv_set_in_use(bmds->bs, 0); drive_put_ref(drive_get_by_blockdev(bmds->bs)); qemu_free(bmds->aio_bitmap); qemu_free(bmds); diff --git a/block.c b/block.c index ee9edfc..b476479 100644 --- a/block.c +++ b/block.c @@ -1132,6 +1132,8 @@ int bdrv_truncate(BlockDriverState *bs, int64_t offset) return -ENOTSUP; if (bs->read_only) return -EACCES; + if (bdrv_in_use(bs)) + return -EBUSY; ret = drv->bdrv_truncate(bs, offset); if (ret == 0) { ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS); diff --git a/blockdev.c b/blockdev.c index f2a00bd..ecfadc1 100644 --- a/blockdev.c +++ b/blockdev.c @@ -726,6 +726,10 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) qerror_report(QERR_DEVICE_NOT_FOUND, id); return -1; } + if (bdrv_in_use(bs)) { + qerror_report(QERR_DEVICE_IN_USE, id); + return -1; + } /* quiesce block driver; prevent further io */ qemu_aio_flush();