spapr: fix memory leak in spapr_core_pre_plug()
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 8149e2992f
.
Signed-off-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
b55d295e3e
commit
df8658de43
|
@ -3150,9 +3150,9 @@ static void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
* total vcpus not a multiple of threads-per-core.
|
* total vcpus not a multiple of threads-per-core.
|
||||||
*/
|
*/
|
||||||
if (mc->has_hotpluggable_cpus && (cc->nr_threads != smp_threads)) {
|
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);
|
cc->nr_threads, smp_threads);
|
||||||
return;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
core_slot = spapr_find_cpu_slot(MACHINE(hotplug_dev), cc->core_id, &index);
|
core_slot = spapr_find_cpu_slot(MACHINE(hotplug_dev), cc->core_id, &index);
|
||||||
|
|
Loading…
Reference in a new issue