[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 24/37] rbd: Assign s->snap/image_name in qemu_rbd
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v4 24/37] rbd: Assign s->snap/image_name in qemu_rbd_open() |
Date: |
Wed, 7 Mar 2018 19:59:33 +0100 |
Now that the options are already available in qemu_rbd_open() and not
only parsed in qemu_rbd_connect(), we can assign s->snap and
s->image_name there instead of passing the fields by reference to
qemu_rbd_connect().
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/rbd.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 1cd526bcea..2ac7ffca42 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -571,7 +571,6 @@ static char *qemu_rbd_mon_host(BlockdevOptionsRbd *opts,
Error **errp)
}
static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
- char **s_snap, char **s_image_name,
BlockdevOptionsRbd *opts, bool cache,
const char *keypairs, const char *secretid,
Error **errp)
@@ -593,9 +592,6 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t
*io_ctx,
goto failed_opts;
}
- *s_snap = g_strdup(opts->snapshot);
- *s_image_name = g_strdup(opts->image);
-
/* try default location when conf=NULL, but ignore failure */
r = rados_conf_read_file(*cluster, opts->conf);
if (opts->has_conf && r < 0) {
@@ -649,8 +645,6 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t
*io_ctx,
failed_shutdown:
rados_shutdown(*cluster);
- g_free(*s_snap);
- g_free(*s_image_name);
failed_opts:
g_free(mon_host);
return r;
@@ -711,13 +705,15 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict
*options, int flags,
goto out;
}
- r = qemu_rbd_connect(&s->cluster, &s->io_ctx, &s->snap, &s->image_name,
- opts, !(flags & BDRV_O_NOCACHE), keypairs, secretid,
- errp);
+ r = qemu_rbd_connect(&s->cluster, &s->io_ctx, opts,
+ !(flags & BDRV_O_NOCACHE), keypairs, secretid, errp);
if (r < 0) {
goto out;
}
+ s->snap = g_strdup(opts->snapshot);
+ s->image_name = g_strdup(opts->image);
+
/* rbd_open is always r/w */
r = rbd_open(s->io_ctx, s->image_name, &s->image, s->snap);
if (r < 0) {
--
2.13.6
- [Qemu-block] [PATCH v4 12/37] qdict: Introduce qdict_rename_keys(), (continued)
- [Qemu-block] [PATCH v4 12/37] qdict: Introduce qdict_rename_keys(), Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 14/37] block: Make bdrv_is_whitelisted() public, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 13/37] qcow2: Use visitor for options in qcow2_create(), Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 15/37] block: x-blockdev-create QMP command, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 16/37] file-posix: Support .bdrv_co_create, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 18/37] gluster: Support .bdrv_co_create, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 19/37] rbd: Fix use after free in qemu_rbd_set_keypairs() error path, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 17/37] file-win32: Support .bdrv_co_create, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 20/37] rbd: Factor out qemu_rbd_connect(), Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 21/37] rbd: Remove non-schema options from runtime_opts, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 24/37] rbd: Assign s->snap/image_name in qemu_rbd_open(),
Kevin Wolf <=
- [Qemu-block] [PATCH v4 22/37] rbd: Pass BlockdevOptionsRbd to qemu_rbd_connect(), Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 25/37] rbd: Use qemu_rbd_connect() in qemu_rbd_do_create(), Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 23/37] rbd: Support .bdrv_co_create, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 27/37] nfs: Support .bdrv_co_create, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 26/37] nfs: Use QAPI options in nfs_client_open(), Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 29/37] sheepdog: Support .bdrv_co_create, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 28/37] sheepdog: QAPIfy "redundancy" create option, Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 32/37] ssh: Pass BlockdevOptionsSsh to connect_to_ssh(), Kevin Wolf, 2018/03/07
- [Qemu-block] [PATCH v4 31/37] ssh: QAPIfy host-key-check option, Kevin Wolf, 2018/03/07