Commit 0866aca1 authored by Anthony Liguori's avatar Anthony Liguori Committed by Andreas Färber
Browse files

qbus: Make child devices links 



Make qbus children show up as link<> properties.  There is no stable
addressing for qbus children so we use an unstable naming convention.

This is okay in QOM though because the composition name is expected to
be what's stable.

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent f968fc68

hw/acpi_piix4.c

+6 −4
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static const VMStateDescription vmstate_acpi = { 


static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots)

{

    DeviceState *qdev, *next;

    BusChild *kid, *next;

    BusState *bus = qdev_get_parent_bus(&s->dev.qdev);

    int slot = ffs(slots) - 1;

    bool slot_free = true;
@@ -292,7 +292,8 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) 
    /* Mark request as complete */

    s->pci0_status.down &= ~(1U << slot);



    QTAILQ_FOREACH_SAFE(qdev, &bus->children, sibling, next) {

    QTAILQ_FOREACH_SAFE(kid, &bus->children, sibling, next) {

        DeviceState *qdev = kid->child;

        PCIDevice *dev = PCI_DEVICE(qdev);

        PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);

        if (PCI_SLOT(dev->devfn) == slot) {
@@ -313,7 +314,7 @@ static void piix4_update_hotplug(PIIX4PMState *s) 
{

    PCIDevice *dev = &s->dev;

    BusState *bus = qdev_get_parent_bus(&dev->qdev);

    DeviceState *qdev, *next;

    BusChild *kid, *next;



    /* Execute any pending removes during reset */

    while (s->pci0_status.down) {
@@ -323,7 +324,8 @@ static void piix4_update_hotplug(PIIX4PMState *s) 
    s->pci0_hotplug_enable = ~0;

    s->pci0_slot_device_present = 0;



    QTAILQ_FOREACH_SAFE(qdev, &bus->children, sibling, next) {

    QTAILQ_FOREACH_SAFE(kid, &bus->children, sibling, next) {

        DeviceState *qdev = kid->child;

        PCIDevice *pdev = PCI_DEVICE(qdev);

        PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pdev);

        int slot = PCI_SLOT(pdev->devfn);

hw/i2c.c

+3 −2
Original line number Diff line number Diff line
@@ -86,11 +86,12 @@ int i2c_bus_busy(i2c_bus *bus) 
/* TODO: Make this handle multiple masters.  */

int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv)

{

    DeviceState *qdev;

    BusChild *kid;

    I2CSlave *slave = NULL;

    I2CSlaveClass *sc;



    QTAILQ_FOREACH(qdev, &bus->qbus.children, sibling) {

    QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {

        DeviceState *qdev = kid->child;

        I2CSlave *candidate = I2C_SLAVE_FROM_QDEV(qdev);

        if (candidate->address == address) {

            slave = candidate;

hw/intel-hda.c

+9 −6
Original line number Diff line number Diff line
@@ -78,10 +78,11 @@ static int hda_codec_dev_exit(DeviceState *qdev) 


HDACodecDevice *hda_codec_find(HDACodecBus *bus, uint32_t cad)

{

    DeviceState *qdev;

    BusChild *kid;

    HDACodecDevice *cdev;



    QTAILQ_FOREACH(qdev, &bus->qbus.children, sibling) {

    QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {

        DeviceState *qdev = kid->child;

        cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);

        if (cdev->cad == cad) {

            return cdev;
@@ -483,10 +484,11 @@ static void intel_hda_parse_bdl(IntelHDAState *d, IntelHDAStream *st) 


static void intel_hda_notify_codecs(IntelHDAState *d, uint32_t stream, bool running, bool output)

{

    DeviceState *qdev;

    BusChild *kid;

    HDACodecDevice *cdev;



    QTAILQ_FOREACH(qdev, &d->codecs.qbus.children, sibling) {

    QTAILQ_FOREACH(kid, &d->codecs.qbus.children, sibling) {

        DeviceState *qdev = kid->child;

        HDACodecDeviceClass *cdc;



        cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);
@@ -1105,15 +1107,16 @@ static const MemoryRegionOps intel_hda_mmio_ops = { 


static void intel_hda_reset(DeviceState *dev)

{

    BusChild *kid;

    IntelHDAState *d = DO_UPCAST(IntelHDAState, pci.qdev, dev);

    DeviceState *qdev;

    HDACodecDevice *cdev;



    intel_hda_regs_reset(d);

    d->wall_base_ns = qemu_get_clock_ns(vm_clock);



    /* reset codecs */

    QTAILQ_FOREACH(qdev, &d->codecs.qbus.children, sibling) {

    QTAILQ_FOREACH(kid, &d->codecs.qbus.children, sibling) {

        DeviceState *qdev = kid->child;

        cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);

        device_reset(DEVICE(cdev));

        d->state_sts |= (1 << cdev->cad);

hw/lsi53c895a.c

+3 −2
Original line number Diff line number Diff line
@@ -1677,9 +1677,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) 
        }

        if (val & LSI_SCNTL1_RST) {

            if (!(s->sstat0 & LSI_SSTAT0_RST)) {

                DeviceState *dev;

                BusChild *kid;



                QTAILQ_FOREACH(dev, &s->bus.qbus.children, sibling) {

                QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {

                    DeviceState *dev = kid->child;

                    device_reset(dev);

                }

                s->sstat0 |= LSI_SSTAT0_RST;

hw/qdev-monitor.c

+16 −10
Original line number Diff line number Diff line
@@ -205,11 +205,12 @@ static void qbus_list_bus(DeviceState *dev) 


static void qbus_list_dev(BusState *bus)

{

    DeviceState *dev;

    BusChild *kid;

    const char *sep = " ";



    error_printf("devices at \"%s\":", bus->name);

    QTAILQ_FOREACH(dev, &bus->children, sibling) {

    QTAILQ_FOREACH(kid, &bus->children, sibling) {

        DeviceState *dev = kid->child;

        error_printf("%s\"%s\"", sep, object_get_typename(OBJECT(dev)));

        if (dev->id)

            error_printf("/\"%s\"", dev->id);
@@ -232,7 +233,7 @@ static BusState *qbus_find_bus(DeviceState *dev, char *elem) 


static DeviceState *qbus_find_dev(BusState *bus, char *elem)

{

    DeviceState *dev;

    BusChild *kid;



    /*

     * try to match in order:
@@ -240,17 +241,20 @@ static DeviceState *qbus_find_dev(BusState *bus, char *elem) 
     *   (2) driver name

     *   (3) driver alias, if present

     */

    QTAILQ_FOREACH(dev, &bus->children, sibling) {

    QTAILQ_FOREACH(kid, &bus->children, sibling) {

        DeviceState *dev = kid->child;

        if (dev->id  &&  strcmp(dev->id, elem) == 0) {

            return dev;

        }

    }

    QTAILQ_FOREACH(dev, &bus->children, sibling) {

    QTAILQ_FOREACH(kid, &bus->children, sibling) {

        DeviceState *dev = kid->child;

        if (strcmp(object_get_typename(OBJECT(dev)), elem) == 0) {

            return dev;

        }

    }

    QTAILQ_FOREACH(dev, &bus->children, sibling) {

    QTAILQ_FOREACH(kid, &bus->children, sibling) {

        DeviceState *dev = kid->child;

        DeviceClass *dc = DEVICE_GET_CLASS(dev);



        if (qdev_class_has_alias(dc) &&
@@ -264,7 +268,7 @@ static DeviceState *qbus_find_dev(BusState *bus, char *elem) 
static BusState *qbus_find_recursive(BusState *bus, const char *name,

                                     const char *bus_typename)

{

    DeviceState *dev;

    BusChild *kid;

    BusState *child, *ret;

    int match = 1;
@@ -279,7 +283,8 @@ static BusState *qbus_find_recursive(BusState *bus, const char *name, 
        return bus;

    }



    QTAILQ_FOREACH(dev, &bus->children, sibling) {

    QTAILQ_FOREACH(kid, &bus->children, sibling) {

        DeviceState *dev = kid->child;

        QLIST_FOREACH(child, &dev->child_bus, sibling) {

            ret = qbus_find_recursive(child, name, bus_typename);

            if (ret) {
@@ -533,12 +538,13 @@ static void qdev_print(Monitor *mon, DeviceState *dev, int indent) 


static void qbus_print(Monitor *mon, BusState *bus, int indent)

{

    struct DeviceState *dev;

    BusChild *kid;



    qdev_printf("bus: %s\n", bus->name);

    indent += 2;

    qdev_printf("type %s\n", object_get_typename(OBJECT(bus)));

    QTAILQ_FOREACH(dev, &bus->children, sibling) {

    QTAILQ_FOREACH(kid, &bus->children, sibling) {

        DeviceState *dev = kid->child;

        qdev_print(mon, dev, indent);

    }

}