mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
qdict: Add qdict_join()
This function joins two QDicts by absorbing one into the other. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Benoit Canet <benoit@irqsave.net> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
26e2da7279
commit
9c52681277
|
@ -16,6 +16,7 @@
|
||||||
#include "qapi/qmp/qobject.h"
|
#include "qapi/qmp/qobject.h"
|
||||||
#include "qapi/qmp/qlist.h"
|
#include "qapi/qmp/qlist.h"
|
||||||
#include "qemu/queue.h"
|
#include "qemu/queue.h"
|
||||||
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#define QDICT_BUCKET_MAX 512
|
#define QDICT_BUCKET_MAX 512
|
||||||
|
@ -70,4 +71,6 @@ void qdict_flatten(QDict *qdict);
|
||||||
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start);
|
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start);
|
||||||
void qdict_array_split(QDict *src, QList **dst);
|
void qdict_array_split(QDict *src, QList **dst);
|
||||||
|
|
||||||
|
void qdict_join(QDict *dest, QDict *src, bool overwrite);
|
||||||
|
|
||||||
#endif /* QDICT_H */
|
#endif /* QDICT_H */
|
||||||
|
|
|
@ -665,3 +665,35 @@ void qdict_array_split(QDict *src, QList **dst)
|
||||||
qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict));
|
qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* qdict_join(): Absorb the src QDict into the dest QDict, that is, move all
|
||||||
|
* elements from src to dest.
|
||||||
|
*
|
||||||
|
* If an element from src has a key already present in dest, it will not be
|
||||||
|
* moved unless overwrite is true.
|
||||||
|
*
|
||||||
|
* If overwrite is true, the conflicting values in dest will be discarded and
|
||||||
|
* replaced by the corresponding values from src.
|
||||||
|
*
|
||||||
|
* Therefore, with overwrite being true, the src QDict will always be empty when
|
||||||
|
* this function returns. If overwrite is false, the src QDict will be empty
|
||||||
|
* iff there were no conflicts.
|
||||||
|
*/
|
||||||
|
void qdict_join(QDict *dest, QDict *src, bool overwrite)
|
||||||
|
{
|
||||||
|
const QDictEntry *entry, *next;
|
||||||
|
|
||||||
|
entry = qdict_first(src);
|
||||||
|
while (entry) {
|
||||||
|
next = qdict_next(src, entry);
|
||||||
|
|
||||||
|
if (overwrite || !qdict_haskey(dest, entry->key)) {
|
||||||
|
qobject_incref(entry->value);
|
||||||
|
qdict_put_obj(dest, entry->key, entry->value);
|
||||||
|
qdict_del(src, entry->key);
|
||||||
|
}
|
||||||
|
|
||||||
|
entry = next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue