david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/machine: Remove the Zero check of nb_numa_nodes for numa_complete_configuration()

Browse Source 
Commit 7a3099fc9c5c("numa: postpone options post-processing till machine_run_board_init()")
broke the commit 7b8be49d36fc("NUMA: Enable adding NUMA node implicitly").

The machine_run_board_init() doesn't do NUMA setup if nb_numa_nodes=0,
but the numa_complete_configuration need add a new node if memory hotplug
is enabled (slots > 0) even nb_numa_nodes=0.

So, Remove the check for numa_complete_configuration() to fix this.

Fixes 7a3099fc9c5c("numa: postpone options post-processing till machine_run_board_init()")
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Message-Id: <20180704132239.6506-1-douly.fnst@cn.fujitsu.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Dou Liyang 2018-07-04 21:22:39 +08:00 committed by Eduardo Habkost
parent 2ff4f67cab
commit 7747abf114
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/core/machine.c
View File

@ -792,10 +792,9 @@ void machine_run_board_init(MachineState *machine)
{ {
MachineClass *machine_class = MACHINE_GET_CLASS(machine); MachineClass *machine_class = MACHINE_GET_CLASS(machine);
if (nb_numa_nodes) {
numa_complete_configuration(machine); numa_complete_configuration(machine);
if (nb_numa_nodes)
machine_numa_finish_cpu_init(machine); machine_numa_finish_cpu_init(machine);
}
/* If the machine supports the valid_cpu_types check and the user /* If the machine supports the valid_cpu_types check and the user
* specified a CPU with -cpu check here that the user CPU is supported. * specified a CPU with -cpu check here that the user CPU is supported.