From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 11 Nov 2020 13:42:27 +0000 (-0500)
Subject: qemu-option: support accept-any QemuOptsList in qemu_opts_absorb_qdict
X-Git-Tag: v6.0.1~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e1eef86117da65c7e084e9e87df3f562682a84b;p=thirdparty%2Fqemu.git

qemu-option: support accept-any QemuOptsList in qemu_opts_absorb_qdict

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 941a4736d2b465be1d6429415f8b1f26e2167585)
Signed-off-by: Michael Roth <michael.roth@amd.com>
---

diff --git a/util/qemu-option.c b/util/qemu-option.c
index 9678d5b6821..4944015a257 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;
             }