On Wed, 4 Jul 2018 21:22:39 +0800
Dou Liyang <douly.f...@cn.fujitsu.com> wrote:
> 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.f...@cn.fujitsu.com>
> ---
> v1 --> v2:
> -Fix it to pass the "make check".
> ---
> hw/core/machine.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 2077328bcc..32b3c5a7d3 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -791,10 +791,9 @@ void machine_run_board_init(MachineState *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);
> - }
missing curly brackets, should look like:
if (nb_numa_nodes) {
machine_numa_finish_cpu_init(machine);
}
with that fixed
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
>
> /* 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.
