[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/21] qapi: extend qdict_flatten() for QLists
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 04/21] qapi: extend qdict_flatten() for QLists |
Date: |
Wed, 11 Dec 2013 19:10:56 +0100 |
Reversing qdict_array_split(), qdict_flatten() should flatten QLists as
well by interpreting them as QDicts where every entry's key is its
index.
This allows bringing QDicts with QLists from QMP commands to the same
form as they would be given as command-line options, thereby allowing
them to be parsed the same way.
Signed-off-by: Max Reitz <address@hidden>
---
qobject/qdict.c | 45 +++++++++++++++++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 4 deletions(-)
diff --git a/qobject/qdict.c b/qobject/qdict.c
index fca1902..d7ce4b3 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -477,7 +477,40 @@ static void qdict_destroy_obj(QObject *obj)
g_free(qdict);
}
-static void qdict_do_flatten(QDict *qdict, QDict *target, const char *prefix)
+static void qdict_flatten_qdict(QDict *qdict, QDict *target,
+ const char *prefix);
+
+static void qdict_flatten_qlist(QList *qlist, QDict *target, const char
*prefix)
+{
+ QObject *value;
+ const QListEntry *entry;
+ char *new_key;
+ int i;
+
+ /* This function is never called with prefix == NULL, i.e., it is always
+ * called from within qdict_flatten_q(list|dict)(). Therefore, it does not
+ * need to remove list entries during the iteration (the whole list will be
+ * deleted eventually anyway from qdict_flatten_qdict()). Also, prefix can
+ * never be NULL. */
+
+ entry = qlist_first(qlist);
+
+ for (i = 0; entry; entry = qlist_next(entry), i++) {
+ value = qlist_entry_obj(entry);
+
+ qobject_incref(value);
+ new_key = g_strdup_printf("%s.%i", prefix, i);
+ qdict_put_obj(target, new_key, value);
+
+ if (qobject_type(value) == QTYPE_QDICT) {
+ qdict_flatten_qdict(qobject_to_qdict(value), target, new_key);
+ } else {
+ qdict_flatten_qlist(qobject_to_qlist(value), target, new_key);
+ }
+ }
+}
+
+static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char
*prefix)
{
QObject *value;
const QDictEntry *entry, *next;
@@ -500,8 +533,12 @@ static void qdict_do_flatten(QDict *qdict, QDict *target,
const char *prefix)
if (qobject_type(value) == QTYPE_QDICT) {
/* Entries of QDicts are processed recursively, the QDict object
* itself disappears. */
- qdict_do_flatten(qobject_to_qdict(value), target,
- new_key ? new_key : entry->key);
+ qdict_flatten_qdict(qobject_to_qdict(value), target,
+ new_key ? new_key : entry->key);
+ delete = true;
+ } else if (qobject_type(value) == QTYPE_QLIST) {
+ qdict_flatten_qlist(qobject_to_qlist(value), target,
+ new_key ? new_key : entry->key);
delete = true;
} else if (prefix) {
/* All other objects are moved to the target unchanged. */
@@ -531,7 +568,7 @@ static void qdict_do_flatten(QDict *qdict, QDict *target,
const char *prefix)
*/
void qdict_flatten(QDict *qdict)
{
- qdict_do_flatten(qdict, qdict, NULL);
+ qdict_flatten_qdict(qdict, qdict, NULL);
}
/* extract all the src QDict entries starting by start into dst */
--
1.8.5.1
- [Qemu-devel] [PATCH v3 00/21] blkdebug/blkverify: Allow QMP configuration, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 01/21] blkdebug: Use errp for read_config(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 02/21] blkdebug: Don't require sophisticated filename, Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 03/21] qdict: Add qdict_array_split(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 04/21] qapi: extend qdict_flatten() for QLists,
Max Reitz <=
- [Qemu-devel] [PATCH v3 05/21] qemu-option: Add qemu_config_parse_qdict(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 06/21] blkdebug: Always call read_config(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 07/21] blkdebug: Use command-line in read_config(), Max Reitz, 2013/12/11
- [Qemu-devel] [PATCH v3 08/21] block: Allow reference for bdrv_file_open(), Max Reitz, 2013/12/11