[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 v2 08/11] machine: Use ms instead of global current_machi
|
From: |
Yanan Wang |
|
Subject: |
[PATCH for-6.2 v2 08/11] machine: Use ms instead of global current_machine in sanity-check |
|
Date: |
Mon, 19 Jul 2021 11:20:40 +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>
---
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 c074425015..f5620c4d34 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -896,7 +896,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
- Re: [PATCH for-6.2 v2 02/11] machine: Make smp_parse generic enough for all arches, (continued)
[PATCH for-6.2 v2 08/11] machine: Use ms instead of global current_machine in sanity-check,
Yanan Wang <=
[PATCH for-6.2 v2 05/11] machine: Improve the error reporting of smp parsing, Yanan Wang, 2021/07/18
[PATCH for-6.2 v2 11/11] tests/unit: Add a unit test for smp parsing, Yanan Wang, 2021/07/18