Commit 7747abf1 authored Jul 04, 2018 by Dou Liyang Committed by Eduardo Habkost Jul 09, 2018

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

Commit 7a3099fc("numa: postpone options post-processing till machine_run_board_init()")
broke the commit 7b8be49d("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 7a3099fc("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>

parent 2ff4f67c

hw/core/machine.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -792,10 +792,9 @@ void machine_run_board_init(MachineState *machine)
		{
		MachineClass *machine_class = MACHINE_GET_CLASS(machine);

		if (nb_numa_nodes) {
		numa_complete_configuration(machine);
		if (nb_numa_nodes)
		machine_numa_finish_cpu_init(machine);
		}

		/* 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.