mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machine: Use ms instead of global current_machine in sanity-check

Browse Source 
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>
This commit is contained in:
Yanan Wang 2021-09-29 10:58:10 +08:00 committed by Paolo Bonzini
parent 4a0af2930a
commit 69fc28a78d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/core/machine.c
View File

@ -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) { } else if (ms->smp.max_cpus > mc->max_cpus) {
error_setg(errp, "Invalid SMP CPUs %d. The max CPUs " error_setg(errp, "Invalid SMP CPUs %d. The max CPUs "
"supported by machine '%s' is %d", "supported by machine '%s' is %d",
current_machine->smp.max_cpus, ms->smp.max_cpus,
mc->name, mc->max_cpus); mc->name, mc->max_cpus);
} }