aboutsummaryrefslogtreecommitdiff
path: root/hw/i386
diff options
context:
space:
mode:
authorBabu Moger <babu.moger@amd.com>2020-08-31 13:42:54 -0500
committerEduardo Habkost <ehabkost@redhat.com>2020-09-02 07:29:26 -0400
commit0a48666a31575f1dc4e4c63f2edaa29c16923fb7 (patch)
treefc63c17bd91facc50248aabeba885ba3d33fbc03 /hw/i386
parent10f20ae96b76aeaa97fbd37e757eee49b4ec77a8 (diff)
downloadqemu-0a48666a31575f1dc4e4c63f2edaa29c16923fb7.zip
qemu-0a48666a31575f1dc4e4c63f2edaa29c16923fb7.tar.gz
qemu-0a48666a31575f1dc4e4c63f2edaa29c16923fb7.tar.bz2
Revert "hw/i386: Update structures to save the number of nodes per package"
This reverts commit c24a41bb53c0854d22c96b30d57cfcaa543c409d. Remove the EPYC specific apicid decoding and use the generic default decoding. Signed-off-by: Babu Moger <babu.moger@amd.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <159889937478.21294.4192291354416942986.stgit@naples-babu.amd.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/i386')
-rw-r--r--hw/i386/pc.c1
-rw-r--r--hw/i386/x86.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 0677d6a..d11daac 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1501,7 +1501,6 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
init_topo_info(&topo_info, x86ms);
env->nr_dies = x86ms->smp_dies;
- env->nr_nodes = topo_info.nodes_per_pkg;
/*
* If APIC ID is not set,
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 727c4a0..c1954db 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -62,7 +62,6 @@ inline void init_topo_info(X86CPUTopoInfo *topo_info,
{
MachineState *ms = MACHINE(x86ms);
- topo_info->nodes_per_pkg = ms->numa_state->num_nodes / ms->smp.sockets;
topo_info->dies_per_pkg = x86ms->smp_dies;
topo_info->cores_per_die = ms->smp.cores;
topo_info->threads_per_core = ms->smp.threads;