Commit 6675a653 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-2020-06-15' into staging 



QOM patches for 2020-06-15

# gpg: Signature made Mon 15 Jun 2020 21:07:19 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qom-2020-06-15: (84 commits)
  MAINTAINERS: Make section QOM cover hw/core/*bus.c as well
  qdev: qdev_init_nofail() is now unused, drop
  qdev: Convert bus-less devices to qdev_realize() with Coccinelle
  qdev: Use qdev_realize() in qdev_device_add()
  qdev: Make qdev_realize() support bus-less devices
  s390x/event-facility: Simplify creation of SCLP event devices
  microbit: Eliminate two local variables in microbit_init()
  sysbus: sysbus_init_child_obj() is now unused, drop
  sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4
  sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 3
  sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2
  sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
  qdev: Drop qdev_realize() support for null bus
  sysbus: Convert to sysbus_realize() etc. with Coccinelle
  sysbus: New sysbus_realize(), sysbus_realize_and_unref()
  sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2
  hw/arm/armsse: Pass correct child size to sysbus_init_child_obj()
  sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 1
  microbit: Tidy up sysbus_init_child_obj() @child argument
  sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls
  ...

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

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -1218,7 +1218,9 @@ S: Maintained 
F: hw/ppc/pnv*

F: hw/intc/pnv*

F: hw/intc/xics_pnv.c

F: hw/pci-host/pnv*

F: include/hw/ppc/pnv*

F: include/hw/pci-host/pnv*

F: pc-bios/skiboot.lid

F: tests/qtest/pnv*
@@ -2298,6 +2300,8 @@ R: Eduardo Habkost <ehabkost@redhat.com> 
S: Supported

F: docs/qdev-device-use.txt

F: hw/core/qdev*

F: hw/core/bus.c

F: hw/core/sysbus.c

F: include/hw/qdev*

F: include/monitor/qdev.h

F: include/qom/

hw/acpi/pcihp.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ void acpi_pcihp_device_unplug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, 
{

    trace_acpi_pci_unplug(PCI_SLOT(PCI_DEVICE(dev)->devfn),

                          acpi_pcihp_get_bsel(pci_get_bus(PCI_DEVICE(dev))));

    object_property_set_bool(OBJECT(dev), false, "realized", &error_abort);

    qdev_unrealize(dev);

}



void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev,

hw/acpi/piix4.c

+4 −2
Original line number Diff line number Diff line
@@ -514,10 +514,12 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, 
                      qemu_irq sci_irq, qemu_irq smi_irq,

                      int smm_enabled, DeviceState **piix4_pm)

{

    PCIDevice *pci_dev;

    DeviceState *dev;

    PIIX4PMState *s;



    dev = DEVICE(pci_create(bus, devfn, TYPE_PIIX4_PM));

    pci_dev = pci_new(devfn, TYPE_PIIX4_PM);

    dev = DEVICE(pci_dev);

    qdev_prop_set_uint32(dev, "smb_io_base", smb_io_base);

    if (piix4_pm) {

        *piix4_pm = dev;
@@ -531,7 +533,7 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, 
        s->use_acpi_pci_hotplug = false;

    }



    qdev_init_nofail(dev);

    pci_realize_and_unref(pci_dev, bus, &error_fatal);



    return s->smb.smbus;

}

hw/alpha/typhoon.c

+2 −2
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ PCIBus *typhoon_init(MemoryRegion *ram, ISABus **isa_bus, qemu_irq *p_rtc_irq, 
    PCIBus *b;

    int i;



    dev = qdev_create(NULL, TYPE_TYPHOON_PCI_HOST_BRIDGE);

    dev = qdev_new(TYPE_TYPHOON_PCI_HOST_BRIDGE);



    s = TYPHOON_PCI_HOST_BRIDGE(dev);

    phb = PCI_HOST_BRIDGE(dev);
@@ -889,7 +889,7 @@ PCIBus *typhoon_init(MemoryRegion *ram, ISABus **isa_bus, qemu_irq *p_rtc_irq, 
                              &s->pchip.reg_mem, &s->pchip.reg_io,

                              0, 64, TYPE_PCI_BUS);

    phb->bus = b;

    qdev_init_nofail(dev);

    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);



    /* Host memory as seen from the PCI side, via the IOMMU.  */

    memory_region_init_iommu(&s->pchip.iommu, sizeof(s->pchip.iommu),

hw/arm/allwinner-a10.c

+21 −29
Original line number Diff line number Diff line
@@ -41,37 +41,31 @@ static void aw_a10_init(Object *obj) 
{

    AwA10State *s = AW_A10(obj);



    object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),

                            ARM_CPU_TYPE_NAME("cortex-a8"),

                            &error_abort, NULL);

    object_initialize_child(obj, "cpu", &s->cpu,

                            ARM_CPU_TYPE_NAME("cortex-a8"));



    sysbus_init_child_obj(obj, "intc", &s->intc, sizeof(s->intc),

                          TYPE_AW_A10_PIC);

    object_initialize_child(obj, "intc", &s->intc, TYPE_AW_A10_PIC);



    sysbus_init_child_obj(obj, "timer", &s->timer, sizeof(s->timer),

                          TYPE_AW_A10_PIT);

    object_initialize_child(obj, "timer", &s->timer, TYPE_AW_A10_PIT);



    sysbus_init_child_obj(obj, "emac", &s->emac, sizeof(s->emac), TYPE_AW_EMAC);

    object_initialize_child(obj, "emac", &s->emac, TYPE_AW_EMAC);



    sysbus_init_child_obj(obj, "sata", &s->sata, sizeof(s->sata),

                          TYPE_ALLWINNER_AHCI);

    object_initialize_child(obj, "sata", &s->sata, TYPE_ALLWINNER_AHCI);



    if (machine_usb(current_machine)) {

        int i;



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

            sysbus_init_child_obj(obj, "ehci[*]", OBJECT(&s->ehci[i]),

                                  sizeof(s->ehci[i]), TYPE_PLATFORM_EHCI);

            sysbus_init_child_obj(obj, "ohci[*]", OBJECT(&s->ohci[i]),

                                  sizeof(s->ohci[i]), TYPE_SYSBUS_OHCI);

            object_initialize_child(obj, "ehci[*]", &s->ehci[i],

                                    TYPE_PLATFORM_EHCI);

            object_initialize_child(obj, "ohci[*]", &s->ohci[i],

                                    TYPE_SYSBUS_OHCI);

        }

    }



    sysbus_init_child_obj(obj, "mmc0", &s->mmc0, sizeof(s->mmc0),

                          TYPE_AW_SDHOST_SUN4I);

    object_initialize_child(obj, "mmc0", &s->mmc0, TYPE_AW_SDHOST_SUN4I);



    sysbus_init_child_obj(obj, "rtc", &s->rtc, sizeof(s->rtc),

                          TYPE_AW_RTC_SUN4I);

    object_initialize_child(obj, "rtc", &s->rtc, TYPE_AW_RTC_SUN4I);

}



static void aw_a10_realize(DeviceState *dev, Error **errp)
@@ -80,13 +74,13 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 
    SysBusDevice *sysbusdev;

    Error *err = NULL;



    object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);

    qdev_realize(DEVICE(&s->cpu), NULL, &err);

    if (err != NULL) {

        error_propagate(errp, err);

        return;

    }



    object_property_set_bool(OBJECT(&s->intc), true, "realized", &err);

    sysbus_realize(SYS_BUS_DEVICE(&s->intc), &err);

    if (err != NULL) {

        error_propagate(errp, err);

        return;
@@ -99,7 +93,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 
                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));

    qdev_pass_gpios(DEVICE(&s->intc), dev, NULL);



    object_property_set_bool(OBJECT(&s->timer), true, "realized", &err);

    sysbus_realize(SYS_BUS_DEVICE(&s->timer), &err);

    if (err != NULL) {

        error_propagate(errp, err);

        return;
@@ -123,7 +117,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 
        qemu_check_nic_model(&nd_table[0], TYPE_AW_EMAC);

        qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);

    }

    object_property_set_bool(OBJECT(&s->emac), true, "realized", &err);

    sysbus_realize(SYS_BUS_DEVICE(&s->emac), &err);

    if (err != NULL) {

        error_propagate(errp, err);

        return;
@@ -132,7 +126,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 
    sysbus_mmio_map(sysbusdev, 0, AW_A10_EMAC_BASE);

    sysbus_connect_irq(sysbusdev, 0, qdev_get_gpio_in(dev, 55));



    object_property_set_bool(OBJECT(&s->sata), true, "realized", &err);

    sysbus_realize(SYS_BUS_DEVICE(&s->sata), &err);

    if (err) {

        error_propagate(errp, err);

        return;
@@ -155,8 +149,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 


            object_property_set_bool(OBJECT(&s->ehci[i]), true,

                                     "companion-enable", &error_fatal);

            object_property_set_bool(OBJECT(&s->ehci[i]), true, "realized",

                                     &error_fatal);

            sysbus_realize(SYS_BUS_DEVICE(&s->ehci[i]), &error_fatal);

            sysbus_mmio_map(SYS_BUS_DEVICE(&s->ehci[i]), 0,

                            AW_A10_EHCI_BASE + i * 0x8000);

            sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0,
@@ -164,8 +157,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 


            object_property_set_str(OBJECT(&s->ohci[i]), bus, "masterbus",

                                    &error_fatal);

            object_property_set_bool(OBJECT(&s->ohci[i]), true, "realized",

                                     &error_fatal);

            sysbus_realize(SYS_BUS_DEVICE(&s->ohci[i]), &error_fatal);

            sysbus_mmio_map(SYS_BUS_DEVICE(&s->ohci[i]), 0,

                            AW_A10_OHCI_BASE + i * 0x8000);

            sysbus_connect_irq(SYS_BUS_DEVICE(&s->ohci[i]), 0,
@@ -174,14 +166,14 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 
    }



    /* SD/MMC */

    qdev_init_nofail(DEVICE(&s->mmc0));

    sysbus_realize(SYS_BUS_DEVICE(&s->mmc0), &error_fatal);

    sysbus_mmio_map(SYS_BUS_DEVICE(&s->mmc0), 0, AW_A10_MMC0_BASE);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc0), 0, qdev_get_gpio_in(dev, 32));

    object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0),

                              "sd-bus");



    /* RTC */

    qdev_init_nofail(DEVICE(&s->rtc));

    sysbus_realize(SYS_BUS_DEVICE(&s->rtc), &error_fatal);

    sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->rtc), 0, AW_A10_RTC_BASE, 10);

}