[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 1/5] qdict: Make qdict_extract_subqdict() accept dst
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH 1/5] qdict: Make qdict_extract_subqdict() accept dst = NULL |
Date: |
Fri, 29 Jun 2018 14:36:59 +0300 |
This function extracts all options from a QDict starting with a
certain prefix and puts them in a new QDict.
We'll have a couple of cases where we simply want to discard those
options instead of copying them, and that's what this patch does.
Signed-off-by: Alberto Garcia <address@hidden>
---
qobject/block-qdict.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
index 36129e7379..ef443cb8d5 100644
--- a/qobject/block-qdict.c
+++ b/qobject/block-qdict.c
@@ -158,20 +158,25 @@ void qdict_flatten(QDict *qdict)
qdict_flatten_qdict(qdict, qdict, NULL);
}
-/* extract all the src QDict entries starting by start into dst */
+/* extract all the src QDict entries starting by start into dst.
+ * If dst is NULL then the entries are simply removed from src. */
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start)
{
const QDictEntry *entry, *next;
const char *p;
- *dst = qdict_new();
+ if (dst) {
+ *dst = qdict_new();
+ }
entry = qdict_first(src);
while (entry != NULL) {
next = qdict_next(src, entry);
if (strstart(entry->key, start, &p)) {
- qdict_put_obj(*dst, p, qobject_ref(entry->value));
+ if (dst) {
+ qdict_put_obj(*dst, p, qobject_ref(entry->value));
+ }
qdict_del(src, entry->key);
}
entry = next;
--
2.11.0
- [Qemu-block] [PATCH 0/5] Some bs->options fixes, Alberto Garcia, 2018/06/29
- [Qemu-block] [PATCH 5/5] block: Simplify append_open_options(), Alberto Garcia, 2018/06/29
- [Qemu-block] [PATCH 4/5] block: Update bs->options if bdrv_reopen() succeeds, Alberto Garcia, 2018/06/29
- [Qemu-block] [PATCH 1/5] qdict: Make qdict_extract_subqdict() accept dst = NULL,
Alberto Garcia <=
- [Qemu-block] [PATCH 3/5] block: Simplify bdrv_reopen_abort(), Alberto Garcia, 2018/06/29
- [Qemu-block] [PATCH 2/5] block: Remove children options from bs->{options, explicit_options}, Alberto Garcia, 2018/06/29