| Message ID | 150001864048.7077.16008343547703241545.stgit@bahia.lan |
|---|---|
| State | New |
| Headers | show |
On Fri, Jul 14, 2017 at 09:50:40AM +0200, Greg Kurz wrote: > In case of error, we must ensure the dynamically allocated base_core_type > is freed, like it is done everywhere else in this function. > > This is a regression introduced in QEMU 2.9 by commit 8149e2992f78. > > Signed-off-by: Greg Kurz <groug@kaod.org> Applied to ppc-for-2.10. > --- > hw/ppc/spapr.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 638b8243de04..ed9b57d1fc2a 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3150,9 +3150,9 @@ static void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > * total vcpus not a multiple of threads-per-core. > */ > if (mc->has_hotpluggable_cpus && (cc->nr_threads != smp_threads)) { > - error_setg(errp, "invalid nr-threads %d, must be %d", > + error_setg(&local_err, "invalid nr-threads %d, must be %d", > cc->nr_threads, smp_threads); > - return; > + goto out; > } > > core_slot = spapr_find_cpu_slot(MACHINE(hotplug_dev), cc->core_id, &index); >
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 638b8243de04..ed9b57d1fc2a 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3150,9 +3150,9 @@ static void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, * total vcpus not a multiple of threads-per-core. */ if (mc->has_hotpluggable_cpus && (cc->nr_threads != smp_threads)) { - error_setg(errp, "invalid nr-threads %d, must be %d", + error_setg(&local_err, "invalid nr-threads %d, must be %d", cc->nr_threads, smp_threads); - return; + goto out; } core_slot = spapr_find_cpu_slot(MACHINE(hotplug_dev), cc->core_id, &index);
In case of error, we must ensure the dynamically allocated base_core_type is freed, like it is done everywhere else in this function. This is a regression introduced in QEMU 2.9 by commit 8149e2992f78. Signed-off-by: Greg Kurz <groug@kaod.org> --- hw/ppc/spapr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)