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

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging 



# gpg: Signature made Wed 04 Apr 2018 17:07:57 BST
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  block/rbd: remove processed options from qdict

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 74912f6d bfb15b4b

block/rbd.c

+7 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, 
    BlockdevOptionsRbd *opts = NULL;

    Visitor *v;

    QObject *crumpled = NULL;

    const QDictEntry *e;

    Error *local_err = NULL;

    const char *filename;

    char *keypairs, *secretid;
@@ -671,6 +672,12 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, 
        goto out;

    }



    /* Remove the processed options from the QDict (the visitor processes

     * _all_ options in the QDict) */

    while ((e = qdict_first(options))) {

        qdict_del(options, e->key);

    }



    r = qemu_rbd_connect(&s->cluster, &s->io_ctx, opts,

                         !(flags & BDRV_O_NOCACHE), keypairs, secretid, errp);

    if (r < 0) {