[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 09/14] machine: Use ms instead of global current_machine in s
From: |
Yanan Wang |
Subject: |
[PATCH v11 09/14] machine: Use ms instead of global current_machine in sanity-check |
Date: |
Tue, 28 Sep 2021 11:57:50 +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 0df597f99c..1ad5dac3e8 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 v11 07/14] qtest/numa-test: Use detailed -smp CLIs in test_def_cpu_split, (continued)
- [PATCH v11 07/14] qtest/numa-test: Use detailed -smp CLIs in test_def_cpu_split, Yanan Wang, 2021/09/27
- [PATCH v11 08/14] machine: Prefer cores over sockets in smp parsing since 6.2, Yanan Wang, 2021/09/27
- [PATCH v11 06/14] qtest/numa-test: Use detailed -smp CLIs in pc_dynamic_cpu_cfg, Yanan Wang, 2021/09/27
- [PATCH v11 03/14] machine: Uniformly use maxcpus to calculate the omitted parameters, Yanan Wang, 2021/09/27
- [PATCH v11 09/14] machine: Use ms instead of global current_machine in sanity-check,
Yanan Wang <=
- [PATCH v11 11/14] machine: Make smp_parse generic enough for all arches, Yanan Wang, 2021/09/27