On 13/2/23 10:50, Zhao Liu wrote:
From: Zhao Liu <zhao1....@intel.com>Rename X86CPUTopoInfo to X86ApicidTopoInfo, and also rename its members to max_{dies, modules, cores, threads} to avoid confusion with CPUState.topo. Now the names can better reflect their relationship with APIC ID. For hybrid CPU topology, X86ApicidTopoInfo will be different with CPUState.topo and keep the maximum possible number of topology structures in each topology level other than the actual topology information of a certain CPU. This is required for the APIC ID under the hybrid CPU topology. Co-Developed-by: Zhuocheng Ding <zhuocheng.d...@intel.com> Signed-off-by: Zhuocheng Ding <zhuocheng.d...@intel.com> Signed-off-by: Zhao Liu <zhao1....@intel.com> --- hw/i386/x86.c | 18 ++++----- include/hw/i386/topology.h | 72 +++++++++++++++++++++++------------- include/hw/i386/x86.h | 2 +- target/i386/cpu.c | 20 +++++----- tests/unit/test-x86-apicid.c | 50 ++++++++++++------------- 5 files changed, 91 insertions(+), 71 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
