Commit 037b7add authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging 



QOM/QTest infrastructure fixes

* QOM machine memory and build fixes
* QOM link<> and child<> property reference counting fixes

# gpg: Signature made Wed 19 Mar 2014 21:44:04 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-2.0:
  virtio-rng: Avoid default_backend refcount leak
  qom: Add check() argument to object_property_add_link()
  qom: Make QOM link property unref optional
  qom: Don't make link NULL on object_property_set_link() failure
  qom: Split object_property_set_link()
  vl.c: Fix OpenBSD compilation issue due to namespace collisions
  vl.c: Fix memory leak in qemu_register_machine()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f71e769d abdffd1f

hw/core/qdev-properties.c

+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,18 @@ void qdev_prop_set_after_realize(DeviceState *dev, const char *name, 
    }

}



void qdev_prop_allow_set_link_before_realize(Object *obj, const char *name,

                                             Object *val, Error **errp)

{

    DeviceState *dev = DEVICE(obj);



    if (dev->realized) {

        error_setg(errp, "Attempt to set link property '%s' on device '%s' "

                   "(type '%s') after it was realized",

                   name, dev->id, object_get_typename(obj));

    }

}



void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)

{

    void *ptr = dev;

hw/core/qdev.c

+8 −2
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ static void bus_add_child(BusState *bus, DeviceState *child) 
    object_property_add_link(OBJECT(bus), name,

                             object_get_typename(OBJECT(child)),

                             (Object **)&kid->child,

                             NULL, /* read-only property */

                             0, /* return ownership on prop deletion */

                             NULL);

}
@@ -824,7 +826,8 @@ static void device_initfn(Object *obj) 
    } while (class != object_class_by_name(TYPE_DEVICE));



    object_property_add_link(OBJECT(dev), "parent_bus", TYPE_BUS,

                             (Object **)&dev->parent_bus, &error_abort);

                             (Object **)&dev->parent_bus, NULL, 0,

                             &error_abort);

}



static void device_post_init(Object *obj)
@@ -944,7 +947,10 @@ static void qbus_initfn(Object *obj) 
    QTAILQ_INIT(&bus->children);

    object_property_add_link(obj, QDEV_HOTPLUG_HANDLER_PROPERTY,

                             TYPE_HOTPLUG_HANDLER,

                             (Object **)&bus->hotplug_handler, NULL);

                             (Object **)&bus->hotplug_handler,

                             object_property_allow_set_link,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             NULL);

    object_property_add_bool(obj, "realized",

                             bus_get_realized, bus_set_realized, NULL);

}

hw/dma/xilinx_axidma.c

+16 −4
Original line number Diff line number Diff line
@@ -537,9 +537,15 @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp) 
    Error *local_errp = NULL;



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

                             (Object **)&ds->dma, &local_errp);

                             (Object **)&ds->dma,

                             object_property_allow_set_link,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             &local_errp);

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

                             (Object **)&cs->dma, &local_errp);

                             (Object **)&cs->dma,

                             object_property_allow_set_link,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             &local_errp);

    if (local_errp) {

        goto xilinx_axidma_realize_fail;

    }
@@ -571,10 +577,16 @@ static void xilinx_axidma_init(Object *obj) 
    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);



    object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE,

                             (Object **)&s->tx_data_dev, &error_abort);

                             (Object **)&s->tx_data_dev,

                             qdev_prop_allow_set_link_before_realize,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             &error_abort);

    object_property_add_link(obj, "axistream-control-connected",

                             TYPE_STREAM_SLAVE,

                             (Object **)&s->tx_control_dev, &error_abort);

                             (Object **)&s->tx_control_dev,

                             qdev_prop_allow_set_link_before_realize,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             &error_abort);



    object_initialize(&s->rx_data_dev, sizeof(s->rx_data_dev),

                      TYPE_XILINX_AXI_DMA_DATA_STREAM);

hw/net/xilinx_axienet.c

+16 −4
Original line number Diff line number Diff line
@@ -945,9 +945,15 @@ static void xilinx_enet_realize(DeviceState *dev, Error **errp) 
    Error *local_errp = NULL;



    object_property_add_link(OBJECT(ds), "enet", "xlnx.axi-ethernet",

                             (Object **) &ds->enet, &local_errp);

                             (Object **) &ds->enet,

                             object_property_allow_set_link,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             &local_errp);

    object_property_add_link(OBJECT(cs), "enet", "xlnx.axi-ethernet",

                             (Object **) &cs->enet, &local_errp);

                             (Object **) &cs->enet,

                             object_property_allow_set_link,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             &local_errp);

    if (local_errp) {

        goto xilinx_enet_realize_fail;

    }
@@ -982,10 +988,16 @@ static void xilinx_enet_init(Object *obj) 
    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);



    object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE,

                             (Object **) &s->tx_data_dev, &error_abort);

                             (Object **) &s->tx_data_dev,

                             qdev_prop_allow_set_link_before_realize,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             &error_abort);

    object_property_add_link(obj, "axistream-control-connected",

                             TYPE_STREAM_SLAVE,

                             (Object **) &s->tx_control_dev, &error_abort);

                             (Object **) &s->tx_control_dev,

                             qdev_prop_allow_set_link_before_realize,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             &error_abort);



    object_initialize(&s->rx_data_dev, sizeof(s->rx_data_dev),

                      TYPE_XILINX_AXI_ENET_DATA_STREAM);

hw/pcmcia/pxa2xx.c

+3 −1
Original line number Diff line number Diff line
@@ -198,7 +198,9 @@ static void pxa2xx_pcmcia_initfn(Object *obj) 
    s->slot.irq = qemu_allocate_irqs(pxa2xx_pcmcia_set_irq, s, 1)[0];



    object_property_add_link(obj, "card", TYPE_PCMCIA_CARD,

                             (Object **)&s->card, NULL);

                             (Object **)&s->card,

                             NULL, /* read-only property */

                             0, NULL);

}



/* Insert a new card into a slot */