diff options
| author | Greg Kurz <groug@kaod.org> | 2017-07-12 11:48:39 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-07-17 15:07:05 +1000 |
| commit | e49c63d5b3234da0debf53cab7ee67de3a4a6a80 (patch) | |
| tree | ddc2c27105498331b3b367c3d8a93bb25751e461 /hw/ppc | |
| parent | 67fea71bf3be579ad0be5abe34cd6fa1bc65ad5b (diff) | |
| download | qemu-e49c63d5b3234da0debf53cab7ee67de3a4a6a80.zip qemu-e49c63d5b3234da0debf53cab7ee67de3a4a6a80.tar.gz qemu-e49c63d5b3234da0debf53cab7ee67de3a4a6a80.tar.bz2 | |
spapr: fix potential memory leak in spapr_core_plug()
Since commit 5c1da81215c7 ("spapr: Remove unnecessary differences between
hotplug and coldplug paths"), the CPU DT for the DRC is always allocated.
This causes a memory leak for pseries-2.6 and older machine types, that
don't support CPU hotplug and don't allocate DRCs for CPUs.
Reported-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/spapr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 16d450f..a58dd54 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2974,8 +2974,6 @@ static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev, CPUState *cs = CPU(core->threads); sPAPRDRConnector *drc; Error *local_err = NULL; - void *fdt = NULL; - int fdt_offset = 0; int smt = kvmppc_smt_threads(); CPUArchId *core_slot; int index; @@ -2991,9 +2989,12 @@ static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev, g_assert(drc || !mc->has_hotpluggable_cpus); - fdt = spapr_populate_hotplug_cpu_dt(cs, &fdt_offset, spapr); - if (drc) { + void *fdt; + int fdt_offset; + + fdt = spapr_populate_hotplug_cpu_dt(cs, &fdt_offset, spapr); + spapr_drc_attach(drc, dev, fdt, fdt_offset, &local_err); if (local_err) { g_free(fdt); |