From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <famz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v7 03/24] qdict: Add qdict_array_split()
Date: Fri, 20 Dec 2013 19:28:03 +0100 [thread overview]
Message-ID: <1387564104-15315-4-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1387564104-15315-1-git-send-email-mreitz@redhat.com>
This function splits a QDict consisting of entries prefixed by
incrementally enumerated indices into a QList of QDicts.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
include/qapi/qmp/qdict.h | 1 +
qobject/qdict.c | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index 5cefd80..1ddf97b 100644
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -68,5 +68,6 @@ QDict *qdict_clone_shallow(const QDict *src);
void qdict_flatten(QDict *qdict);
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start);
+void qdict_array_split(QDict *src, QList **dst);
#endif /* QDICT_H */
diff --git a/qobject/qdict.c b/qobject/qdict.c
index 17e14f0..2d5848d 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -554,3 +554,40 @@ void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start)
entry = next;
}
}
+
+/**
+ * qdict_array_split(): This function moves array-like elements of a QDict into
+ * a new QList of QDicts. Every entry in the original QDict with a key prefixed
+ * "%u.", where %u designates an unsigned integer starting at 0 and
+ * incrementally counting up, will be moved to a new QDict at index %u in the
+ * output QList with the key prefix removed. The function terminates when there
+ * is no entry in the QDict with a prefix directly (incrementally) following the
+ * last one.
+ * Example: {"0.a": 42, "0.b": 23, "1.x": 0, "3.y": 1, "o.o": 7}
+ * (or {"1.x": 0, "3.y": 1, "0.a": 42, "o.o": 7, "0.b": 23})
+ * => [{"a": 42, "b": 23}, {"x": 0}]
+ * and {"3.y": 1, "o.o": 7} (remainder of the old QDict)
+ */
+void qdict_array_split(QDict *src, QList **dst)
+{
+ unsigned i;
+
+ *dst = qlist_new();
+
+ for (i = 0; i < UINT_MAX; i++) {
+ QDict *subqdict;
+ char prefix[32];
+ size_t snprintf_ret;
+
+ snprintf_ret = snprintf(prefix, 32, "%u.", i);
+ assert(snprintf_ret < 32);
+
+ qdict_extract_subqdict(src, &subqdict, prefix);
+ if (!qdict_size(subqdict)) {
+ QDECREF(subqdict);
+ break;
+ }
+
+ qlist_append_obj(*dst, QOBJECT(subqdict));
+ }
+}
--
1.8.5.1
next prev parent reply other threads:[~2013-12-20 18:28 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 18:28 [Qemu-devel] [PATCH v7 00/24] blkdebug/blkverify: Allow QMP configuration Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 01/24] blkdebug: Use errp for read_config() Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 02/24] blkdebug: Don't require sophisticated filename Max Reitz
2013-12-20 18:28 ` Max Reitz [this message]
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 04/24] qapi: extend qdict_flatten() for QLists Max Reitz
2013-12-20 20:00 ` Eric Blake
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 05/24] qemu-option: Add qemu_config_parse_qdict() Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 06/24] blkdebug: Always call read_config() Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 07/24] blkdebug: Use command-line in read_config() Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 08/24] block: Allow reference for bdrv_file_open() Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 09/24] block: Pass reference to bdrv_file_open() Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 10/24] block: Allow block devices without files Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 11/24] block: Add bdrv_open_image() Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 12/24] block: Use bdrv_open_image() in bdrv_open() Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 13/24] block: Allow recursive "file"s Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 14/24] blockdev: Move "file" to legacy_opts Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 15/24] blkdebug: Allow command-line file configuration Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 16/24] blkverify: Allow command-line configuration Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 17/24] blkverify: Don't require protocol filename Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 18/24] qapi: Add "errno" to the list of polluted words Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 19/24] qapi: QMP interface for blkdebug and blkverify Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 20/24] qemu-io: Make filename optional Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 21/24] tests: Add test for qdict_array_split() Max Reitz
2013-12-20 19:52 ` Eric Blake
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 22/24] tests: Add test for qdict_flatten() Max Reitz
2013-12-20 19:54 ` Eric Blake
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 23/24] iotests: Test new blkdebug/blkverify interface Max Reitz
2013-12-20 18:28 ` [Qemu-devel] [PATCH v7 24/24] iotests: Test file format nesting Max Reitz
2014-01-08 18:24 ` [Qemu-devel] [PATCH v7 00/24] blkdebug/blkverify: Allow QMP configuration Kevin Wolf
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=1387564104-15315-4-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=famz@redhat.com \
--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).