commit 7b225762c8c05fd31d4c2be116aedfbc00383f8b
author Babu Moger <babu.moger@amd.com> Wed Mar 11 17:54:15 2020 -0500
committer Eduardo Habkost <ehabkost@redhat.com> Tue Mar 31 19:13:32 2020 -0300
tree 82c34907bd1c201e6b22df5b421bc9404dcfcc64
parent 247b18c593ec298446645af8d5d28911daf653b1

i386: Fix pkg_id offset for EPYC cpu models

If the system is numa configured the pkg_offset needs
to be adjusted for EPYC cpu models. Fix it calling the
model specific handler.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <158396725589.58170.16424607815207074485.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

hw/i386/pc.c

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b58925d..5143c51 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1526,6 +1526,7 @@
 
     env->nr_dies = x86ms->smp_dies;
     env->nr_nodes = topo_info.nodes_per_pkg;
+    env->pkg_offset = x86ms->apicid_pkg_offset(&topo_info);
 
     /*
      * If APIC ID is not set,