diff options
| author | Eduardo Habkost | 2017-08-18 21:09:43 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-23 14:53:15 +0200 |
| commit | 3da2bd8c4a80178fb115c70b858cecbfb1eb1067 (patch) | |
| tree | 8289fd525ee04d8cc31ae25e16b1c599b8ccd1b7 /hw | |
| parent | fix build failure in nbd_read_reply_entry() (diff) | |
| download | qemu-3da2bd8c4a80178fb115c70b858cecbfb1eb1067.tar.gz qemu-3da2bd8c4a80178fb115c70b858cecbfb1eb1067.tar.xz qemu-3da2bd8c4a80178fb115c70b858cecbfb1eb1067.zip | |
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 <ehabkost@redhat.com>
Message-id: 20170818190943.23858-1-ehabkost@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_piix.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |