aboutsummaryrefslogtreecommitdiff
path: root/include/qemu
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-11-12 08:40:11 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2021-07-06 08:33:51 +0200
commit9176e800dbcb2636a2f24411eafc3c800e3455bd (patch)
treec2b8571cd17604f2811edbdb883a33c10eb9950b /include/qemu
parent3bb6944585aa6f28b21265c88d86264e8e9f7e53 (diff)
downloadqemu-9176e800dbcb2636a2f24411eafc3c800e3455bd.zip
qemu-9176e800dbcb2636a2f24411eafc3c800e3455bd.tar.gz
qemu-9176e800dbcb2636a2f24411eafc3c800e3455bd.tar.bz2
keyval: introduce keyval_merge
This patch introduces a function that merges two keyval-produced (or keyval-like) QDicts. It can be used to emulate the behavior of .merge_lists = true QemuOpts groups, merging -readconfig sections and command-line options in a single QDict, and also to implement -set. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/qemu')
-rw-r--r--include/qemu/option.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/qemu/option.h b/include/qemu/option.h
index f73e0dc..d89c661 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -149,5 +149,6 @@ QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);
QDict *keyval_parse(const char *params, const char *implied_key,
bool *help, Error **errp);
+void keyval_merge(QDict *old, const QDict *new, Error **errp);
#endif