Commit 265b578c authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

object: fix OBJ_PROP_LINK_UNREF_ON_RELEASE ambivalence 



A link property can be set during creation, with
object_property_add_link() and later with object_property_set_link().

add_link() doesn't add a reference to the target object, while
set_link() does.

Furthemore, OBJ_PROP_LINK_UNREF_ON_RELEASE flags, set during add_link,
says whether a reference must be released when the property is destroyed.
This can lead to leaks if the property was later set_link(), as the
added reference is never released.

Instead, rename OBJ_PROP_LINK_UNREF_ON_RELEASE to OBJ_PROP_LINK_STRONG
and use that has an indication on how the link handle reference
management in set_link().

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180531195119.22021-3-marcandre.lureau@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent f3d58385

hw/core/qdev-properties.c

+1 −1
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ static void create_link_property(Object *obj, Property *prop, Error **errp) 
    object_property_add_link(obj, prop->name, prop->link_type,

                             child,

                             qdev_prop_allow_set_link_before_realize,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             OBJ_PROP_LINK_STRONG,

                             errp);

}

hw/core/qdev.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins, 
        object_property_add_link(OBJECT(dev), propname, TYPE_IRQ,

                                 (Object **)&pins[i],

                                 object_property_allow_set_link,

                                 OBJ_PROP_LINK_UNREF_ON_RELEASE,

                                 OBJ_PROP_LINK_STRONG,

                                 &error_abort);

        g_free(propname);

    }

hw/display/xlnx_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ static void xlnx_dp_init(Object *obj) 
    object_property_add_link(obj, "dpdma", TYPE_XLNX_DPDMA,

                             (Object **) &s->dpdma,

                             xlnx_dp_set_dpdma,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             OBJ_PROP_LINK_STRONG,

                             &error_abort);



    /*

hw/dma/xilinx_axidma.c

+2 −2
Original line number Diff line number Diff line
@@ -525,12 +525,12 @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp) 
    object_property_add_link(OBJECT(ds), "dma", TYPE_XILINX_AXI_DMA,

                             (Object **)&ds->dma,

                             object_property_allow_set_link,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             OBJ_PROP_LINK_STRONG,

                             &local_err);

    object_property_add_link(OBJECT(cs), "dma", TYPE_XILINX_AXI_DMA,

                             (Object **)&cs->dma,

                             object_property_allow_set_link,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             OBJ_PROP_LINK_STRONG,

                             &local_err);

    if (local_err) {

        goto xilinx_axidma_realize_fail;

hw/dma/xlnx-zdma.c

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static void zdma_init(Object *obj) 
    object_property_add_link(obj, "dma", TYPE_MEMORY_REGION,

                             (Object **)&s->dma_mr,

                             qdev_prop_allow_set_link_before_realize,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             OBJ_PROP_LINK_STRONG,

                             &error_abort);

}