From 265e14690db81e8f1f41f855ce12b14163be062c Mon Sep 17 00:00:00 2001 From: Lv genggeng Date: Tue, 2 Nov 2021 10:29:36 +0800 Subject: [PATCH] spec: Update patch and changelog increase release verison by one Signed-off-by: Lv genggeng --- fix-virt-4.1-machine-options.patch | 40 ++++++++++++++++++++++++++++++ qemu.spec | 6 ++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 fix-virt-4.1-machine-options.patch diff --git a/fix-virt-4.1-machine-options.patch b/fix-virt-4.1-machine-options.patch new file mode 100644 index 00000000..b58619fb --- /dev/null +++ b/fix-virt-4.1-machine-options.patch @@ -0,0 +1,40 @@ +From dcabe60821cecaff649541214418102c6abc293c Mon Sep 17 00:00:00 2001 +From: Lv Genggeng +Date: Mon, 1 Nov 2021 10:44:31 +0800 +Subject: [PATCH] fix virt-4.1 machine ops + +--- + hw/arm/virt.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/hw/arm/virt.c b/hw/arm/virt.c +index 906768ec..fb253872 100644 +--- a/hw/arm/virt.c ++++ b/hw/arm/virt.c +@@ -2494,18 +2494,18 @@ type_init(machvirt_machine_init); + + static void virt_machine_4_1_options(MachineClass *mc) + { ++ VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); ++ ++ vmc->no_ged = true; ++ mc->auto_enable_numa_with_memhp = false; ++ vmc->kvm_no_adjvtime = true; + } + DEFINE_VIRT_MACHINE_AS_LATEST(4, 1) + + static void virt_machine_4_0_options(MachineClass *mc) + { +- VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); +- + virt_machine_4_1_options(mc); + compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); +- vmc->no_ged = true; +- mc->auto_enable_numa_with_memhp = false; +- vmc->kvm_no_adjvtime = true; + } + DEFINE_VIRT_MACHINE(4, 0) + +-- +2.27.0 + diff --git a/qemu.spec b/qemu.spec index b6f44325..b3ea39cd 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 61 +Release: 62 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 @@ -342,6 +342,7 @@ Patch0329: tftp-check-tftp_input-buffer-size.patch Patch0330: tftp-introduce-a-header-structure.patch Patch0331: fix-cve-2020-35504.patch Patch0332: fix-cve-2020-35505.patch +Patch0333: fix-virt-4.1-machine-options.patch BuildRequires: flex BuildRequires: bison @@ -739,6 +740,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Tue Nov 2 2021 Lv Genggeng +- fix virt-4.1 machine options + * Wed Oct 27 2021 Chen Qun - fix cve-2020-35504 - fix cve-2020-35505 -- Gitee