[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/20] sheepdog: Use bdrv_open options instead of fi
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 16/20] sheepdog: Use bdrv_open options instead of filename |
Date: |
Mon, 22 Apr 2013 13:31:30 +0200 |
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: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/sheepdog.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 1c5b532..e224c51 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -1126,7 +1126,21 @@ static int write_object(int fd, char *buf, uint64_t oid,
int copies,
create, cache_flags);
}
-static int sd_open(BlockDriverState *bs, const char *filename,
+/* TODO Convert to fine grained options */
+static QemuOptsList runtime_opts = {
+ .name = "sheepdog",
+ .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
+ .desc = {
+ {
+ .name = "filename",
+ .type = QEMU_OPT_STRING,
+ .help = "URL to the sheepdog image",
+ },
+ { /* end of list */ }
+ },
+};
+
+static int sd_open(BlockDriverState *bs, const char *dummy,
QDict *options, int flags)
{
int ret, fd;
@@ -1135,6 +1149,20 @@ static int sd_open(BlockDriverState *bs, const char
*filename,
char vdi[SD_MAX_VDI_LEN], tag[SD_MAX_VDI_TAG_LEN];
uint32_t snapid;
char *buf = NULL;
+ 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");
QLIST_INIT(&s->inflight_aio_head);
QLIST_INIT(&s->pending_aio_head);
@@ -1199,6 +1227,7 @@ static int sd_open(BlockDriverState *bs, const char
*filename,
bs->total_sectors = s->inode.vdi_size / SECTOR_SIZE;
pstrcpy(s->name, sizeof(s->name), vdi);
qemu_co_mutex_init(&s->lock);
+ qemu_opts_del(opts);
g_free(buf);
return 0;
out:
@@ -1206,6 +1235,7 @@ out:
if (s->fd >= 0) {
closesocket(s->fd);
}
+ qemu_opts_del(opts);
g_free(buf);
return ret;
}
--
1.8.1.4
- [Qemu-devel] [PATCH 05/20] block: Fail gracefully when using a format driver on protocol level, (continued)
- [Qemu-devel] [PATCH 05/20] block: Fail gracefully when using a format driver on protocol level, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 08/20] raw-posix: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 10/20] blkdebug: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 09/20] raw-win32: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 11/20] blkverify: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 13/20] gluster: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 15/20] rbd: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 12/20] curl: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 14/20] iscsi: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 17/20] vvfat: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 16/20] sheepdog: Use bdrv_open options instead of filename,
Kevin Wolf <=
- [Qemu-devel] [PATCH 19/20] block: Allow overriding backing.file.filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 20/20] qemu-iotests: add 053 unaligned compressed image size test, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 18/20] block: Remove filename parameter from .bdrv_file_open(), Kevin Wolf, 2013/04/22