Commit 859443b0 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

block: switch reopen queue from QSIMPLEQ to QTAILQ 



We'll need reverse-foreach in the following commit, QTAILQ support it,
so move to QTAILQ.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20190927122355.7344-2-vsementsov@virtuozzo.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent ef9041a7

block.c

+12 −12
Original line number Diff line number Diff line
@@ -1719,7 +1719,7 @@ typedef struct BlockReopenQueueEntry { 
     bool prepared;

     bool perms_checked;

     BDRVReopenState state;

     QSIMPLEQ_ENTRY(BlockReopenQueueEntry) entry;

     QTAILQ_ENTRY(BlockReopenQueueEntry) entry;

} BlockReopenQueueEntry;



/*
@@ -1732,7 +1732,7 @@ static int bdrv_reopen_get_flags(BlockReopenQueue *q, BlockDriverState *bs) 
    BlockReopenQueueEntry *entry;



    if (q != NULL) {

        QSIMPLEQ_FOREACH(entry, q, entry) {

        QTAILQ_FOREACH(entry, q, entry) {

            if (entry->state.bs == bs) {

                return entry->state.flags;

            }
@@ -3249,7 +3249,7 @@ static bool bdrv_recurse_has_child(BlockDriverState *bs, 
 * Adds a BlockDriverState to a simple queue for an atomic, transactional

 * reopen of multiple devices.

 *

 * bs_queue can either be an existing BlockReopenQueue that has had QSIMPLE_INIT

 * bs_queue can either be an existing BlockReopenQueue that has had QTAILQ_INIT

 * already performed, or alternatively may be NULL a new BlockReopenQueue will

 * be created and initialized. This newly created BlockReopenQueue should be

 * passed back in for subsequent calls that are intended to be of the same
@@ -3290,7 +3290,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, 


    if (bs_queue == NULL) {

        bs_queue = g_new0(BlockReopenQueue, 1);

        QSIMPLEQ_INIT(bs_queue);

        QTAILQ_INIT(bs_queue);

    }



    if (!options) {
@@ -3298,7 +3298,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, 
    }



    /* Check if this BlockDriverState is already in the queue */

    QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {

    QTAILQ_FOREACH(bs_entry, bs_queue, entry) {

        if (bs == bs_entry->state.bs) {

            break;

        }
@@ -3354,7 +3354,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, 


    if (!bs_entry) {

        bs_entry = g_new0(BlockReopenQueueEntry, 1);

        QSIMPLEQ_INSERT_TAIL(bs_queue, bs_entry, entry);

        QTAILQ_INSERT_TAIL(bs_queue, bs_entry, entry);

    } else {

        qobject_unref(bs_entry->state.options);

        qobject_unref(bs_entry->state.explicit_options);
@@ -3455,7 +3455,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp) 


    assert(bs_queue != NULL);



    QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {

    QTAILQ_FOREACH(bs_entry, bs_queue, entry) {

        assert(bs_entry->state.bs->quiesce_counter > 0);

        if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, errp)) {

            goto cleanup;
@@ -3463,7 +3463,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp) 
        bs_entry->prepared = true;

    }



    QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {

    QTAILQ_FOREACH(bs_entry, bs_queue, entry) {

        BDRVReopenState *state = &bs_entry->state;

        ret = bdrv_check_perm(state->bs, bs_queue, state->perm,

                              state->shared_perm, NULL, NULL, errp);
@@ -3489,13 +3489,13 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp) 
    /* If we reach this point, we have success and just need to apply the

     * changes

     */

    QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {

    QTAILQ_FOREACH(bs_entry, bs_queue, entry) {

        bdrv_reopen_commit(&bs_entry->state);

    }



    ret = 0;

cleanup_perm:

    QSIMPLEQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) {

    QTAILQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) {

        BDRVReopenState *state = &bs_entry->state;



        if (!bs_entry->perms_checked) {
@@ -3512,7 +3512,7 @@ cleanup_perm: 
        }

    }

cleanup:

    QSIMPLEQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) {

    QTAILQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) {

        if (ret) {

            if (bs_entry->prepared) {

                bdrv_reopen_abort(&bs_entry->state);
@@ -3552,7 +3552,7 @@ static BlockReopenQueueEntry *find_parent_in_reopen_queue(BlockReopenQueue *q, 
{

    BlockReopenQueueEntry *entry;



    QSIMPLEQ_FOREACH(entry, q, entry) {

    QTAILQ_FOREACH(entry, q, entry) {

        BlockDriverState *bs = entry->state.bs;

        BdrvChild *child;

include/block/block.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ typedef struct HDGeometry { 
#define BDRV_BLOCK_EOF          0x20

#define BDRV_BLOCK_RECURSE      0x40



typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;

typedef QTAILQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;



typedef struct BDRVReopenState {

    BlockDriverState *bs;