From patchwork Tue May 6 20:29:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 346320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D20CA1402A9 for ; Wed, 7 May 2014 06:32:10 +1000 (EST) Received: from localhost ([::1]:37236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whm24-0005Es-OI for incoming@patchwork.ozlabs.org; Tue, 06 May 2014 16:32:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whlzi-0002BV-Qb for qemu-devel@nongnu.org; Tue, 06 May 2014 16:29:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Whlza-0000Ly-To for qemu-devel@nongnu.org; Tue, 06 May 2014 16:29:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16392) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whlza-0000LN-L0 for qemu-devel@nongnu.org; Tue, 06 May 2014 16:29:34 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s46KTWOp001995 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 6 May 2014 16:29:33 -0400 Received: from localhost (ovpn-116-78.ams2.redhat.com [10.36.116.78]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s46KTUre017702 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Tue, 6 May 2014 16:29:32 -0400 From: Max Reitz To: qemu-devel@nongnu.org Date: Tue, 6 May 2014 22:29:18 +0200 Message-Id: <1399408159-19118-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1399408159-19118-1-git-send-email-mreitz@redhat.com> References: <1399408159-19118-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v2 3/4] block: Allow JSON filenames X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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, report one of them to the user and abort. Signed-off-by: Max Reitz --- block.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/block.c b/block.c index b749d31..010da3e 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,26 @@ 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, false); + if (qdict_size(json_options) > 0) { + error_setg(errp, "Option \"%s\" specified both directly and in " + "the JSON filename", qdict_first(json_options)->key); + QDECREF(json_options); + ret = -EINVAL; + goto fail; + } + + QDECREF(json_options); + filename = NULL; + } + bs->options = options; options = qdict_clone_shallow(options);