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

qdev: Pass size to qbus_create_inplace() 



To be passed to object_initialize().

Since commit 39355c38 the argument is
void*, so drop some superfluous (BusState *) casts or direct parent
field usages.

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent e5f72039

hw/audio/intel-hda.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus, size_t bus_size, 
                        hda_codec_response_func response,

                        hda_codec_xfer_func xfer)

{

    qbus_create_inplace(&bus->qbus, TYPE_HDA_BUS, dev, NULL);

    qbus_create_inplace(bus, bus_size, TYPE_HDA_BUS, dev, NULL);

    bus->response = response;

    bus->xfer = xfer;

}

hw/char/ipack.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size, 
                           const char *name, uint8_t n_slots,

                           qemu_irq_handler handler)

{

    qbus_create_inplace(&bus->qbus, TYPE_IPACK_BUS, parent, name);

    qbus_create_inplace(bus, bus_size, TYPE_IPACK_BUS, parent, name);

    bus->n_slots = n_slots;

    bus->set_irq = handler;

}

hw/char/virtio-serial-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -911,8 +911,8 @@ static int virtio_serial_device_init(VirtIODevice *vdev) 
                sizeof(struct virtio_console_config));



    /* Spawn a new virtio-serial bus on which the ports will ride as devices */

    qbus_create_inplace(&vser->bus.qbus, TYPE_VIRTIO_SERIAL_BUS, qdev,

                        vdev->bus_name);

    qbus_create_inplace(&vser->bus, sizeof(vser->bus), TYPE_VIRTIO_SERIAL_BUS,

                        qdev, vdev->bus_name);

    vser->bus.qbus.allow_hotplug = 1;

    vser->bus.vser = vser;

    QTAILQ_INIT(&vser->ports);

hw/core/qdev.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static void bus_unparent(Object *obj) 
    }

}



void qbus_create_inplace(void *bus, const char *typename,

void qbus_create_inplace(void *bus, size_t size, const char *typename,

                         DeviceState *parent, const char *name)

{

    object_initialize(bus, typename);

hw/core/sysbus.c

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ static void main_system_bus_create(void) 
    /* assign main_system_bus before qbus_create_inplace()

     * in order to make "if (bus != sysbus_get_default())" work */

    main_system_bus = g_malloc0(system_bus_info.instance_size);

    qbus_create_inplace(main_system_bus, TYPE_SYSTEM_BUS, NULL,

                        "main-system-bus");

    qbus_create_inplace(main_system_bus, system_bus_info.instance_size,

                        TYPE_SYSTEM_BUS, NULL, "main-system-bus");

    OBJECT(main_system_bus)->free = g_free;

    object_property_add_child(container_get(qdev_get_machine(),

                                            "/unattached"),