From 4b608eccfd4eb4d03f5543354f63fe48797db35e Mon Sep 17 00:00:00 2001 From: "Huawei Technologies Co., Ltd" Date: Thu, 29 Oct 2020 19:24:48 +0800 Subject: [PATCH 1/3] Bugfix: hw/acpi: Use max_cpus instead of cpus when build PPTT table The field "cpus" is the initial number of CPU for guest, and the field "max_cpus" is the max number of CPU after CPU hotplug. When building PPTT for guest, we should take all CPUs into account, otherwise the "smp_sockets" is wrong. Fixes: 7cfcd8c8a2fe ("build smt processor structure to support smt topology") Signed-off-by: Keqian Zhu --- ...se-max_cpus-instead-of-cpus-when-bui.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Bugfix-hw-acpi-Use-max_cpus-instead-of-cpus-when-bui.patch diff --git a/Bugfix-hw-acpi-Use-max_cpus-instead-of-cpus-when-bui.patch b/Bugfix-hw-acpi-Use-max_cpus-instead-of-cpus-when-bui.patch new file mode 100644 index 00000000..8d492058 --- /dev/null +++ b/Bugfix-hw-acpi-Use-max_cpus-instead-of-cpus-when-bui.patch @@ -0,0 +1,32 @@ +From 38734e26ce3840d459da13607a9d46de24a15388 Mon Sep 17 00:00:00 2001 +From: kevinZhu +Date: Thu, 29 Oct 2020 19:24:48 +0800 +Subject: [PATCH] Bugfix: hw/acpi: Use max_cpus instead of cpus when build PPTT + table + +The field "cpus" is the initial number of CPU for guest, and the field "max_cpus" +is the max number of CPU after CPU hotplug. When building PPTT for guest, we +should take all CPUs into account, otherwise the "smp_sockets" is wrong. + +Fixes: 7cfcd8c8a2fe ("build smt processor structure to support smt topology") +Signed-off-by: Keqian Zhu +--- + hw/acpi/aml-build.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c +index 8a3b51c835..f01669df57 100644 +--- a/hw/acpi/aml-build.c ++++ b/hw/acpi/aml-build.c +@@ -167,7 +167,7 @@ void build_pptt(GArray *table_data, BIOSLinker *linker, int possible_cpus) + struct offset_status offset; + const MachineState *ms = MACHINE(qdev_get_machine()); + unsigned int smp_cores = ms->smp.cores; +- unsigned int smp_sockets = ms->smp.cpus / (smp_cores * ms->smp.threads); ++ unsigned int smp_sockets = ms->smp.max_cpus / (smp_cores * ms->smp.threads); + + acpi_data_push(table_data, sizeof(AcpiTableHeader)); + +-- +2.27.0 + -- Gitee From 43a724723773eb108d02b2c86c212b375f7298df Mon Sep 17 00:00:00 2001 From: Euler Robot Date: Tue, 8 Dec 2020 21:26:55 +0800 Subject: [PATCH 2/3] spec: Update patch and changelog with !47 Bugfix: hw/acpi: Use max_cpus instead of cpus when build PPTT table Signed-off-by: Alex Chen --- qemu.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qemu.spec b/qemu.spec index 0ee8c52d..e59699e6 100644 --- a/qemu.spec +++ b/qemu.spec @@ -279,6 +279,7 @@ Patch0266: migration-multifd-fix-hangup-with-TLS-Multifd-due-to.patch Patch0267: multifd-tls-fix-memoryleak-of-the-QIOChannelSocket-o.patch Patch0268: net-remove-an-assert-call-in-eth_get_gso_type.patch Patch0269: json-Fix-a-memleak-in-parse_pair.patch +Patch0270: Bugfix-hw-acpi-Use-max_cpus-instead-of-cpus-when-bui.patch BuildRequires: flex BuildRequires: bison @@ -625,6 +626,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Thu Oct 29 2020 Huawei Technologies Co., Ltd +- Bugfix: hw/acpi: Use max_cpus instead of cpus when build PPTT table + * Fri Nov 13 2020 Huawei Technologies Co., Ltd - json: Fix a memleak in parse_pair() -- Gitee From 0190db4b512995a39fb344484d724f1ad84c0eae Mon Sep 17 00:00:00 2001 From: Euler Robot Date: Tue, 8 Dec 2020 21:26:57 +0800 Subject: [PATCH 3/3] spec: Update release version with !47 increase release verison by one Signed-off-by: Euler Robot --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index e59699e6..23610863 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 33 +Release: 34 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY -- Gitee