summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-11-11 08:42:27 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2021-05-12 04:06:50 -0400
commit941a4736d2b465be1d6429415f8b1f26e2167585 (patch)
tree66d02ff5ad232ae1e6cdbec340a9ef35352ddfd6 /util
parentd3e6dd2fe73e2c91a5e9803f3d5a93a82fe829ae (diff)
downloadqemu-941a4736d2b465be1d6429415f8b1f26e2167585.zip
qemu-option: support accept-any QemuOptsList in qemu_opts_absorb_qdict
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-option.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 9678d5b682..4944015a25 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -1056,7 +1056,8 @@ bool qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp)
while (entry != NULL) {
next = qdict_next(qdict, entry);
- if (find_desc_by_name(opts->list->desc, entry->key)) {
+ if (opts_accepts_any(opts->list) ||
+ find_desc_by_name(opts->list->desc, entry->key)) {
if (!qemu_opts_from_qdict_entry(opts, entry, errp)) {
return false;
}