[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH] spapr: fix memory leak in spapr_core_pre_plug()
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH] spapr: fix memory leak in spapr_core_pre_plug() |
Date: |
Fri, 14 Jul 2017 18:34:49 +1000 |
User-agent: |
Mutt/1.8.3 (2017-05-23) |
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 <address@hidden>
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);
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature