Commit 5837aaac 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 14 Jun 2017 22:54:41 BST
# gpg:                using RSA key 0xBDBE7B27C0DE3057
# 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/iscsi: enable filename option and parsing
  block/rbd: enable filename option and parsing

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 30ff7d1d 5c3ad1a6

block/iscsi.c

+21 −1
Original line number Diff line number Diff line
@@ -1732,6 +1732,10 @@ static QemuOptsList runtime_opts = { 
            .name = "timeout",

            .type = QEMU_OPT_NUMBER,

        },

        {

            .name = "filename",

            .type = QEMU_OPT_STRING,

        },

        { /* end of list */ }

    },

};
@@ -1747,12 +1751,27 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 
    char *initiator_name = NULL;

    QemuOpts *opts;

    Error *local_err = NULL;

    const char *transport_name, *portal, *target;

    const char *transport_name, *portal, *target, *filename;

#if LIBISCSI_API_VERSION >= (20160603)

    enum iscsi_transport_type transport;

#endif

    int i, ret = 0, timeout = 0, lun;



    /* If we are given a filename, parse the filename, with precedence given to

     * filename encoded options */

    filename = qdict_get_try_str(options, "filename");

    if (filename) {

        error_report("Warning: 'filename' option specified. "

                      "This is an unsupported option, and may be deprecated "

                      "in the future");

        iscsi_parse_filename(filename, options, &local_err);

        if (local_err) {

            ret = -EINVAL;

            error_propagate(errp, local_err);

            goto exit;

        }

    }



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

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (local_err) {
@@ -1967,6 +1986,7 @@ out: 
        }

        memset(iscsilun, 0, sizeof(IscsiLun));

    }

exit:

    return ret;

}

block/rbd.c

+21 −1
Original line number Diff line number Diff line
@@ -340,6 +340,10 @@ static QemuOptsList runtime_opts = { 
            .type = QEMU_OPT_STRING,

            .help = "Legacy rados key/value option parameters",

        },

        {

            .name = "filename",

            .type = QEMU_OPT_STRING,

        },

        { /* end of list */ }

    },

};
@@ -541,12 +545,27 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, 
{

    BDRVRBDState *s = bs->opaque;

    const char *pool, *snap, *conf, *user, *image_name, *keypairs;

    const char *secretid;

    const char *secretid, *filename;

    QemuOpts *opts;

    Error *local_err = NULL;

    char *mon_host = NULL;

    int r;



    /* If we are given a filename, parse the filename, with precedence given to

     * filename encoded options */

    filename = qdict_get_try_str(options, "filename");

    if (filename) {

        error_report("Warning: 'filename' option specified. "

                      "This is an unsupported option, and may be deprecated "

                      "in the future");

        qemu_rbd_parse_filename(filename, options, &local_err);

        if (local_err) {

            r = -EINVAL;

            error_propagate(errp, local_err);

            goto exit;

        }

    }



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

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (local_err) {
@@ -665,6 +684,7 @@ failed_shutdown: 
failed_opts:

    qemu_opts_del(opts);

    g_free(mon_host);

exit:

    return r;

}