Commit 213f0c4f authored by Andreas Färber's avatar Andreas Färber
Browse files

qom: Pass available size to object_initialize() 



To be passed on to object_initialize_with_type().

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> (virtio-ccw)
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent fb17dfe0

hw/core/qdev.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static void bus_unparent(Object *obj) 
void qbus_create_inplace(void *bus, size_t size, const char *typename,

                         DeviceState *parent, const char *name)

{

    object_initialize(bus, typename);

    object_initialize(bus, size, typename);

    qbus_realize(bus, parent, name);

}

hw/dma/xilinx_axidma.c

+4 −2
Original line number Diff line number Diff line
@@ -579,8 +579,10 @@ static void xilinx_axidma_init(Object *obj) 
                             (Object **) &s->tx_control_dev, &errp);

    assert_no_error(errp);



    object_initialize(&s->rx_data_dev, TYPE_XILINX_AXI_DMA_DATA_STREAM);

    object_initialize(&s->rx_control_dev, TYPE_XILINX_AXI_DMA_CONTROL_STREAM);

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

                      TYPE_XILINX_AXI_DMA_DATA_STREAM);

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

                      TYPE_XILINX_AXI_DMA_CONTROL_STREAM);

    object_property_add_child(OBJECT(s), "axistream-connected-target",

                              (Object *)&s->rx_data_dev, &errp);

    assert_no_error(errp);

hw/intc/xics.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static void xics_realize(DeviceState *dev, Error **errp) 
    icp->ss = g_malloc0(icp->nr_servers*sizeof(ICPState));

    for (i = 0; i < icp->nr_servers; i++) {

        char buffer[32];

        object_initialize(&icp->ss[i], TYPE_ICP);

        object_initialize(&icp->ss[i], sizeof(icp->ss[i]), TYPE_ICP);

        snprintf(buffer, sizeof(buffer), "icp[%d]", i);

        object_property_add_child(OBJECT(icp), buffer, OBJECT(&icp->ss[i]), NULL);

        qdev_init_nofail(DEVICE(&icp->ss[i]));

hw/misc/macio/macio.c

+7 −6
Original line number Diff line number Diff line
@@ -202,11 +202,12 @@ static int macio_oldworld_initfn(PCIDevice *d) 
    return 0;

}



static void macio_init_ide(MacIOState *s, MACIOIDEState *ide, int index)

static void macio_init_ide(MacIOState *s, MACIOIDEState *ide, size_t ide_size,

                           int index)

{

    gchar *name;



    object_initialize(ide, TYPE_MACIO_IDE);

    object_initialize(ide, ide_size, TYPE_MACIO_IDE);

    qdev_set_parent_bus(DEVICE(ide), sysbus_get_default());

    memory_region_add_subregion(&s->bar, 0x1f000 + ((index + 1) * 0x1000),

                                &ide->mem);
@@ -224,13 +225,13 @@ static void macio_oldworld_init(Object *obj) 


    qdev_init_gpio_out(DEVICE(obj), os->irqs, ARRAY_SIZE(os->irqs));



    object_initialize(&os->nvram, TYPE_MACIO_NVRAM);

    object_initialize(&os->nvram, sizeof(os->nvram), TYPE_MACIO_NVRAM);

    dev = DEVICE(&os->nvram);

    qdev_prop_set_uint32(dev, "size", 0x2000);

    qdev_prop_set_uint32(dev, "it_shift", 4);



    for (i = 0; i < 2; i++) {

        macio_init_ide(s, &os->ide[i], i);

        macio_init_ide(s, &os->ide[i], sizeof(os->ide[i]), i);

    }

}
@@ -310,7 +311,7 @@ static void macio_newworld_init(Object *obj) 
    qdev_init_gpio_out(DEVICE(obj), ns->irqs, ARRAY_SIZE(ns->irqs));



    for (i = 0; i < 2; i++) {

        macio_init_ide(s, &ns->ide[i], i);

        macio_init_ide(s, &ns->ide[i], sizeof(ns->ide[i]), i);

    }

}
@@ -321,7 +322,7 @@ static void macio_instance_init(Object *obj) 


    memory_region_init(&s->bar, NULL, "macio", 0x80000);



    object_initialize(&s->cuda, TYPE_CUDA);

    object_initialize(&s->cuda, sizeof(s->cuda), TYPE_CUDA);

    qdev_set_parent_bus(DEVICE(&s->cuda), sysbus_get_default());

    object_property_add_child(obj, "cuda", OBJECT(&s->cuda), NULL);

hw/net/xilinx_axienet.c

+4 −2
Original line number Diff line number Diff line
@@ -990,8 +990,10 @@ static void xilinx_enet_init(Object *obj) 
                             (Object **) &s->tx_control_dev, &errp);

    assert_no_error(errp);



    object_initialize(&s->rx_data_dev, TYPE_XILINX_AXI_ENET_DATA_STREAM);

    object_initialize(&s->rx_control_dev, TYPE_XILINX_AXI_ENET_CONTROL_STREAM);

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

                      TYPE_XILINX_AXI_ENET_DATA_STREAM);

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

                      TYPE_XILINX_AXI_ENET_CONTROL_STREAM);

    object_property_add_child(OBJECT(s), "axistream-connected-target",

                              (Object *)&s->rx_data_dev, &errp);

    assert_no_error(errp);