From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKtEj-0004Sd-Mb for qemu-devel@nongnu.org; Mon, 09 Feb 2015 13:39:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKtEi-0005fL-It for qemu-devel@nongnu.org; Mon, 09 Feb 2015 13:39:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKtEi-0005eq-C0 for qemu-devel@nongnu.org; Mon, 09 Feb 2015 13:39:08 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19Id7lk000323 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 13:39:07 -0500 From: Max Reitz Date: Mon, 9 Feb 2015 13:38:42 -0500 Message-Id: <1423507124-29809-21-git-send-email-mreitz@redhat.com> In-Reply-To: <1423507124-29809-1-git-send-email-mreitz@redhat.com> References: <1423507124-29809-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 20/22] blockdev: Keep track of monitor-owned BDS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi , Max Reitz ...and release the reference on bdrv_close_all(). Signed-off-by: Max Reitz --- block.c | 2 ++ blockdev.c | 24 ++++++++++++++++++++++++ include/block/block_int.h | 2 ++ 3 files changed, 28 insertions(+) diff --git a/block.c b/block.c index cbe333d..1ab0e29 100644 --- a/block.c +++ b/block.c @@ -2016,6 +2016,8 @@ static void bdrv_move_feature_fields(BlockDriverState *bs_dest, /* job */ bs_dest->job = bs_src->job; + /* keep the same entry in the list of monitor-owned BDS */ + bs_dest->monitor_list = bs_src->monitor_list; bs_dest->blk = bs_src->blk; memcpy(bs_dest->op_blockers, bs_src->op_blockers, diff --git a/blockdev.c b/blockdev.c index a6230e0..9a6e645 100644 --- a/blockdev.c +++ b/blockdev.c @@ -56,6 +56,11 @@ typedef struct BlockdevCloseAllNotifier { static QTAILQ_HEAD(, BlockdevCloseAllNotifier) close_all_notifiers = QTAILQ_HEAD_INITIALIZER(close_all_notifiers); +static Notifier *close_all_bdrv_states_notifier; + +static QTAILQ_HEAD(, BlockDriverState) monitor_bdrv_states = + QTAILQ_HEAD_INITIALIZER(monitor_bdrv_states); + static const char *const if_name[IF_COUNT] = { [IF_NONE] = "none", [IF_IDE] = "ide", @@ -129,6 +134,17 @@ static void blockdev_close_all_notifier(Notifier *n, void *data) monitor_blk_unref_with_can(can->blk, can); } +static void blockdev_close_all_bdrv_states(Notifier *n, void *data) +{ + BlockDriverState *bds, *next_bds; + + QTAILQ_FOREACH_SAFE(bds, &monitor_bdrv_states, monitor_list, next_bds) { + bdrv_unref(bds); + } + + g_free(n); +} + /** * Boards may call this to offer board-by-board overrides * of the default, global values. @@ -3231,6 +3247,14 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) if (!bs) { goto fail; } + + QTAILQ_INSERT_TAIL(&monitor_bdrv_states, bs, monitor_list); + if (!close_all_bdrv_states_notifier) { + close_all_bdrv_states_notifier = g_new0(Notifier, 1); + close_all_bdrv_states_notifier->notify = + blockdev_close_all_bdrv_states; + bdrv_add_close_all_notifier(close_all_bdrv_states_notifier); + } } if (bs && bdrv_key_required(bs)) { diff --git a/include/block/block_int.h b/include/block/block_int.h index 2e9e3e3..8dff7f8 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -380,6 +380,8 @@ struct BlockDriverState { char node_name[32]; /* element of the list of named nodes building the graph */ QTAILQ_ENTRY(BlockDriverState) node_list; + /* element of the list of monitor-owned BDS */ + QTAILQ_ENTRY(BlockDriverState) monitor_list; QLIST_HEAD(, BdrvDirtyBitmap) dirty_bitmaps; int refcnt; -- 2.1.0