|
 |
1bdc94 |
From a558dd841d434d95377dadc45c79d1de1b6f8d2d Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
1bdc94 |
Date: Mon, 18 Jun 2018 08:43:23 +0200
|
|
|
1bdc94 |
Subject: [PATCH 16/54] block-qdict: Tweak qdict_flatten_qdict(),
|
|
|
1bdc94 |
qdict_flatten_qlist()
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180618084330.30009-17-armbru@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 80725
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 16/23] block-qdict: Tweak qdict_flatten_qdict(), qdict_flatten_qlist()
|
|
|
1bdc94 |
Bugzilla: 1557995
|
|
|
1bdc94 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
qdict_flatten_qdict() skips copying scalars from @qdict to @target
|
|
|
1bdc94 |
when the two are the same. Fair enough, but it uses a non-obvious
|
|
|
1bdc94 |
test for "same". Replace it by the obvious one. While there, improve
|
|
|
1bdc94 |
comments.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit f1b34a248e9785e8cc0d28a1685d2cf4460bb256)
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
qobject/block-qdict.c | 14 +++++++++-----
|
|
|
1bdc94 |
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
|
|
|
1bdc94 |
index f32df34..a4e1c8d 100644
|
|
|
1bdc94 |
--- a/qobject/block-qdict.c
|
|
|
1bdc94 |
+++ b/qobject/block-qdict.c
|
|
|
1bdc94 |
@@ -71,12 +71,15 @@ static void qdict_flatten_qlist(QList *qlist, QDict *target, const char *prefix)
|
|
|
1bdc94 |
value = qlist_entry_obj(entry);
|
|
|
1bdc94 |
new_key = g_strdup_printf("%s.%i", prefix, i);
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+ /*
|
|
|
1bdc94 |
+ * Flatten non-empty QDict and QList recursively into @target,
|
|
|
1bdc94 |
+ * copy other objects to @target
|
|
|
1bdc94 |
+ */
|
|
|
1bdc94 |
if (qobject_type(value) == QTYPE_QDICT) {
|
|
|
1bdc94 |
qdict_flatten_qdict(qobject_to(QDict, value), target, new_key);
|
|
|
1bdc94 |
} else if (qobject_type(value) == QTYPE_QLIST) {
|
|
|
1bdc94 |
qdict_flatten_qlist(qobject_to(QList, value), target, new_key);
|
|
|
1bdc94 |
} else {
|
|
|
1bdc94 |
- /* All other types are moved to the target unchanged. */
|
|
|
1bdc94 |
qdict_put_obj(target, new_key, qobject_ref(value));
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
@@ -101,9 +104,11 @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
|
|
|
1bdc94 |
new_key = g_strdup_printf("%s.%s", prefix, entry->key);
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+ /*
|
|
|
1bdc94 |
+ * Flatten non-empty QDict and QList recursively into @target,
|
|
|
1bdc94 |
+ * copy other objects to @target
|
|
|
1bdc94 |
+ */
|
|
|
1bdc94 |
if (qobject_type(value) == QTYPE_QDICT) {
|
|
|
1bdc94 |
- /* Entries of QDicts are processed recursively, the QDict object
|
|
|
1bdc94 |
- * itself disappears. */
|
|
|
1bdc94 |
qdict_flatten_qdict(qobject_to(QDict, value), target,
|
|
|
1bdc94 |
new_key ? new_key : entry->key);
|
|
|
1bdc94 |
qdict_del(qdict, entry->key);
|
|
|
1bdc94 |
@@ -111,8 +116,7 @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
|
|
|
1bdc94 |
qdict_flatten_qlist(qobject_to(QList, value), target,
|
|
|
1bdc94 |
new_key ? new_key : entry->key);
|
|
|
1bdc94 |
qdict_del(qdict, entry->key);
|
|
|
1bdc94 |
- } else if (prefix) {
|
|
|
1bdc94 |
- /* All other objects are moved to the target unchanged. */
|
|
|
1bdc94 |
+ } else if (target != qdict) {
|
|
|
1bdc94 |
qdict_put_obj(target, new_key, qobject_ref(value));
|
|
|
1bdc94 |
qdict_del(qdict, entry->key);
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|