Commit a9ccedc3 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

rbd: Use bdrv_open options instead of filename 



This is only to convert the internal interface that is used for passing
the "filename" to be parsed, but converting to actual fine grained
options is left for another day, as it doesn't look trivial.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 60beb341

block/rbd.c

+30 −1
Original line number Diff line number Diff line
@@ -441,7 +441,21 @@ static int qemu_rbd_aio_flush_cb(void *opaque) 
    return (s->qemu_aio_count > 0);

}



static int qemu_rbd_open(BlockDriverState *bs, const char *filename,

/* 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",

        },

        { /* end of list */ }

    },

};



static int qemu_rbd_open(BlockDriverState *bs, const char *dummy,

                         QDict *options, int flags)

{

    BDRVRBDState *s = bs->opaque;
@@ -450,8 +464,23 @@ static int qemu_rbd_open(BlockDriverState *bs, const char *filename, 
    char conf[RBD_MAX_CONF_SIZE];

    char clientname_buf[RBD_MAX_CONF_SIZE];

    char *clientname;

    QemuOpts *opts;

    Error *local_err = NULL;

    const char *filename;

    int r;



    opts = qemu_opts_create_nofail(&runtime_opts);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        qerror_report_err(local_err);

        error_free(local_err);

        qemu_opts_del(opts);

        return -EINVAL;

    }



    filename = qemu_opt_get(opts, "filename");

    qemu_opts_del(opts);



    if (qemu_rbd_parsename(filename, pool, sizeof(pool),

                           snap_buf, sizeof(snap_buf),

                           s->name, sizeof(s->name),