Hi, This is new version of the series [1] that I have posted to introduce some fixes and improvement for SMP parsing.
[1] https://lore.kernel.org/qemu-devel/20210719032043.25416-1-wangyana...@huawei.com/ Most of this series is about the SMP parsers: maxcpus is now uniformly used to calculate the omitted topology members, calculation of omitted maxcpus/cpus is improved, the error reporting is improved. It's also suggested that we should start to prefer cores over sockets over threads on the newer machine types, which will make the computed virtual topology more reflective of the real hardware. In order to reduce code duplication and ease the code maintenance, smp_parse in now converted into a parser generic enough for all arches, so that the PC specific one can be removed. It's also convenient to introduce more topology members to the generic parser in the future. --- Changelogs: v2->v3: - apply the calculation improvement to smp_parse and pc_smp_parse separately and then convert the finally improved parsers into a generic one, so that patches can be reviewed separately. - to ease review, drop the unit test part for a while until we have a good enough generic parser. - send the patch "machine: Disallow specifying topology parameters as zero" for 6.1 separately. - v2: https://lore.kernel.org/qemu-devel/20210719032043.25416-1-wangyana...@huawei.com/ v1->v2: - disallow "anything=0" in the smp configuration (Andrew) - make function smp_parse() a generic helper for all arches - improve the error reporting in the parser - start to prefer cores over sockets since 6.2 (Daniel) - add a unit test for the smp parsing (Daniel) - v1: https://lists.gnu.org/archive/html/qemu-devel/2021-07/msg00259.html --- Yanan Wang (11): machine: Minor refactor/cleanup for the smp parsers machine: Uniformly use maxcpus to calculate the omitted parameters machine: Set the value of cpus to match maxcpus if it's omitted machine: Improve the error reporting of smp parsing hw: Add compat machines for 6.2 machine: Prefer cores over sockets in smp parsing since 6.2 machine: Use ms instead of global current_machine in sanity-check machine: Tweak the order of topology members in struct CpuTopology machine: Make smp_parse generic enough for all arches machine: Remove smp_parse callback from MachineClass machine: Move smp_prefer_sockets to struct SMPCompatProps hw/arm/virt.c | 10 ++- hw/core/machine.c | 168 ++++++++++++++++++++++++++++--------- hw/i386/pc.c | 66 +-------------- hw/i386/pc_piix.c | 15 +++- hw/i386/pc_q35.c | 14 +++- hw/ppc/spapr.c | 16 +++- hw/s390x/s390-virtio-ccw.c | 15 +++- include/hw/boards.h | 26 ++++-- include/hw/i386/pc.h | 3 + qemu-options.hx | 14 +++- 10 files changed, 228 insertions(+), 119 deletions(-) -- 2.19.1
