Commit 4c8350fe authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

block: Update bs->options if bdrv_reopen() succeeds 



If bdrv_reopen() succeeds then bs->explicit_options is updated with
the new values, but bs->options never changes.

Here's an example:

   { "execute": "blockdev-add",
     "arguments": {
       "driver": "qcow2",
       "node-name": "hd0",
       "overlap-check": "all",
       "file": {
         "driver": "file",
         "filename": "hd0.qcow2"
       }
     }
   }

After this, both bs->options and bs->explicit_options contain
"overlap-check": "all".

Now let's change that using qemu-io's reopen command:

   (qemu) qemu-io hd0 "reopen -o overlap-check=none"

After this, bs->explicit_options contains the new value but
bs->options still keeps the old one.

This patch updates bs->options after a BDS has been successfully
reopened.

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

block.c

+14 −1
Original line number Diff line number Diff line
@@ -3055,8 +3055,8 @@ cleanup: 
                bdrv_reopen_abort(&bs_entry->state);

            }

            qobject_unref(bs_entry->state.explicit_options);

        }

            qobject_unref(bs_entry->state.options);

        }

        g_free(bs_entry);

    }

    g_free(bs_queue);
@@ -3156,6 +3156,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, 
    Error *local_err = NULL;

    BlockDriver *drv;

    QemuOpts *opts;

    QDict *orig_reopen_opts;

    const char *value;

    bool read_only;
@@ -3163,6 +3164,11 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, 
    assert(reopen_state->bs->drv != NULL);

    drv = reopen_state->bs->drv;



    /* This function and each driver's bdrv_reopen_prepare() remove

     * entries from reopen_state->options as they are processed, so

     * we need to make a copy of the original QDict. */

    orig_reopen_opts = qdict_clone_shallow(reopen_state->options);



    /* Process generic block layer options */

    opts = qemu_opts_create(&bdrv_runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, reopen_state->options, &local_err);
@@ -3269,8 +3275,13 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, 


    ret = 0;



    /* Restore the original reopen_state->options QDict */

    qobject_unref(reopen_state->options);

    reopen_state->options = qobject_ref(orig_reopen_opts);



error:

    qemu_opts_del(opts);

    qobject_unref(orig_reopen_opts);

    return ret;

}
@@ -3300,8 +3311,10 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state) 


    /* set BDS specific flags now */

    qobject_unref(bs->explicit_options);

    qobject_unref(bs->options);



    bs->explicit_options   = reopen_state->explicit_options;

    bs->options            = reopen_state->options;

    bs->open_flags         = reopen_state->flags;

    bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);