| Message ID | 20210719032043.25416-9-wangyanan55@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | machine: smp parsing fixes and improvement | expand |
On Mon, Jul 19, 2021 at 11:20:40AM +0800, Yanan Wang wrote: > 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 > Reviewed-by: Andrew Jones <drjones@redhat.com>
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); }
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(-)