diff options
| author | Greg Kurz <groug@kaod.org> | 2017-07-14 09:50:40 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2017-08-24 18:07:16 -0500 |
| commit | 2a7526b0ce649b5c3b06790b9ea7a7b318d38ef4 (patch) | |
| tree | 198f8c4c02d77ada374439eaa748eb1a795356ed | |
| parent | 2e40aad231fbb8944bc2557fd9dce0d4e8d2523e (diff) | |
| download | qemu-2a7526b0ce649b5c3b06790b9ea7a7b318d38ef4.tar.gz | |
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 8149e2992f78.
Signed-off-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
(cherry picked from commit df8658de43db242ea82183d75cc957c2b0fa013a)
Conflicts:
hw/ppc/spapr.c
* fix context dep on 459264ef2
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/ppc/spapr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 58c15efbab..bda3854e2b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2805,7 +2805,7 @@ static void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, if (cc->nr_threads != smp_threads) { error_setg(errp, "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); |