]> git.proxmox.com Git - mirror_qemu.git/commit - hw/i386/pc_piix.c
numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9
authorEduardo Habkost <ehabkost@redhat.com>
Fri, 18 Aug 2017 19:09:43 +0000 (16:09 -0300)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 23 Aug 2017 12:53:15 +0000 (13:53 +0100)
commit3da2bd8c4a80178fb115c70b858cecbfb1eb1067
tree8289fd525ee04d8cc31ae25e16b1c599b8ccd1b7
parentd0a180131c6655487b47ea72e7da0a909a479a3c
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>
hw/i386/pc_piix.c