[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 v5 07/14] machine: Use ms instead of global current_machi
From: |
Yanan Wang |
Subject: |
[PATCH for-6.2 v5 07/14] machine: Use ms instead of global current_machine in sanity-check |
Date: |
Fri, 13 Aug 2021 10:39:05 +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.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.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 15b41c52e8..45fa3cd61b 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -881,7 +881,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 v5 02/14] machine: Uniformly use maxcpus to calculate the omitted parameters, (continued)
- [PATCH for-6.2 v5 02/14] machine: Uniformly use maxcpus to calculate the omitted parameters, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 04/14] machine: Improve the error reporting of smp parsing, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 01/14] machine: Minor refactor/cleanup for the smp parsers, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 03/14] machine: Set the value of cpus to match maxcpus if it's omitted, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 06/14] machine: Prefer cores over sockets in smp parsing since 6.2, Yanan Wang, 2021/08/12
- Re: [PATCH for-6.2 v5 06/14] machine: Prefer cores over sockets in smp parsing since 6.2, Pankaj Gupta, 2021/08/16
- [PATCH for-6.2 v5 07/14] machine: Use ms instead of global current_machine in sanity-check,
Yanan Wang <=
- [PATCH for-6.2 v5 09/14] machine: Make smp_parse generic enough for all arches, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 05/14] hw: Add compat machines for 6.2, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 12/14] machine: Put all sanity-check in the generic SMP parser, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 10/14] machine: Remove smp_parse callback from MachineClass, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 13/14] machine: Split out the smp parsing code, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 08/14] machine: Tweak the order of topology members in struct CpuTopology, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 11/14] machine: Move smp_prefer_sockets to struct SMPCompatProps, Yanan Wang, 2021/08/12
- [PATCH for-6.2 v5 14/14] tests/unit: Add a unit test for smp parsing, Yanan Wang, 2021/08/12