From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PULL 07/22] block: Allow JSON filenames
Date: Mon, 19 May 2014 16:22:25 +0200 [thread overview]
Message-ID: <1400509360-25470-8-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1400509360-25470-1-git-send-email-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
If the filename given to bdrv_open() is prefixed with "json:", parse the
rest as a JSON object and merge the result into the options QDict. If
there are conflicts, the options QDict takes precedence.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/block.c b/block.c
index 65e8191..415ae3d 100644
--- a/block.c
+++ b/block.c
@@ -1274,6 +1274,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;
+ }
+
+ /* Options given in the filename have lower priority than options
+ * specified directly */
+ qdict_join(options, json_options, false);
+ QDECREF(json_options);
+ filename = NULL;
+ }
+
bs->options = options;
options = qdict_clone_shallow(options);
--
1.8.3.1
next prev parent reply other threads:[~2014-05-19 14:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 14:22 [Qemu-devel] [PULL 00/22] Block patches Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 01/22] block: Fix bdrv_is_allocated() for short backing files Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 02/22] Remove g_sequence_lookup from qemu-img help function Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 03/22] block: vhdx - account for identical header sections Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 04/22] block: add test for vhdx image created by Disk2VHD Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 05/22] qdict: Add qdict_join() Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 06/22] check-qdict: Add test for qdict_join() Kevin Wolf
2014-05-19 14:22 ` Kevin Wolf [this message]
2014-05-19 14:22 ` [Qemu-devel] [PULL 08/22] iotests: Add test for the JSON protocol Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 09/22] qemu-iotests: Fix core dump suppression in test 039 Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 10/22] qemu-iotests: Fix blkdebug in VM drive in 030 Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 11/22] curl: Fix build when curl_multi_socket_action isn't available Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 12/22] curl: Remove broken parsing of options from url Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 13/22] curl: Add sslverify option Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 14/22] curl: Add usage documentation Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 15/22] qcow1: Make padding in the header explicit Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 16/22] qcow1: Check maximum cluster size Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 17/22] qcow1: Validate L2 table size (CVE-2014-0222) Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 18/22] qcow1: Validate image size (CVE-2014-0223) Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 19/22] qcow1: Stricter backing file length check Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 20/22] util: add qemu_iovec_is_zero Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 21/22] blockdev: add a function to parse enum ids from strings Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 22/22] block: optimize zero writes with bdrv_write_zeroes Kevin Wolf
2014-05-22 14:26 ` [Qemu-devel] [PULL 00/22] Block patches Peter Maydell
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=1400509360-25470-8-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).