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

[Qemu-devel] [PATCH] hw/machine: Remove the Zero check of nb_numa_nodes for numa_complete_configuration() follow-up

Posted by Dou Liyang 5 years, 9 months ago

This Commit 7747abf11487 misses the curly brackets. Follow Igor's and Eduardo's suggestion,

Add a follow-up patch for it.

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
---
 hw/core/machine.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index a9aeb22f03..6b68e1218f 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -793,8 +793,9 @@ void machine_run_board_init(MachineState *machine)
     MachineClass *machine_class = MACHINE_GET_CLASS(machine);
 
     numa_complete_configuration(machine);
-    if (nb_numa_nodes)
+    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.
-- 
2.14.3

Re: [Qemu-devel] [PATCH] hw/machine: Remove the Zero check of nb_numa_nodes for numa_complete_configuration() follow-up

Posted by Igor Mammedov 5 years, 9 months ago

On Tue, 10 Jul 2018 18:51:29 +0800
Dou Liyang <douly.fnst@cn.fujitsu.com> wrote:

> This Commit 7747abf11487 misses the curly brackets. Follow Igor's and Eduardo's suggestion,
> 
> Add a follow-up patch for it.
> 
> Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
> ---
>  hw/core/machine.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index a9aeb22f03..6b68e1218f 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -793,8 +793,9 @@ void machine_run_board_init(MachineState *machine)
>      MachineClass *machine_class = MACHINE_GET_CLASS(machine);
>  
>      numa_complete_configuration(machine);
> -    if (nb_numa_nodes)
> +    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.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

Re: [Qemu-devel] [PATCH] hw/machine: Remove the Zero check of nb_numa_nodes for numa_complete_configuration() follow-up

Posted by Eduardo Habkost 5 years, 9 months ago

On Tue, Jul 10, 2018 at 06:51:29PM +0800, Dou Liyang wrote:
> This Commit 7747abf11487 misses the curly brackets. Follow Igor's and Eduardo's suggestion,
> 
> Add a follow-up patch for it.
> 
> Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>

I'm queueing this for 3.1, but the subject line didn't make sense
(this patch doesn't remove zero check of nb_numa_nodes), so I
rewrote the commit message as:

    machine: Fix coding style at machine_run_board_init()

    Commit 7747abf11487 ("hw/machine: Remove the Zero check of
    nb_numa_nodes for numa_complete_configuration()") removed the
    curly brackets.  Re-add them.

    Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
    Message-Id: <20180710105129.23296-1-douly.fnst@cn.fujitsu.com>
    [ehabkost: rewrote commit message]
    Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

-- 
Eduardo