mirror of https://github.com/proxmox/mirror_qemu
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: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 20180531195119.22021-3-marcandre.lureau@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>master
parent
f3d58385a6
commit
265b578c58
|
@ -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,
|
object_property_add_link(obj, prop->name, prop->link_type,
|
||||||
child,
|
child,
|
||||||
qdev_prop_allow_set_link_before_realize,
|
qdev_prop_allow_set_link_before_realize,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
errp);
|
errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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_property_add_link(OBJECT(dev), propname, TYPE_IRQ,
|
||||||
(Object **)&pins[i],
|
(Object **)&pins[i],
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
g_free(propname);
|
g_free(propname);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1223,7 +1223,7 @@ static void xlnx_dp_init(Object *obj)
|
||||||
object_property_add_link(obj, "dpdma", TYPE_XLNX_DPDMA,
|
object_property_add_link(obj, "dpdma", TYPE_XLNX_DPDMA,
|
||||||
(Object **) &s->dpdma,
|
(Object **) &s->dpdma,
|
||||||
xlnx_dp_set_dpdma,
|
xlnx_dp_set_dpdma,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -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_property_add_link(OBJECT(ds), "dma", TYPE_XILINX_AXI_DMA,
|
||||||
(Object **)&ds->dma,
|
(Object **)&ds->dma,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&local_err);
|
&local_err);
|
||||||
object_property_add_link(OBJECT(cs), "dma", TYPE_XILINX_AXI_DMA,
|
object_property_add_link(OBJECT(cs), "dma", TYPE_XILINX_AXI_DMA,
|
||||||
(Object **)&cs->dma,
|
(Object **)&cs->dma,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&local_err);
|
&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
goto xilinx_axidma_realize_fail;
|
goto xilinx_axidma_realize_fail;
|
||||||
|
|
|
@ -787,7 +787,7 @@ static void zdma_init(Object *obj)
|
||||||
object_property_add_link(obj, "dma", TYPE_MEMORY_REGION,
|
object_property_add_link(obj, "dma", TYPE_MEMORY_REGION,
|
||||||
(Object **)&s->dma_mr,
|
(Object **)&s->dma_mr,
|
||||||
qdev_prop_allow_set_link_before_realize,
|
qdev_prop_allow_set_link_before_realize,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -483,7 +483,7 @@ void pc_cmos_init(PCMachineState *pcms,
|
||||||
TYPE_ISA_DEVICE,
|
TYPE_ISA_DEVICE,
|
||||||
(Object **)&pcms->rtc,
|
(Object **)&pcms->rtc,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
|
OBJ_PROP_LINK_STRONG, &error_abort);
|
||||||
object_property_set_link(OBJECT(pcms), OBJECT(s),
|
object_property_set_link(OBJECT(pcms), OBJECT(s),
|
||||||
"rtc_state", &error_abort);
|
"rtc_state", &error_abort);
|
||||||
|
|
||||||
|
|
|
@ -289,7 +289,7 @@ static void pc_init1(MachineState *machine,
|
||||||
TYPE_HOTPLUG_HANDLER,
|
TYPE_HOTPLUG_HANDLER,
|
||||||
(Object **)&pcms->acpi_dev,
|
(Object **)&pcms->acpi_dev,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
|
OBJ_PROP_LINK_STRONG, &error_abort);
|
||||||
object_property_set_link(OBJECT(machine), OBJECT(piix4_pm),
|
object_property_set_link(OBJECT(machine), OBJECT(piix4_pm),
|
||||||
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
|
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
|
||||||
}
|
}
|
||||||
|
|
|
@ -194,7 +194,7 @@ static void pc_q35_init(MachineState *machine)
|
||||||
TYPE_HOTPLUG_HANDLER,
|
TYPE_HOTPLUG_HANDLER,
|
||||||
(Object **)&pcms->acpi_dev,
|
(Object **)&pcms->acpi_dev,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
|
OBJ_PROP_LINK_STRONG, &error_abort);
|
||||||
object_property_set_link(OBJECT(machine), OBJECT(lpc),
|
object_property_set_link(OBJECT(machine), OBJECT(lpc),
|
||||||
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
|
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ void ipmi_bmc_find_and_link(Object *obj, Object **bmc)
|
||||||
{
|
{
|
||||||
object_property_add_link(obj, "bmc", TYPE_IPMI_BMC, bmc,
|
object_property_add_link(obj, "bmc", TYPE_IPMI_BMC, bmc,
|
||||||
isa_ipmi_bmc_check,
|
isa_ipmi_bmc_check,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -951,12 +951,12 @@ static void xilinx_enet_realize(DeviceState *dev, Error **errp)
|
||||||
object_property_add_link(OBJECT(ds), "enet", "xlnx.axi-ethernet",
|
object_property_add_link(OBJECT(ds), "enet", "xlnx.axi-ethernet",
|
||||||
(Object **) &ds->enet,
|
(Object **) &ds->enet,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&local_err);
|
&local_err);
|
||||||
object_property_add_link(OBJECT(cs), "enet", "xlnx.axi-ethernet",
|
object_property_add_link(OBJECT(cs), "enet", "xlnx.axi-ethernet",
|
||||||
(Object **) &cs->enet,
|
(Object **) &cs->enet,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&local_err);
|
&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
goto xilinx_enet_realize_fail;
|
goto xilinx_enet_realize_fail;
|
||||||
|
|
|
@ -1346,7 +1346,7 @@ static void xlnx_zynqmp_qspips_init(Object *obj)
|
||||||
object_property_add_link(obj, "stream-connected-dma", TYPE_STREAM_SLAVE,
|
object_property_add_link(obj, "stream-connected-dma", TYPE_STREAM_SLAVE,
|
||||||
(Object **)&rq->dma,
|
(Object **)&rq->dma,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
NULL);
|
NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1103,6 +1103,11 @@ char *object_property_get_str(Object *obj, const char *name,
|
||||||
* @errp: returns an error if this function fails
|
* @errp: returns an error if this function fails
|
||||||
*
|
*
|
||||||
* Writes an object's canonical path to a property.
|
* Writes an object's canonical path to a property.
|
||||||
|
*
|
||||||
|
* If the link property was created with
|
||||||
|
* <code>OBJ_PROP_LINK_STRONG</code> bit, the old target object is
|
||||||
|
* unreferenced, and a reference is added to the new target object.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
void object_property_set_link(Object *obj, Object *value,
|
void object_property_set_link(Object *obj, Object *value,
|
||||||
const char *name, Error **errp);
|
const char *name, Error **errp);
|
||||||
|
@ -1394,7 +1399,7 @@ void object_property_add_child(Object *obj, const char *name,
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
/* Unref the link pointer when the property is deleted */
|
/* Unref the link pointer when the property is deleted */
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE = 0x1,
|
OBJ_PROP_LINK_STRONG = 0x1,
|
||||||
} ObjectPropertyLinkFlags;
|
} ObjectPropertyLinkFlags;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1432,8 +1437,9 @@ void object_property_allow_set_link(const Object *, const char *,
|
||||||
* link property. The reference count for <code>*@child</code> is
|
* link property. The reference count for <code>*@child</code> is
|
||||||
* managed by the property from after the function returns till the
|
* managed by the property from after the function returns till the
|
||||||
* property is deleted with object_property_del(). If the
|
* property is deleted with object_property_del(). If the
|
||||||
* <code>@flags</code> <code>OBJ_PROP_LINK_UNREF_ON_RELEASE</code> bit is set,
|
* <code>@flags</code> <code>OBJ_PROP_LINK_STRONG</code> bit is set,
|
||||||
* the reference count is decremented when the property is deleted.
|
* the reference count is decremented when the property is deleted or
|
||||||
|
* modified.
|
||||||
*/
|
*/
|
||||||
void object_property_add_link(Object *obj, const char *name,
|
void object_property_add_link(Object *obj, const char *name,
|
||||||
const char *type, Object **child,
|
const char *type, Object **child,
|
||||||
|
|
|
@ -77,7 +77,7 @@ static void can_host_instance_init(Object *obj)
|
||||||
object_property_add_link(obj, "canbus", TYPE_CAN_BUS,
|
object_property_add_link(obj, "canbus", TYPE_CAN_BUS,
|
||||||
(Object **)&ch->bus,
|
(Object **)&ch->bus,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -980,7 +980,7 @@ static void colo_compare_init(Object *obj)
|
||||||
object_property_add_link(obj, "iothread", TYPE_IOTHREAD,
|
object_property_add_link(obj, "iothread", TYPE_IOTHREAD,
|
||||||
(Object **)&s->iothread,
|
(Object **)&s->iothread,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL);
|
OBJ_PROP_LINK_STRONG, NULL);
|
||||||
|
|
||||||
s->vnet_hdr = false;
|
s->vnet_hdr = false;
|
||||||
object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr,
|
object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr,
|
||||||
|
|
|
@ -1564,9 +1564,11 @@ static void object_set_link_property(Object *obj, Visitor *v,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
object_ref(new_target);
|
|
||||||
*child = new_target;
|
*child = new_target;
|
||||||
object_unref(old_target);
|
if (prop->flags == OBJ_PROP_LINK_STRONG) {
|
||||||
|
object_ref(new_target);
|
||||||
|
object_unref(old_target);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static Object *object_resolve_link_property(Object *parent, void *opaque, const gchar *part)
|
static Object *object_resolve_link_property(Object *parent, void *opaque, const gchar *part)
|
||||||
|
@ -1581,7 +1583,7 @@ static void object_release_link_property(Object *obj, const char *name,
|
||||||
{
|
{
|
||||||
LinkProperty *prop = opaque;
|
LinkProperty *prop = opaque;
|
||||||
|
|
||||||
if ((prop->flags & OBJ_PROP_LINK_UNREF_ON_RELEASE) && *prop->child) {
|
if ((prop->flags & OBJ_PROP_LINK_STRONG) && *prop->child) {
|
||||||
object_unref(*prop->child);
|
object_unref(*prop->child);
|
||||||
}
|
}
|
||||||
g_free(prop);
|
g_free(prop);
|
||||||
|
|
|
@ -690,7 +690,7 @@ static void arm_cpu_post_init(Object *obj)
|
||||||
TYPE_MEMORY_REGION,
|
TYPE_MEMORY_REGION,
|
||||||
(Object **)&cpu->secure_memory,
|
(Object **)&cpu->secure_memory,
|
||||||
qdev_prop_allow_set_link_before_realize,
|
qdev_prop_allow_set_link_before_realize,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -718,7 +718,7 @@ static void arm_cpu_post_init(Object *obj)
|
||||||
if (arm_feature(&cpu->env, ARM_FEATURE_M_SECURITY)) {
|
if (arm_feature(&cpu->env, ARM_FEATURE_M_SECURITY)) {
|
||||||
object_property_add_link(obj, "idau", TYPE_IDAU_INTERFACE, &cpu->idau,
|
object_property_add_link(obj, "idau", TYPE_IDAU_INTERFACE, &cpu->idau,
|
||||||
qdev_prop_allow_set_link_before_realize,
|
qdev_prop_allow_set_link_before_realize,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
qdev_property_add_static(DEVICE(obj), &arm_cpu_initsvtor_property,
|
qdev_property_add_static(DEVICE(obj), &arm_cpu_initsvtor_property,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
|
|
|
@ -1287,7 +1287,7 @@ static QemuConsole *new_console(DisplayState *ds, console_type_t console_type,
|
||||||
object_property_add_link(obj, "device", TYPE_DEVICE,
|
object_property_add_link(obj, "device", TYPE_DEVICE,
|
||||||
(Object **)&s->device,
|
(Object **)&s->device,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_STRONG,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
object_property_add_uint32_ptr(obj, "head",
|
object_property_add_uint32_ptr(obj, "head",
|
||||||
&s->head, &error_abort);
|
&s->head, &error_abort);
|
||||||
|
|
Loading…
Reference in New Issue