Commit 2c1d04e0 authored by Max Reitz's avatar Max Reitz
Browse files

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: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 64dff520

block.c

+7 −0
Original line number Diff line number Diff line
@@ -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);

}

include/block/block_int.h

+2 −0
Original line number Diff line number Diff line
@@ -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;