From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YStCB-0001Bs-I3 for qemu-devel@nongnu.org; Tue, 03 Mar 2015 15:13:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YStCA-000878-Na for qemu-devel@nongnu.org; Tue, 03 Mar 2015 15:13:35 -0500 From: Max Reitz Date: Tue, 3 Mar 2015 15:13:07 -0500 Message-Id: <1425413591-31413-10-git-send-email-mreitz@redhat.com> In-Reply-To: <1425413591-31413-1-git-send-email-mreitz@redhat.com> References: <1425413591-31413-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v5 09/13] block: Add list of all BlockDriverStates List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Paolo Bonzini , Max Reitz Signed-off-by: Max Reitz --- block.c | 10 ++++++++++ include/block/block_int.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/block.c b/block.c index e84fa0c..9698b1d 100644 --- a/block.c +++ b/block.c @@ -94,6 +94,9 @@ static QTAILQ_HEAD(, BlockDriverState) bdrv_states = static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = QTAILQ_HEAD_INITIALIZER(graph_bdrv_states); +static QTAILQ_HEAD(, BlockDriverState) all_bdrv_states = + QTAILQ_HEAD_INITIALIZER(all_bdrv_states); + static QLIST_HEAD(, BlockDriver) bdrv_drivers = QLIST_HEAD_INITIALIZER(bdrv_drivers); @@ -379,6 +382,8 @@ BlockDriverState *bdrv_new(void) bs->refcnt = 1; bs->aio_context = qemu_get_aio_context(); + QTAILQ_INSERT_TAIL(&all_bdrv_states, bs, bs_list); + return bs; } @@ -2090,6 +2095,9 @@ static void bdrv_move_feature_fields(BlockDriverState *bs_dest, /* keep the same entry in bdrv_states */ bs_dest->device_list = bs_src->device_list; + /* keep the same entry in all_bdrv_states */ + bs_dest->bs_list = bs_src->bs_list; + bs_dest->blk = bs_src->blk; memcpy(bs_dest->op_blockers, bs_src->op_blockers, @@ -2191,6 +2199,8 @@ static void bdrv_delete(BlockDriverState *bs) /* remove from list, if necessary */ bdrv_make_anon(bs); + QTAILQ_REMOVE(&all_bdrv_states, bs, bs_list); + g_free(bs); } diff --git a/include/block/block_int.h b/include/block/block_int.h index b2c1d87..622fbfc 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -399,6 +399,8 @@ struct BlockDriverState { QTAILQ_ENTRY(BlockDriverState) node_list; /* element of the list of "drives" the guest sees */ QTAILQ_ENTRY(BlockDriverState) device_list; + /* element of the list of all BlockDriverStates (all_bdrv_states) */ + QTAILQ_ENTRY(BlockDriverState) bs_list; QLIST_HEAD(, BdrvDirtyBitmap) dirty_bitmaps; int refcnt; -- 2.1.0