diff options
| author | Yanan Wang <wangyanan55@huawei.com> | 2021-09-29 10:58:10 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-10-01 15:28:19 +0200 |
| commit | 69fc28a78dbff2d3414bbafce38320b4433ed583 (patch) | |
| tree | 18ee4a9dec1b047ec2fec97361eb2ed85490c1c3 | |
| parent | 4a0af2930a4e4f64ce551152fdb4b9e7be106408 (diff) | |
| download | qemu-69fc28a78dbff2d3414bbafce38320b4433ed583.zip qemu-69fc28a78dbff2d3414bbafce38320b4433ed583.tar.gz qemu-69fc28a78dbff2d3414bbafce38320b4433ed583.tar.bz2 | |
machine: Use ms instead of global current_machine in sanity-check
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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210929025816.21076-11-wangyanan55@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/core/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index f2a34d9..12d7416 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); } |