From patchwork Wed Jan 26 14:12:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 80512 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 30A31B70F4 for ; Thu, 27 Jan 2011 01:44:23 +1100 (EST) Received: from localhost ([127.0.0.1]:41400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi6bb-0007XH-Sb for incoming@patchwork.ozlabs.org; Wed, 26 Jan 2011 09:44:19 -0500 Received: from [140.186.70.92] (port=40786 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi6AW-0006RX-Ih for qemu-devel@nongnu.org; Wed, 26 Jan 2011 09:16:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pi6AT-0001ly-D9 for qemu-devel@nongnu.org; Wed, 26 Jan 2011 09:16:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pi6AT-0001kp-3F for qemu-devel@nongnu.org; Wed, 26 Jan 2011 09:16:17 -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.13.8/8.13.8) with ESMTP id p0QEGF3T022880 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 26 Jan 2011 09:16:15 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p0QEGFqZ011807; Wed, 26 Jan 2011 09:16:15 -0500 Received: from amt.cnet (vpn1-4-107.ams2.redhat.com [10.36.4.107]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p0QEGDgq024794; Wed, 26 Jan 2011 09:16:14 -0500 Received: from amt.cnet (localhost.localdomain [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 64A5466E09F; Wed, 26 Jan 2011 12:15:34 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id p0QEFXct027455; Wed, 26 Jan 2011 12:15:33 -0200 Message-Id: <20110126141348.319412154@redhat.com> User-Agent: quilt/0.47-1 Date: Wed, 26 Jan 2011 12:12:34 -0200 From: Marcelo Tosatti To: qemu-devel@nongnu.org References: <20110126141230.637895847@redhat.com> Content-Disposition: inline; filename=03-driveinfo-inuse 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. Cc: Kevin Wolf , Marcelo Tosatti Subject: [Qemu-devel] [patch 4/5] 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 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 Index: qemu/block.c =================================================================== --- qemu.orig/block.c +++ qemu/block.c @@ -2770,6 +2770,17 @@ int64_t bdrv_get_dirty_count(BlockDriver 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) Index: qemu/block_int.h =================================================================== --- qemu.orig/block_int.h +++ qemu/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; }; Index: qemu/block.h =================================================================== --- qemu.orig/block.h +++ qemu/block.h @@ -240,6 +240,8 @@ void bdrv_reset_dirty(BlockDriverState * 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,