| Message ID | 20180704115247.31117-1-douly.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/machine: Remove the Zero check of nb_numa_nodes | expand |
At 07/04/2018 07:52 PM, Dou Liyang 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. > > Due to the NUMA setup will also check the value of nb_numa_nodes, remove the > check from machine_run_board_init() to fix ths bug. > > Fixes 7a3099fc9c5c("numa: postpone options post-processing till machine_run_board_init()") > Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> > --- > hw/core/machine.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Please ignore this patch, it breaks the "make check", will send v2. Thanks, dou > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 2077328bcc..962346f90d 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -791,10 +791,8 @@ void machine_run_board_init(MachineState *machine) > { > MachineClass *machine_class = MACHINE_GET_CLASS(machine); > > - if (nb_numa_nodes) { > - numa_complete_configuration(machine); > - machine_numa_finish_cpu_init(machine); > - } > + numa_complete_configuration(machine); > + 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. >
diff --git a/hw/core/machine.c b/hw/core/machine.c index 2077328bcc..962346f90d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -791,10 +791,8 @@ void machine_run_board_init(MachineState *machine) { MachineClass *machine_class = MACHINE_GET_CLASS(machine); - if (nb_numa_nodes) { - numa_complete_configuration(machine); - machine_numa_finish_cpu_init(machine); - } + numa_complete_configuration(machine); + 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.
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. Due to the NUMA setup will also check the value of nb_numa_nodes, remove the check from machine_run_board_init() to fix ths bug. Fixes 7a3099fc9c5c("numa: postpone options post-processing till machine_run_board_init()") Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> --- hw/core/machine.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)