Commit 5b7ba05f authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

block: Don't queue the same BDS twice in bdrv_reopen_queue_child() 



bdrv_reopen_queue_child() assumes that a BlockDriverState is never
added twice to BlockReopenQueue.

That's however not the case: commit_start() adds 'base' (and its
children) to a new reopen queue, and then 'overlay_bs' (and its
children, which include 'base') to the same queue. The effect of this
is that the first set of options is ignored and overriden by the
second.

We fixed this by swapping the order in which both BDSs were added to
the queue in 3db2bd55. This patch
checks if a BDS is already in the reopen queue and keeps its options.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f87a0e29

block.c

+19 −3
Original line number Diff line number Diff line
@@ -1925,6 +1925,13 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, 
        options = qdict_new();

    }



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

    QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {

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

            break;

        }

    }



    /*

     * Precedence of options:

     * 1. Explicitly passed in options (highest)
@@ -1945,7 +1952,11 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, 
    }



    /* Old explicitly set values (don't overwrite by inherited value) */

    if (bs_entry) {

        old_options = qdict_clone_shallow(bs_entry->state.explicit_options);

    } else {

        old_options = qdict_clone_shallow(bs->explicit_options);

    }

    bdrv_join_options(bs, options, old_options);

    QDECREF(old_options);
@@ -1984,8 +1995,13 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, 
                                child->role, options, flags);

    }



    if (!bs_entry) {

        bs_entry = g_new0(BlockReopenQueueEntry, 1);

        QSIMPLEQ_INSERT_TAIL(bs_queue, bs_entry, entry);

    } else {

        QDECREF(bs_entry->state.options);

        QDECREF(bs_entry->state.explicit_options);

    }



    bs_entry->state.bs = bs;

    bs_entry->state.options = options;