From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Poe-0002jn-NI for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1Poc-0003sc-37 for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:56 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45783 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pob-0003rz-Oy for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:53 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 01:45:58 +0200 Message-Id: <1374536796-13983-18-git-send-email-afaerber@suse.de> In-Reply-To: <1374536796-13983-1-git-send-email-afaerber@suse.de> References: <1374536796-13983-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 17/55] acpi/piix4: QOM Upcast Sweep List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" From: Peter Crosthwaite Define and use standard QOM cast macro. Remove usages of DO_UPCAST() and direct -> style upcasting. Signed-off-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- hw/acpi/piix4.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 948ea87..5cd286e 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -96,6 +96,11 @@ typedef struct PIIX4PMState { Notifier cpu_added_notifier; } PIIX4PMState; =20 +#define TYPE_PIIX4_PM "PIIX4_PM" + +#define PIIX4_PM(obj) \ + OBJECT_CHECK(PIIX4PMState, (obj), TYPE_PIIX4_PM) + static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, PCIBus *bus, PIIX4PMState *s)= ; =20 @@ -300,7 +305,7 @@ static const VMStateDescription vmstate_acpi =3D { static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) { BusChild *kid, *next; - BusState *bus =3D qdev_get_parent_bus(&s->dev.qdev); + BusState *bus =3D qdev_get_parent_bus(DEVICE(s)); int slot =3D ffs(slots) - 1; bool slot_free =3D true; =20 @@ -326,8 +331,7 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, uns= igned slots) =20 static void piix4_update_hotplug(PIIX4PMState *s) { - PCIDevice *dev =3D &s->dev; - BusState *bus =3D qdev_get_parent_bus(&dev->qdev); + BusState *bus =3D qdev_get_parent_bus(DEVICE(s)); BusChild *kid, *next; =20 /* Execute any pending removes during reset */ @@ -396,7 +400,7 @@ static void piix4_pm_machine_ready(Notifier *n, void = *opaque) =20 static int piix4_pm_initfn(PCIDevice *dev) { - PIIX4PMState *s =3D DO_UPCAST(PIIX4PMState, dev, dev); + PIIX4PMState *s =3D PIIX4_PM(dev); uint8_t *pci_conf; =20 pci_conf =3D s->dev.config; @@ -419,7 +423,7 @@ static int piix4_pm_initfn(PCIDevice *dev) pci_conf[0x90] =3D s->smb_io_base | 1; pci_conf[0x91] =3D s->smb_io_base >> 8; pci_conf[0xd2] =3D 0x09; - pm_smbus_init(&s->dev.qdev, &s->smb); + pm_smbus_init(DEVICE(dev), &s->smb); memory_region_set_enabled(&s->smb.io, pci_conf[0xd2] & 1); memory_region_add_subregion(pci_address_space_io(dev), s->smb_io_base, &s->smb.io); @@ -450,18 +454,18 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint= 32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, int kvm_enabled, FWCfgState *fw_cfg) { - PCIDevice *dev; + DeviceState *dev; PIIX4PMState *s; =20 - dev =3D pci_create(bus, devfn, "PIIX4_PM"); - qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base); + dev =3D DEVICE(pci_create(bus, devfn, TYPE_PIIX4_PM)); + qdev_prop_set_uint32(dev, "smb_io_base", smb_io_base); =20 - s =3D DO_UPCAST(PIIX4PMState, dev, dev); + s =3D PIIX4_PM(dev); s->irq =3D sci_irq; s->smi_irq =3D smi_irq; s->kvm_enabled =3D kvm_enabled; =20 - qdev_init_nofail(&dev->qdev); + qdev_init_nofail(dev); =20 if (fw_cfg) { uint8_t suspend[6] =3D {128, 0, 0, 129, 128, 128}; @@ -501,7 +505,7 @@ static void piix4_pm_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo piix4_pm_info =3D { - .name =3D "PIIX4_PM", + .name =3D TYPE_PIIX4_PM, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PIIX4PMState), .class_init =3D piix4_pm_class_init, @@ -679,7 +683,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegi= on *parent, "acpi-pci-hotplug", PCI_HOTPLUG_SIZE); memory_region_add_subregion(parent, PCI_HOTPLUG_ADDR, &s->io_pci); - pci_bus_hotplug(bus, piix4_device_hotplug, &s->dev.qdev); + pci_bus_hotplug(bus, piix4_device_hotplug, DEVICE(s)); =20 qemu_for_each_cpu(piix4_init_cpu_status, &s->gpe_cpu); memory_region_init_io(&s->io_cpu, OBJECT(s), &cpu_hotplug_ops, s, @@ -705,8 +709,7 @@ static int piix4_device_hotplug(DeviceState *qdev, PC= IDevice *dev, PCIHotplugState state) { int slot =3D PCI_SLOT(dev->devfn); - PIIX4PMState *s =3D DO_UPCAST(PIIX4PMState, dev, - PCI_DEVICE(qdev)); + PIIX4PMState *s =3D PIIX4_PM(qdev); =20 /* Don't send event when device is enabled during qemu machine creat= ion: * it is present on boot, no hotplug event is necessary. We do send = an --=20 1.8.1.4