Commit 0f9d252d authored by Jeff Cody's avatar Jeff Cody
Browse files

block/rbd: add all the currently supported runtime_opts 



This adds all the currently supported runtime opts, which
are the options as parsed from the filename.  All of these
options are explicitly checked for during during runtime,
with an exception to the "keyvalue-pairs" option.

This option contains all the key/value pairs that the QEMU rbd
driver merely unescapes, and passes along blindly to rados.  This
option is a "legacy" option, and will not be exposed in the QAPI
or available for introspection.

Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent 7830f909

block/rbd.c

+49 −19
Original line number Diff line number Diff line
@@ -357,6 +357,55 @@ static void qemu_rbd_memset(RADOSCB *rcb, int64_t offs) 
    }

}



static QemuOptsList runtime_opts = {

    .name = "rbd",

    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),

    .desc = {

        {

            .name = "filename",

            .type = QEMU_OPT_STRING,

            .help = "Specification of the rbd image",

        },

        {

            .name = "password-secret",

            .type = QEMU_OPT_STRING,

            .help = "ID of secret providing the password",

        },

        {

            .name = "conf",

            .type = QEMU_OPT_STRING,

            .help = "Rados config file location",

        },

        {

            .name = "pool",

            .type = QEMU_OPT_STRING,

            .help = "Rados pool name",

        },

        {

            .name = "image",

            .type = QEMU_OPT_STRING,

            .help = "Image name in the pool",

        },

        {

            .name = "snapshot",

            .type = QEMU_OPT_STRING,

            .help = "Ceph snapshot name",

        },

        {

            /* maps to 'id' in rados_create() */

            .name = "user",

            .type = QEMU_OPT_STRING,

            .help = "Rados id name",

        },

        {

            .name = "keyvalue-pairs",

            .type = QEMU_OPT_STRING,

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

        },

        { /* end of list */ }

    },

};



static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)

{

    Error *local_err = NULL;
@@ -500,25 +549,6 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb) 
    qemu_aio_unref(acb);

}



/* TODO Convert to fine grained options */

static QemuOptsList runtime_opts = {

    .name = "rbd",

    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),

    .desc = {

        {

            .name = "filename",

            .type = QEMU_OPT_STRING,

            .help = "Specification of the rbd image",

        },

        {

            .name = "password-secret",

            .type = QEMU_OPT_STRING,

            .help = "ID of secret providing the password",

        },

        { /* end of list */ }

    },

};



static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,

                         Error **errp)

{