From 169bee2e2a410a7183a6383e725f5e0e51a2223b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 19 May 2021 19:00:09 +0200 Subject: [PATCH] add another patch to fix configuration files --- ...ort-accept-any-QemuOptsList-in-qemu_.patch | 28 +++++++++++++++++++ qemu.spec | 9 ++++-- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 0006-qemu-option-support-accept-any-QemuOptsList-in-qemu_.patch diff --git a/0006-qemu-option-support-accept-any-QemuOptsList-in-qemu_.patch b/0006-qemu-option-support-accept-any-QemuOptsList-in-qemu_.patch new file mode 100644 index 0000000..ff72c75 --- /dev/null +++ b/0006-qemu-option-support-accept-any-QemuOptsList-in-qemu_.patch @@ -0,0 +1,28 @@ +From 941a4736d2b465be1d6429415f8b1f26e2167585 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Wed, 11 Nov 2020 08:42:27 -0500 +Subject: [PATCH] qemu-option: support accept-any QemuOptsList in + qemu_opts_absorb_qdict + +Signed-off-by: Paolo Bonzini +--- + util/qemu-option.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +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; + } +-- +2.31.1 + diff --git a/qemu.spec b/qemu.spec index 6ae8f7c..f5e4642 100644 --- a/qemu.spec +++ b/qemu.spec @@ -246,7 +246,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 6.0.0 -Release: 2%{?rcrel}%{?dist} +Release: 3%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -270,7 +270,7 @@ Patch0002: 0002-qemu-config-load-modules-when-instantiating-option-g.patch Patch0003: 0003-qemu-config-parse-configuration-files-to-a-QDict.patch Patch0004: 0004-vl-plumb-keyval-based-options-into-readconfig.patch Patch0005: 0005-vl-plug-object-back-into-readconfig.patch - +Patch0006: 0006-qemu-option-support-accept-any-QemuOptsList-in-qemu_.patch BuildRequires: make BuildRequires: meson @@ -1887,7 +1887,10 @@ getent passwd qemu >/dev/null || \ %changelog -* Wed May 19 2021 Cole Robinson - 2:6.0.0-2 +* Wed May 19 2021 Paolo Bonzini - 2:6.0.0-3 +- add another patch to fix configuration files + +* Wed May 19 2021 Paolo Bonzini - 2:6.0.0-2 - fix spice option from configuration file - fix object option from configuration file - allow not specifying size in -m when using -M memory-backend