Commit 3da2bd8c authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Peter Maydell
Browse files

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: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-id: 20170818190943.23858-1-ehabkost@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent d0a18013

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -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,