for PC CPU's node mapping defined statically at startup
and not possible to changle at hotplug time.
So check that user set cpu.node-id matches whatever values
were configured with -numa options (ex|im)plicitly.
Signed-off-by: Igor Mammedov <imamm...@redhat.com>
---
hw/i386/pc.c | 11 ++++++++++-
target/i386/cpu.c | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e2833e0..d828a1a 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1967,7 +1967,16 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
cs = CPU(cpu);
cs->cpu_index = idx;
- cpu->numa_nid = cpu_slot->props.node_id;
+
+ if (cpu->numa_nid == -1) {
+ cpu->numa_nid = cpu_slot->props.node_id;
+ } else if (cpu->numa_nid != cpu_slot->props.node_id) {
+ error_setg(errp, "property node-id: %u doesn't match with -numa"
+ " explictly specified value(s) or implicitly set defaults."
+ " Expected value: %" PRIi64,
+ cpu->numa_nid, cpu_slot->props.node_id);
+ return;
+ }
}
static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 85c52f1..6375a37 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -3649,7 +3649,7 @@ static Property x86_cpu_properties[] = {
DEFINE_PROP_INT32("core-id", X86CPU, core_id, -1),
DEFINE_PROP_INT32("socket-id", X86CPU, socket_id, -1),
#endif
- DEFINE_PROP_INT32("node-id", X86CPU, numa_nid, 0),
+ DEFINE_PROP_INT32("node-id", X86CPU, numa_nid, -1),
DEFINE_PROP_BOOL("pmu", X86CPU, enable_pmu, false),
{ .name = "hv-spinlocks", .info = &qdev_prop_spinlocks },
DEFINE_PROP_BOOL("hv-relaxed", X86CPU, hyperv_relaxed_timing, false),
--
2.7.4
