commit 32a354dc6c07d766e70b51f42a62d8cd479e3f82
author Igor Mammedov <imammedo@redhat.com> Tue Jun 09 09:56:35 2020 -0400
committer Paolo Bonzini <pbonzini@redhat.com> Fri Jun 26 09:39:39 2020 -0400
tree b038d7e9748bdfd15868fb760e52295b006dfc2b
parent f9919116b8c226428df28bc69ab33480eaa1ee6d

numa: forbid '-numa node, mem' for 5.1 and newer machine types

Deprecation period is run out and it's a time to flip the switch
introduced by cd5ff8333a.  Disable legacy option for new machine
types (since 5.1) and amend documentation.

'-numa node,memdev' shall be used instead of disabled option
with new machine types.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <20200609135635.761587-1-imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

hw/i386/pc.c

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 803bd52..4af9679 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1980,7 +1980,6 @@
     hc->unplug = pc_machine_device_unplug_cb;
     mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
     mc->nvdimm_supported = true;
-    mc->numa_mem_supported = true;
     mc->default_ram_id = "pc.ram";
 
     object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size",

hw/i386/pc_piix.c

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 1497d0e..1d832b2 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -441,6 +441,7 @@
     pc_i440fx_5_1_machine_options(m);
     m->alias = NULL;
     m->is_default = false;
+    m->numa_mem_supported = true;
     compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len);
     compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len);
 }

hw/i386/pc_q35.c

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 46cd065..047ea8d 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -369,6 +369,7 @@
 {
     pc_q35_5_1_machine_options(m);
     m->alias = NULL;
+    m->numa_mem_supported = true;
     compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len);
     compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len);
 }