From: Max Reitz Date: Fri, 29 Jan 2016 15:36:11 +0000 (+0100) Subject: block: Add list of all BlockDriverStates X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2c1d04e002dc91a6f34e8e683ea6b84f61a0b9fd;p=qemu.git block: Add list of all BlockDriverStates We need this list so that bdrv_close_all() can keep track of which BDSs are still open after having removed the BDSs from all of the BBs and having released all monitor BDS references. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Reviewed-by: Fam Zheng Signed-off-by: Kevin Wolf --- diff --git a/block.c b/block.c index e076f1004a..d687d2c2b6 100644 --- a/block.c +++ b/block.c @@ -79,6 +79,9 @@ struct BdrvStates bdrv_states = QTAILQ_HEAD_INITIALIZER(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); @@ -267,6 +270,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; } @@ -2371,6 +2376,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 8730cf63c7..1e4c51875e 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -443,6 +443,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;