From patchwork Mon Feb 7 12:40:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 82181 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 33D22B6F12 for ; Tue, 8 Feb 2011 09:29:24 +1100 (EST) Received: from localhost ([127.0.0.1]:51030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQkM-0007ii-Dd for incoming@patchwork.ozlabs.org; Mon, 07 Feb 2011 08:03:14 -0500 Received: from [140.186.70.92] (port=59124 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQN0-000581-8G 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 1PmQMy-0008Eu-EP for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:39:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmQMy-0008EX-3L for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:39:04 -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 p17Cd2Gw031710 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 7 Feb 2011 07:39:02 -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 p17CcjI4025718; Mon, 7 Feb 2011 07:39:01 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 7 Feb 2011 13:40:29 +0100 Message-Id: <1297082430-628-14-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 13/14] Add flag to indicate external users to block device 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 Certain operations such as drive_del or resize cannot be performed while external users (eg. block migration) reference the block device. Add a flag to indicate that. Signed-off-by: Marcelo Tosatti Signed-off-by: Kevin Wolf --- block.c | 11 +++++++++++ block.h | 2 ++ block_int.h | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 998df1b..ee9edfc 100644 --- a/block.c +++ b/block.c @@ -2774,6 +2774,17 @@ int64_t bdrv_get_dirty_count(BlockDriverState *bs) return bs->dirty_count; } +void bdrv_set_in_use(BlockDriverState *bs, int in_use) +{ + assert(bs->in_use != in_use); + bs->in_use = in_use; +} + +int bdrv_in_use(BlockDriverState *bs) +{ + return bs->in_use; +} + int bdrv_img_create(const char *filename, const char *fmt, const char *base_filename, const char *base_fmt, char *options, uint64_t img_size, int flags) diff --git a/block.h b/block.h index 239f729..19f4768 100644 --- a/block.h +++ b/block.h @@ -241,6 +241,8 @@ void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors); int64_t bdrv_get_dirty_count(BlockDriverState *bs); +void bdrv_set_in_use(BlockDriverState *bs, int in_use); +int bdrv_in_use(BlockDriverState *bs); typedef enum { BLKDBG_L1_UPDATE, diff --git a/block_int.h b/block_int.h index 6ebdc3e..545ad11 100644 --- a/block_int.h +++ b/block_int.h @@ -199,6 +199,7 @@ struct BlockDriverState { char device_name[32]; unsigned long *dirty_bitmap; int64_t dirty_count; + int in_use; /* users other than guest access, eg. block migration */ QTAILQ_ENTRY(BlockDriverState) list; void *private; };