From patchwork Mon Feb 7 12:46:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 82243 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 7825CB7043 for ; Tue, 8 Feb 2011 10:47:42 +1100 (EST) Received: from localhost ([127.0.0.1]:45156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQgI-00064h-3b for incoming@patchwork.ozlabs.org; Mon, 07 Feb 2011 07:59:02 -0500 Received: from [140.186.70.92] (port=37017 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQSt-0008Kx-Pi for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:45:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PmQSp-0001a7-MC for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:45:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmQSp-0001Zj-7N for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:45:07 -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 p17Cj5ki009087 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 7 Feb 2011 07:45:05 -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 p17Cin47027395; Mon, 7 Feb 2011 07:45:04 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 7 Feb 2011 13:46:33 +0100 Message-Id: <1297082796-1369-12-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> 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] [STABLE 0.14][PATCH 11/14] blockdev: add refcount to 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 The host part of a block device can be deleted with in progress block migration. To fix this, add a reference count to DriveInfo, freeing resources on last reference. Signed-off-by: Marcelo Tosatti CC: Markus Armbruster Signed-off-by: Kevin Wolf (cherry picked from commit 84fb392526479d54602a3830326d50d44657f630) --- blockdev.c | 18 ++++++++++++++++-- blockdev.h | 4 +++- hw/pci-hotplug.c | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index 1c56da0..f2a00bd 100644 --- a/blockdev.c +++ b/blockdev.c @@ -71,7 +71,7 @@ void blockdev_auto_del(BlockDriverState *bs) DriveInfo *dinfo = drive_get_by_blockdev(bs); if (dinfo && dinfo->auto_del) { - drive_uninit(dinfo); + drive_put_ref(dinfo); } } @@ -178,7 +178,7 @@ static void bdrv_format_print(void *opaque, const char *name) error_printf(" %s", name); } -void drive_uninit(DriveInfo *dinfo) +static void drive_uninit(DriveInfo *dinfo) { qemu_opts_del(dinfo->opts); bdrv_delete(dinfo->bdrv); @@ -186,6 +186,19 @@ void drive_uninit(DriveInfo *dinfo) qemu_free(dinfo); } +void drive_put_ref(DriveInfo *dinfo) +{ + assert(dinfo->refcount); + if (--dinfo->refcount == 0) { + drive_uninit(dinfo); + } +} + +void drive_get_ref(DriveInfo *dinfo) +{ + dinfo->refcount++; +} + static int parse_block_error_action(const char *buf, int is_read) { if (!strcmp(buf, "ignore")) { @@ -453,6 +466,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) dinfo->bus = bus_id; dinfo->unit = unit_id; dinfo->opts = opts; + dinfo->refcount = 1; if (serial) strncpy(dinfo->serial, serial, sizeof(dinfo->serial) - 1); QTAILQ_INSERT_TAIL(&drives, dinfo, next); diff --git a/blockdev.h b/blockdev.h index 84e462a..2c9e780 100644 --- a/blockdev.h +++ b/blockdev.h @@ -36,13 +36,15 @@ struct DriveInfo { QemuOpts *opts; char serial[BLOCK_SERIAL_STRLEN + 1]; QTAILQ_ENTRY(DriveInfo) next; + int refcount; }; DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); DriveInfo *drive_get_by_index(BlockInterfaceType type, int index); int drive_get_max_bus(BlockInterfaceType type); DriveInfo *drive_get_next(BlockInterfaceType type); -void drive_uninit(DriveInfo *dinfo); +void drive_get_ref(DriveInfo *dinfo); +void drive_put_ref(DriveInfo *dinfo); DriveInfo *drive_get_by_blockdev(BlockDriverState *bs); QemuOpts *drive_def(const char *optstr); diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index b6dcbda..478fe9b 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -147,7 +147,7 @@ void drive_hot_add(Monitor *mon, const QDict *qdict) err: if (dinfo) - drive_uninit(dinfo); + drive_put_ref(dinfo); return; }