Commit d3bd57d9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches:

- Remove deprecated -drive options for geometry/serial/addr
- luks: Allow shared writers if the parents allow them (share-rw=on)
- qemu-img: Fix error when trying to convert to encrypted target image
- mirror: Fail gracefully for source == target
- I/O throttling: Fix behaviour during drain (always ignore the limits)
- bdrv_reopen() related fixes for bs->options/explicit_options content
- Documentation improvements

# gpg: Signature made Wed 15 Aug 2018 12:11:43 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (21 commits)
  qapi: block: Remove mentions of error types which were removed
  block: Simplify append_open_options()
  block: Update bs->options if bdrv_reopen() succeeds
  block: Simplify bdrv_reopen_abort()
  block: Remove children options from bs->{options,explicit_options}
  qdict: Make qdict_extract_subqdict() accept dst = NULL
  block: drop empty .bdrv_close handlers
  block: make .bdrv_close optional
  qemu-img: fix regression copying secrets during convert
  mirror: Fail gracefully for source == target
  qapi/block: Document restrictions for node names
  block: Remove dead deprecation warning code
  block: Remove deprecated -drive option serial
  block: Remove deprecated -drive option addr
  block: Remove deprecated -drive geometry options
  luks: Allow share-rw=on
  throttle-groups: Don't allow timers without throttled requests
  qemu-iotests: Update 093 to improve the draining test
  throttle-groups: Skip the round-robin if a member is being drained
  qemu-iotests: Test removing a throttle group member with a pending timer
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c146b54c b5fc2d30

block.c

+34 −12
Original line number Diff line number Diff line
@@ -2584,6 +2584,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, 
    BlockBackend *file = NULL;

    BlockDriverState *bs;

    BlockDriver *drv = NULL;

    BdrvChild *child;

    const char *drvname;

    const char *backing;

    Error *local_err = NULL;
@@ -2767,6 +2768,15 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, 
        }

    }



    /* Remove all children options from bs->options and bs->explicit_options */

    QLIST_FOREACH(child, &bs->children, next) {

        char *child_key_dot;

        child_key_dot = g_strdup_printf("%s.", child->name);

        qdict_extract_subqdict(bs->explicit_options, NULL, child_key_dot);

        qdict_extract_subqdict(bs->options, NULL, child_key_dot);

        g_free(child_key_dot);

    }



    bdrv_refresh_filename(bs);



    /* Check if any unknown options were used */
@@ -2976,6 +2986,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, 
        }



        child_key_dot = g_strdup_printf("%s.", child->name);

        qdict_extract_subqdict(explicit_options, NULL, child_key_dot);

        qdict_extract_subqdict(options, &new_child_options, child_key_dot);

        g_free(child_key_dot);
@@ -3039,12 +3050,13 @@ 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.explicit_options);

            qobject_unref(bs_entry->state.options);

        }

        g_free(bs_entry);

    }

    g_free(bs_queue);
@@ -3144,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;
@@ -3151,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);
@@ -3257,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;

}
@@ -3288,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);
@@ -3330,8 +3355,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);

}
@@ -3349,7 +3372,9 @@ static void bdrv_close(BlockDriverState *bs) 
    bdrv_drain(bs); /* in case flush left pending I/O */



    if (bs->drv) {

        if (bs->drv->bdrv_close) {

            bs->drv->bdrv_close(bs);

        }

        bs->drv = NULL;

    }
@@ -5125,16 +5150,13 @@ static bool append_open_options(QDict *d, BlockDriverState *bs) 
    QemuOptDesc *desc;

    BdrvChild *child;

    bool found_any = false;

    const char *p;



    for (entry = qdict_first(bs->options); entry;

         entry = qdict_next(bs->options, entry))

    {

        /* Exclude options for children */

        /* Exclude node-name references to children */

        QLIST_FOREACH(child, &bs->children, next) {

            if (strstart(qdict_entry_key(entry), child->name, &p)

                && (!*p || *p == '.'))

            {

            if (!strcmp(entry->key, child->name)) {

                break;

            }

        }

block/blkreplay.c

+0 −5
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ fail: 
    return ret;

}



static void blkreplay_close(BlockDriverState *bs)

{

}



static int64_t blkreplay_getlength(BlockDriverState *bs)

{

    return bdrv_getlength(bs->file->bs);
@@ -135,7 +131,6 @@ static BlockDriver bdrv_blkreplay = { 
    .instance_size          = 0,



    .bdrv_open              = blkreplay_open,

    .bdrv_close             = blkreplay_close,

    .bdrv_child_perm        = bdrv_filter_default_perms,

    .bdrv_getlength         = blkreplay_getlength,

block/block-backend.c

+0 −1
Original line number Diff line number Diff line
@@ -419,7 +419,6 @@ static void drive_info_del(DriveInfo *dinfo) 
        return;

    }

    qemu_opts_del(dinfo->opts);

    g_free(dinfo->serial);

    g_free(dinfo);

}

block/commit.c

+0 −5
Original line number Diff line number Diff line
@@ -239,10 +239,6 @@ static void bdrv_commit_top_refresh_filename(BlockDriverState *bs, QDict *opts) 
            bs->backing->bs->filename);

}



static void bdrv_commit_top_close(BlockDriverState *bs)

{

}



static void bdrv_commit_top_child_perm(BlockDriverState *bs, BdrvChild *c,

                                       const BdrvChildRole *role,

                                       BlockReopenQueue *reopen_queue,
@@ -260,7 +256,6 @@ static BlockDriver bdrv_commit_top = { 
    .bdrv_co_preadv             = bdrv_commit_top_preadv,

    .bdrv_co_block_status       = bdrv_co_block_status_from_backing,

    .bdrv_refresh_filename      = bdrv_commit_top_refresh_filename,

    .bdrv_close                 = bdrv_commit_top_close,

    .bdrv_child_perm            = bdrv_commit_top_child_perm,

};

block/copy-on-read.c

+0 −6
Original line number Diff line number Diff line
@@ -45,11 +45,6 @@ static int cor_open(BlockDriverState *bs, QDict *options, int flags, 
}





static void cor_close(BlockDriverState *bs)

{

}





#define PERM_PASSTHROUGH (BLK_PERM_CONSISTENT_READ \

                          | BLK_PERM_WRITE \

                          | BLK_PERM_RESIZE)
@@ -143,7 +138,6 @@ BlockDriver bdrv_copy_on_read = { 
    .format_name                        = "copy-on-read",



    .bdrv_open                          = cor_open,

    .bdrv_close                         = cor_close,

    .bdrv_child_perm                    = cor_child_perm,



    .bdrv_getlength                     = cor_getlength,