[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/42] qdict: Add qdict_array_split()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 20/42] qdict: Add qdict_array_split() |
Date: |
Wed, 15 Jan 2014 11:22:33 +0100 |
From: Max Reitz <address@hidden>
This function splits a QDict consisting of entries prefixed by
incrementally enumerated indices into a QList of QDicts.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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.1.4
- [Qemu-devel] [PULL 11/42] docs: qcow2 compat=1.1 is now the default, (continued)
- [Qemu-devel] [PULL 11/42] docs: qcow2 compat=1.1 is now the default, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 13/42] readline: decouple readline from the monitor, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 08/42] gluster: Add support for creating zero-filled image, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 12/42] vmdk: Fix big flat extent IO, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 15/42] osdep: add qemu_set_tty_echo(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 10/42] qtest: Fix the bug about disable vnc causes "make check" fail, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 17/42] qemu-io: add command completion, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 14/42] readline: move readline to a generic location, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 20/42] qdict: Add qdict_array_split(),
Kevin Wolf <=
- [Qemu-devel] [PULL 16/42] qemu-io: use readline.c, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 18/42] blkdebug: Use errp for read_config(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 21/42] qapi: extend qdict_flatten() for QLists, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 19/42] blkdebug: Don't require sophisticated filename, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 22/42] qemu-option: Add qemu_config_parse_qdict(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 24/42] blkdebug: Use command-line in read_config(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 23/42] blkdebug: Always call read_config(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 26/42] block: Pass reference to bdrv_file_open(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 25/42] block: Allow reference for bdrv_file_open(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 28/42] block: Add bdrv_open_image(), Kevin Wolf, 2014/01/15