hw/riscv: Fix topo field in error_report
PATCH 1/1 hw/riscv: Fix topo field in error_report
From: Zhao Liu <[email protected]>
"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".
--- hw/riscv/numa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/riscv/numa.c +2 -2
@@ -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) {
Signature · 1 line
2.34.1
Quoted 10 lines · Zhao Liu
From: Zhao Liu <[email protected]>
"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.
Quoted 5 lines
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 <[email protected]>
Alistair
Quoted 23 lines
--- hw/riscv/numa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/riscv/numa.c +2
-3@@ -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
Alistair Francis
AppliedQuoted 10 lines · Zhao Liu
From: Zhao Liu <[email protected]>
"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.
Quoted 5 lines
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 <[email protected]>
I fixed up the typo in the commit title
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 23 lines
--- hw/riscv/numa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/riscv/numa.c +2
-3@@ -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