[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [for-2.11 PATCH 07/26] spapr_drc: fix realize and unreali
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [for-2.11 PATCH 07/26] spapr_drc: fix realize and unrealize |
Date: |
Wed, 26 Jul 2017 14:04:59 +1000 |
User-agent: |
Mutt/1.8.3 (2017-05-23) |
On Tue, Jul 25, 2017 at 07:59:31PM +0200, Greg Kurz wrote:
> If object_property_add_alias() returns an error in realize(), we should
> propagate it to the caller and certainly not unref the DRC.
>
> Same thing goes for unrealize(). Since object_property_del() is the last
> call, we can even get rid of the intermediate Error *.
>
> And finally, unrealize() should undo all registrations performed by
> realize().
>
> Signed-off-by: Greg Kurz <address@hidden>
I've applied this to ppc-for-2.11, but this looks like it could be a
real bug fix. So I'm wondering if I should push it for 2.10 (we're in
hard freeze, but bugfixes can still be applied).
> ---
> hw/ppc/spapr_drc.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
> index e4e8383ec7b5..d72453bcb42f 100644
> --- a/hw/ppc/spapr_drc.c
> +++ b/hw/ppc/spapr_drc.c
> @@ -506,12 +506,12 @@ static void realize(DeviceState *d, Error **errp)
> trace_spapr_drc_realize_child(spapr_drc_index(drc), child_name);
> object_property_add_alias(root_container, link_name,
> drc->owner, child_name, &err);
> + g_free(child_name);
> g_free(link_name);
> if (err) {
> - error_report_err(err);
> - object_unref(OBJECT(drc));
> + error_propagate(errp, err);
> + return;
> }
> - g_free(child_name);
> vmstate_register(DEVICE(drc), spapr_drc_index(drc), &vmstate_spapr_drc,
> drc);
> qemu_register_reset(drc_reset, drc);
> @@ -523,17 +523,14 @@ static void unrealize(DeviceState *d, Error **errp)
> sPAPRDRConnector *drc = SPAPR_DR_CONNECTOR(d);
> Object *root_container;
> gchar *name;
> - Error *err = NULL;
>
> trace_spapr_drc_unrealize(spapr_drc_index(drc));
> + qemu_unregister_reset(drc_reset, drc);
> + vmstate_unregister(DEVICE(drc), &vmstate_spapr_drc, drc);
> root_container = container_get(object_get_root(), DRC_CONTAINER_PATH);
> name = g_strdup_printf("%x", spapr_drc_index(drc));
> - object_property_del(root_container, name, &err);
> + object_property_del(root_container, name, errp);
> g_free(name);
> - if (err) {
> - error_report_err(err);
> - object_unref(OBJECT(drc));
> - }
> }
>
> sPAPRDRConnector *spapr_dr_connector_new(Object *owner, const char *type,
>
--
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] [Qemu-devel] [for-2.11 PATCH 04/26] spapr_drc: use g_strdup_printf() instead of snprintf(), (continued)
[Qemu-ppc] [for-2.11 PATCH 05/26] spapr_iommu: convert TCE table object to realize(), Greg Kurz, 2017/07/25
[Qemu-ppc] [for-2.11 PATCH 06/26] spapr_pci: parent the MSI memory region to the PHB, Greg Kurz, 2017/07/25
[Qemu-ppc] [for-2.11 PATCH 07/26] spapr_drc: fix realize and unrealize, Greg Kurz, 2017/07/25
- Re: [Qemu-ppc] [for-2.11 PATCH 07/26] spapr_drc: fix realize and unrealize,
David Gibson <=
[Qemu-ppc] [for-2.11 PATCH 08/26] spapr_drc: add unrealize method to physical DRC class, Greg Kurz, 2017/07/25
[Qemu-ppc] [for-2.11 PATCH 09/26] spapr_drc: pass object ownership to parent/owner, Greg Kurz, 2017/07/25
[Qemu-ppc] [for-2.11 PATCH 10/26] spapr_iommu: pass object ownership to parent/owner, Greg Kurz, 2017/07/25
[Qemu-ppc] [for-2.11 PATCH 11/26] spapr_iommu: unregister vmstate at unrealize time, Greg Kurz, 2017/07/25