Commit 1bab38e7 authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

block: Simplify bdrv_reopen_abort() 



If a bdrv_reopen_multiple() call fails, then the explicit_options
QDict has to be deleted for every entry in the reopen queue. This must
happen regardless of whether that entry's bdrv_reopen_prepare() call
succeeded or not.

This patch simplifies the cleanup code a bit.

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

block.c

+4 −5
Original line number Diff line number Diff line
@@ -3050,9 +3050,10 @@ int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **er 


cleanup:

    QSIMPLEQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) {

        if (ret && bs_entry->prepared) {

        if (ret) {

            if (bs_entry->prepared) {

                bdrv_reopen_abort(&bs_entry->state);

        } else if (ret) {

            }

            qobject_unref(bs_entry->state.explicit_options);

        }

        qobject_unref(bs_entry->state.options);
@@ -3341,8 +3342,6 @@ void bdrv_reopen_abort(BDRVReopenState *reopen_state) 
        drv->bdrv_reopen_abort(reopen_state);

    }



    qobject_unref(reopen_state->explicit_options);



    bdrv_abort_perm_update(reopen_state->bs);

}