From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Benoît Canet" <benoit@irqsave.net>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Max Reitz" <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH 3/4] block: Allow JSON filenames
Date: Tue, 6 May 2014 21:30:24 +0200 [thread overview]
Message-ID: <1399404625-6093-4-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1399404625-6093-1-git-send-email-mreitz@redhat.com>
If the filename given to bdrv_open() is prefixed with "json:", parse the
rest as a JSON object and use the result as the options QDict.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/block.c b/block.c
index b749d31..2555e34 100644
--- a/block.c
+++ b/block.c
@@ -1275,6 +1275,33 @@ out:
g_free(tmp_filename);
}
+static QDict *parse_json_filename(const char *filename, Error **errp)
+{
+ QObject *options_obj;
+ QDict *options;
+ int ret;
+
+ ret = strstart(filename, "json:", &filename);
+ assert(ret);
+
+ options_obj = qobject_from_json(filename);
+ if (!options_obj) {
+ error_setg(errp, "Could not parse the JSON options");
+ return NULL;
+ }
+
+ if (qobject_type(options_obj) != QTYPE_QDICT) {
+ qobject_decref(options_obj);
+ error_setg(errp, "Invalid JSON object given");
+ return NULL;
+ }
+
+ options = qobject_to_qdict(options_obj);
+ qdict_flatten(options);
+
+ return options;
+}
+
/*
* Opens a disk image (raw, qcow2, vmdk, ...)
*
@@ -1337,6 +1364,20 @@ int bdrv_open(BlockDriverState **pbs, const char *filename,
options = qdict_new();
}
+ if (filename && g_str_has_prefix(filename, "json:")) {
+ QDict *json_options = parse_json_filename(filename, &local_err);
+ if (local_err) {
+ ret = -EINVAL;
+ goto fail;
+ }
+
+ qdict_join(options, json_options, true);
+ assert(qdict_size(json_options) == 0);
+ QDECREF(json_options);
+
+ filename = NULL;
+ }
+
bs->options = options;
options = qdict_clone_shallow(options);
--
1.9.2
next prev parent reply other threads:[~2014-05-06 19:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-06 19:30 [Qemu-devel] [PATCH 0/4] block: Allow JSON filenames Max Reitz
2014-05-06 19:30 ` [Qemu-devel] [PATCH 1/4] qdict: Add qdict_join() Max Reitz
2014-05-06 19:30 ` [Qemu-devel] [PATCH 2/4] check-qdict: Add test for qdict_join() Max Reitz
2014-05-06 19:30 ` Max Reitz [this message]
2014-05-06 19:57 ` [Qemu-devel] [PATCH 3/4] block: Allow JSON filenames Eric Blake
2014-05-06 20:00 ` Max Reitz
2014-05-06 20:28 ` Eric Blake
2014-05-06 20:29 ` Max Reitz
2014-05-07 8:39 ` Kevin Wolf
2014-05-08 17:54 ` Max Reitz
2014-05-06 19:30 ` [Qemu-devel] [PATCH 4/4] iotests: Add test for the JSON protocol Max Reitz
2014-05-06 20:04 ` Eric Blake
2014-05-06 20:04 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399404625-6093-4-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=benoit@irqsave.net \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).