[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH 5/6] spapr-cpu-core: release ICP object when reali
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH 5/6] spapr-cpu-core: release ICP object when realization fails |
Date: |
Tue, 16 May 2017 14:41:13 +1000 |
User-agent: |
Mutt/1.8.0 (2017-02-23) |
On Mon, May 15, 2017 at 01:39:55PM +0200, Greg Kurz wrote:
> While here we introduce a single error path to avoid code duplication.
>
> Signed-off-by: Greg Kurz <address@hidden>
Applied to ppc=for-2.10.
> ---
> hw/ppc/spapr_cpu_core.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
> index 4389ef4c2aef..63d160f7e010 100644
> --- a/hw/ppc/spapr_cpu_core.c
> +++ b/hw/ppc/spapr_cpu_core.c
> @@ -147,25 +147,25 @@ static void spapr_cpu_core_realize_child(Object *child,
> Error **errp)
> object_property_add_const_link(obj, "xics", OBJECT(spapr), &error_abort);
> object_property_set_bool(obj, true, "realized", &local_err);
> if (local_err) {
> - error_propagate(errp, local_err);
> - return;
> + goto error;
> }
>
> object_property_set_bool(child, true, "realized", &local_err);
> if (local_err) {
> - object_unparent(obj);
> - error_propagate(errp, local_err);
> - return;
> + goto error;
> }
>
> spapr_cpu_init(spapr, cpu, &local_err);
> if (local_err) {
> - object_unparent(obj);
> - error_propagate(errp, local_err);
> - return;
> + goto error;
> }
>
> xics_cpu_setup(XICS_FABRIC(spapr), cpu, ICP(obj));
> + return;
> +
> +error:
> + object_unparent(obj);
> + error_propagate(errp, local_err);
> }
>
> static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
>
--
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
- Re: [Qemu-ppc] [PATCH 3/6] spapr: fix error reporting in xics_system_init(), (continued)
- [Qemu-ppc] [PATCH 5/6] spapr-cpu-core: release ICP object when realization fails, Greg Kurz, 2017/05/15
- [Qemu-ppc] [PATCH 6/6] spapr: fix migration of ICP objects from/to older QEMU, Greg Kurz, 2017/05/15
- Re: [Qemu-ppc] [PATCH 6/6] spapr: fix migration of ICP objects from/to older QEMU, Cédric Le Goater, 2017/05/15
- Re: [Qemu-ppc] [PATCH 6/6] spapr: fix migration of ICP objects from/to older QEMU, Greg Kurz, 2017/05/15
- Re: [Qemu-ppc] [PATCH 6/6] spapr: fix migration of ICP objects from/to older QEMU, David Gibson, 2017/05/17
- Re: [Qemu-ppc] [PATCH 6/6] spapr: fix migration of ICP objects from/to older QEMU, Greg Kurz, 2017/05/17