qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
To: Dou Liyang <douly.fnst@cn.fujitsu.com>
Cc: qemu-devel@nongnu.org, ehabkost@redhat.com
Subject: Re: [Qemu-devel] [PATCH v2] hw/machine: Remove the Zero check of nb_numa_nodes for numa_complete_configuration()
Date: Tue, 10 Jul 2018 09:42:53 +0200	[thread overview]
Message-ID: <20180710094253.0c122846@redhat.com> (raw)
In-Reply-To: <20180704132239.6506-1-douly.fnst@cn.fujitsu.com>

On Wed, 4 Jul 2018 21:22:39 +0800
Dou Liyang <douly.fnst@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.fnst@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 <imammedo@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.

  parent reply	other threads:[~2018-07-10  7:43 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-04 13:22 [Qemu-devel] [PATCH v2] hw/machine: Remove the Zero check of nb_numa_nodes for numa_complete_configuration() Dou Liyang
2018-07-04 13:31 ` no-reply
2018-07-04 18:06 ` Eduardo Habkost
2018-07-10  7:42 ` Igor Mammedov [this message]
2018-07-10  8:15   ` Dou Liyang
2018-07-10 10:27     ` Eduardo Habkost
2018-07-10 10:33       ` Dou Liyang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180710094253.0c122846@redhat.com \
    --to=imammedo@redhat.com \
    --cc=douly.fnst@cn.fujitsu.com \
    --cc=ehabkost@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).