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

gluster: 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 8e6d58cd

block/gluster.c

+31 −1
Original line number Diff line number Diff line
@@ -282,13 +282,42 @@ static int qemu_gluster_aio_flush_cb(void *opaque) 
    return (s->qemu_aio_count > 0);

}



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

/* TODO Convert to fine grained options */

static QemuOptsList runtime_opts = {

    .name = "gluster",

    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),

    .desc = {

        {

            .name = "filename",

            .type = QEMU_OPT_STRING,

            .help = "URL to the gluster image",

        },

        { /* end of list */ }

    },

};



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

    QDict *options, int bdrv_flags)

{

    BDRVGlusterState *s = bs->opaque;

    int open_flags = O_BINARY;

    int ret = 0;

    GlusterConf *gconf = g_malloc0(sizeof(GlusterConf));

    QemuOpts *opts;

    Error *local_err = NULL;

    const char *filename;



    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);

        ret = -EINVAL;

        goto out;

    }



    filename = qemu_opt_get(opts, "filename");





    s->glfs = qemu_gluster_init(gconf, filename);

    if (!s->glfs) {
@@ -322,6 +351,7 @@ static int qemu_gluster_open(BlockDriverState *bs, const char *filename, 
        qemu_gluster_aio_event_reader, NULL, qemu_gluster_aio_flush_cb, s);



out:

    qemu_opts_del(opts);

    qemu_gluster_gconf_free(gconf);

    if (!ret) {

        return ret;