mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rbd: Pass BlockdevOptionsRbd to qemu_rbd_connect()

Browse Source 
With the conversion to a QAPI options object, the function is now
prepared to be used in a .bdrv_co_create implementation.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Kevin Wolf 2018-02-15 20:58:24 +01:00
parent 4ff4504974
commit 4bfb274165
1 changed files with 54 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
block/rbd.c
View File

@ -24,6 +24,8 @@
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qjson.h" #include "qapi/qmp/qjson.h"
#include "qapi/qmp/qlist.h" #include "qapi/qmp/qlist.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h"
/* /*
* When specifying the image filename use: * When specifying the image filename use:
@ -484,98 +486,71 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb)
qemu_aio_unref(acb); qemu_aio_unref(acb);
} }
static char *qemu_rbd_mon_host(QDict *options, Error **errp) static char *qemu_rbd_mon_host(BlockdevOptionsRbd *opts, Error **errp)
{ {
const char **vals = g_new(const char *, qdict_size(options) + 1); const char **vals;
char keybuf[32];
const char *host, *port; const char *host, *port;
char *rados_str; char *rados_str;
int i; InetSocketAddressBaseList *p;
int i, cnt;
for (i = 0;; i++) { if (!opts->has_server) {
sprintf(keybuf, "server.%d.host", i); return NULL;
host = qdict_get_try_str(options, keybuf); }
qdict_del(options, keybuf);
sprintf(keybuf, "server.%d.port", i); for (cnt = 0, p = opts->server; p; p = p->next) {
port = qdict_get_try_str(options, keybuf); cnt++;
qdict_del(options, keybuf); }
if (!host && !port) {
break; vals = g_new(const char *, cnt + 1);
}
if (!host) { for (i = 0, p = opts->server; p; p = p->next, i++) {
error_setg(errp, "Parameter server.%d.host is missing", i); host = p->value->host;
rados_str = NULL; port = p->value->port;
goto out;
}
if (strchr(host, ':')) { if (strchr(host, ':')) {
vals[i] = port ? g_strdup_printf("[%s]:%s", host, port) vals[i] = g_strdup_printf("[%s]:%s", host, port);
: g_strdup_printf("[%s]", host);
} else { } else {
vals[i] = port ? g_strdup_printf("%s:%s", host, port) vals[i] = g_strdup_printf("%s:%s", host, port);
: g_strdup(host);
} }
} }
vals[i] = NULL; vals[i] = NULL;
rados_str = i ? g_strjoinv(";", (char **)vals) : NULL; rados_str = i ? g_strjoinv(";", (char **)vals) : NULL;
out:
g_strfreev((char **)vals); g_strfreev((char **)vals);
return rados_str; return rados_str;
} }
static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx, static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
char **s_snap, char **s_image_name, char **s_snap, char **s_image_name,
QDict *options, bool cache, BlockdevOptionsRbd *opts, bool cache,
const char *keypairs, const char *secretid, const char *keypairs, const char *secretid,
Error **errp) Error **errp)
{ {
QemuOpts *opts;
char *mon_host = NULL; char *mon_host = NULL;
const char *pool, *snap, *conf, *user, *image_name;
Error *local_err = NULL; Error *local_err = NULL;
int r; int r;
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); mon_host = qemu_rbd_mon_host(opts, &local_err);
qemu_opts_absorb_qdict(opts, options, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
r = -EINVAL; r = -EINVAL;
goto failed_opts; goto failed_opts;
} }
mon_host = qemu_rbd_mon_host(options, &local_err); r = rados_create(cluster, opts->user);
if (local_err) {
error_propagate(errp, local_err);
r = -EINVAL;
goto failed_opts;
}
pool = qemu_opt_get(opts, "pool");
conf = qemu_opt_get(opts, "conf");
snap = qemu_opt_get(opts, "snapshot");
user = qemu_opt_get(opts, "user");
image_name = qemu_opt_get(opts, "image");
if (!pool || !image_name) {
error_setg(errp, "Parameters 'pool' and 'image' are required");
r = -EINVAL;
goto failed_opts;
}
r = rados_create(cluster, user);
if (r < 0) { if (r < 0) {
error_setg_errno(errp, -r, "error initializing"); error_setg_errno(errp, -r, "error initializing");
goto failed_opts; goto failed_opts;
} }
*s_snap = g_strdup(snap); *s_snap = g_strdup(opts->snapshot);
*s_image_name = g_strdup(image_name); *s_image_name = g_strdup(opts->image);
/* try default location when conf=NULL, but ignore failure */ /* try default location when conf=NULL, but ignore failure */
r = rados_conf_read_file(*cluster, conf); r = rados_conf_read_file(*cluster, opts->conf);
if (conf && r < 0) { if (opts->has_conf && r < 0) {
error_setg_errno(errp, -r, "error reading conf file %s", conf); error_setg_errno(errp, -r, "error reading conf file %s", opts->conf);
goto failed_shutdown; goto failed_shutdown;
} }
@ -615,13 +590,12 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
goto failed_shutdown; goto failed_shutdown;
} }
r = rados_ioctx_create(*cluster, pool, io_ctx); r = rados_ioctx_create(*cluster, opts->pool, io_ctx);
if (r < 0) { if (r < 0) {
error_setg_errno(errp, -r, "error opening pool %s", pool); error_setg_errno(errp, -r, "error opening pool %s", opts->pool);
goto failed_shutdown; goto failed_shutdown;
} }
qemu_opts_del(opts);
return 0; return 0;
failed_shutdown: failed_shutdown:
@ -629,7 +603,6 @@ failed_shutdown:
g_free(*s_snap); g_free(*s_snap);
g_free(*s_image_name); g_free(*s_image_name);
failed_opts: failed_opts:
qemu_opts_del(opts);
g_free(mon_host); g_free(mon_host);
return r; return r;
} }
@ -638,6 +611,9 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp) Error **errp)
{ {
BDRVRBDState *s = bs->opaque; BDRVRBDState *s = bs->opaque;
BlockdevOptionsRbd *opts = NULL;
Visitor *v;
QObject *crumpled = NULL;
Error *local_err = NULL; Error *local_err = NULL;
const char *filename; const char *filename;
char *keypairs, *secretid; char *keypairs, *secretid;
@ -668,8 +644,26 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
qdict_del(options, "password-secret"); qdict_del(options, "password-secret");
} }
/* Convert the remaining options into a QAPI object */
crumpled = qdict_crumple(options, errp);
if (crumpled == NULL) {
r = -EINVAL;
goto out;
}
v = qobject_input_visitor_new_keyval(crumpled);
visit_type_BlockdevOptionsRbd(v, NULL, &opts, &local_err);
visit_free(v);
qobject_decref(crumpled);
if (local_err) {
error_propagate(errp, local_err);
r = -EINVAL;
goto out;
}
r = qemu_rbd_connect(&s->cluster, &s->io_ctx, &s->snap, &s->image_name, r = qemu_rbd_connect(&s->cluster, &s->io_ctx, &s->snap, &s->image_name,
options, !(flags & BDRV_O_NOCACHE), keypairs, secretid, opts, !(flags & BDRV_O_NOCACHE), keypairs, secretid,
errp); errp);
if (r < 0) { if (r < 0) {
goto out; goto out;
@ -708,6 +702,7 @@ failed_open:
g_free(s->image_name); g_free(s->image_name);
rados_shutdown(s->cluster); rados_shutdown(s->cluster);
out: out:
qapi_free_BlockdevOptionsRbd(opts);
g_free(keypairs); g_free(keypairs);
g_free(secretid); g_free(secretid);
return r; return r;