hw/riscv: Fix topo field in error_report

[PATCH] hw/riscv: Fix topo field in error_report

Posted by Zhao Liu 2 years, 6 months ago

From: Zhao Liu <zhao1.liu@intel.com>

"smp.cpus" means the number of online CPUs and "smp.max_cpus" means the
total number of CPUs.

riscv_numa_get_default_cpu_node_id() checks "smp.cpus" and the
"available CPUs" description in the next error message also indicates
online CPUs.

So report "smp.cpus" in error_report() instand of "smp.max_cpus".

Since "smp.cpus" is "unsigned int", use "%u".

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/riscv/numa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c
index e0414d5b1b73..d319aefb4511 100644
--- a/hw/riscv/numa.c
+++ b/hw/riscv/numa.c
@@ -209,8 +209,8 @@ int64_t riscv_numa_get_default_cpu_node_id(const MachineState *ms, int idx)
 
     if (ms->numa_state->num_nodes > ms->smp.cpus) {
         error_report("Number of NUMA nodes (%d)"
-                     " cannot exceed the number of available CPUs (%d).",
-                     ms->numa_state->num_nodes, ms->smp.max_cpus);
+                     " cannot exceed the number of available CPUs (%u).",
+                     ms->numa_state->num_nodes, ms->smp.cpus);
         exit(EXIT_FAILURE);
     }
     if (ms->numa_state->num_nodes) {
-- 
2.34.1

Re: [PATCH] hw/riscv: Fix topo field in error_report

Posted by Alistair Francis 2 years, 6 months ago

On Tue, Jul 18, 2023 at 5:57 PM Zhao Liu <zhao1.liu@linux.intel.com> wrote:
>
> From: Zhao Liu <zhao1.liu@intel.com>
>
> "smp.cpus" means the number of online CPUs and "smp.max_cpus" means the
> total number of CPUs.
>
> riscv_numa_get_default_cpu_node_id() checks "smp.cpus" and the
> "available CPUs" description in the next error message also indicates
> online CPUs.
>
> So report "smp.cpus" in error_report() instand of "smp.max_cpus".
>
> Since "smp.cpus" is "unsigned int", use "%u".
>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>

I fixed up the typo in the commit title

Thanks!

Applied to riscv-to-apply.next

Alistair

> ---
>  hw/riscv/numa.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c
> index e0414d5b1b73..d319aefb4511 100644
> --- a/hw/riscv/numa.c
> +++ b/hw/riscv/numa.c
> @@ -209,8 +209,8 @@ int64_t riscv_numa_get_default_cpu_node_id(const MachineState *ms, int idx)
>
>      if (ms->numa_state->num_nodes > ms->smp.cpus) {
>          error_report("Number of NUMA nodes (%d)"
> -                     " cannot exceed the number of available CPUs (%d).",
> -                     ms->numa_state->num_nodes, ms->smp.max_cpus);
> +                     " cannot exceed the number of available CPUs (%u).",
> +                     ms->numa_state->num_nodes, ms->smp.cpus);
>          exit(EXIT_FAILURE);
>      }
>      if (ms->numa_state->num_nodes) {
> --
> 2.34.1
>
>

Re: [PATCH] hw/riscv: Fix topo field in error_report

Posted by Alistair Francis 2 years, 6 months ago

On Tue, Jul 18, 2023 at 5:57 PM Zhao Liu <zhao1.liu@linux.intel.com> wrote:
>
> From: Zhao Liu <zhao1.liu@intel.com>
>
> "smp.cpus" means the number of online CPUs and "smp.max_cpus" means the
> total number of CPUs.
>
> riscv_numa_get_default_cpu_node_id() checks "smp.cpus" and the
> "available CPUs" description in the next error message also indicates
> online CPUs.
>
> So report "smp.cpus" in error_report() instand of "smp.max_cpus".
>
> Since "smp.cpus" is "unsigned int", use "%u".
>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  hw/riscv/numa.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c
> index e0414d5b1b73..d319aefb4511 100644
> --- a/hw/riscv/numa.c
> +++ b/hw/riscv/numa.c
> @@ -209,8 +209,8 @@ int64_t riscv_numa_get_default_cpu_node_id(const MachineState *ms, int idx)
>
>      if (ms->numa_state->num_nodes > ms->smp.cpus) {
>          error_report("Number of NUMA nodes (%d)"
> -                     " cannot exceed the number of available CPUs (%d).",
> -                     ms->numa_state->num_nodes, ms->smp.max_cpus);
> +                     " cannot exceed the number of available CPUs (%u).",
> +                     ms->numa_state->num_nodes, ms->smp.cpus);
>          exit(EXIT_FAILURE);
>      }
>      if (ms->numa_state->num_nodes) {
> --
> 2.34.1
>
>