From: Eduardo Habkost Date: Fri, 18 Aug 2017 19:09:43 +0000 (-0300) Subject: numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9 X-Git-Tag: qemu-xen-4.10.0-rc1~12 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3da2bd8c4a80178fb115c70b858cecbfb1eb1067;p=qemu-xen.git numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9 The 'm->numa_auto_assign_ram = numa_legacy_auto_assign_ram;' line was supposed to be in pc_i440fx_2_9_machine_options() (see commit 3bfe5716 "numa: equally distribute memory on nodes"), but the merge commit adb354dd ("Merge remote-tracking branch 'mst/tags/for_upstream' into staging") moved it to the pc_i440fx_2_10_machine_options(). Move the line back to pc_i440fx_2_9_machine_options(). Signed-off-by: Eduardo Habkost Message-id: 20170818190943.23858-1-ehabkost@redhat.com Signed-off-by: Peter Maydell --- diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 11b4336a42..46dfd2c954 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -441,7 +441,6 @@ static void pc_i440fx_2_10_machine_options(MachineClass *m) pc_i440fx_machine_options(m); m->alias = "pc"; m->is_default = 1; - m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; } DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL, @@ -453,6 +452,7 @@ static void pc_i440fx_2_9_machine_options(MachineClass *m) m->is_default = 0; m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); + m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; } DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,