[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 v4 07/14] machine: Use ms instead of global current_machi
From: |
Yanan Wang |
Subject: |
[PATCH for-6.2 v4 07/14] machine: Use ms instead of global current_machine in sanity-check |
Date: |
Tue, 3 Aug 2021 16:05:20 +0800 |
In the sanity-check of smp_cpus and max_cpus against mc in function
machine_set_smp(), we are now using ms->smp.max_cpus for the check
but using current_machine->smp.max_cpus in the error message.
Tweak this by uniformly using the local ms.
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
---
hw/core/machine.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index a8173a0f45..e13a8f2f34 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -878,7 +878,7 @@ static void machine_set_smp(Object *obj, Visitor *v, const
char *name,
} else if (ms->smp.max_cpus > mc->max_cpus) {
error_setg(errp, "Invalid SMP CPUs %d. The max CPUs "
"supported by machine '%s' is %d",
- current_machine->smp.max_cpus,
+ ms->smp.max_cpus,
mc->name, mc->max_cpus);
}
--
2.19.1
- [PATCH for-6.2 v4 00/14] machine: smp parsing fixes and improvement, Yanan Wang, 2021/08/03
- [PATCH for-6.2 v4 04/14] machine: Improve the error reporting of smp parsing, Yanan Wang, 2021/08/03
- [PATCH for-6.2 v4 05/14] hw: Add compat machines for 6.2, Yanan Wang, 2021/08/03
- [PATCH for-6.2 v4 07/14] machine: Use ms instead of global current_machine in sanity-check,
Yanan Wang <=
- [PATCH for-6.2 v4 03/14] machine: Set the value of cpus to match maxcpus if it's omitted, Yanan Wang, 2021/08/03
- [PATCH for-6.2 v4 02/14] machine: Uniformly use maxcpus to calculate the omitted parameters, Yanan Wang, 2021/08/03
- [PATCH for-6.2 v4 08/14] machine: Tweak the order of topology members in struct CpuTopology, Yanan Wang, 2021/08/03
- [PATCH for-6.2 v4 11/14] machine: Move smp_prefer_sockets to struct SMPCompatProps, Yanan Wang, 2021/08/03
- [PATCH for-6.2 v4 10/14] machine: Remove smp_parse callback from MachineClass, Yanan Wang, 2021/08/03
- [PATCH for-6.2 v4 01/14] machine: Minor refactor/cleanup for the smp parsers, Yanan Wang, 2021/08/03
- [PATCH for-6.2 v4 13/14] machine: Split out the smp parsing code, Yanan Wang, 2021/08/03