mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpi/piix4: QOM Upcast Sweep

Browse Source 
Define and use standard QOM cast macro. Remove usages of DO_UPCAST()
and direct -> style upcasting.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Peter Crosthwaite 2013-06-24 16:57:14 +10:00 committed by Andreas Färber
parent 0d3aea5603
commit 74e445f649
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/acpi/piix4.c
View File

@ -96,6 +96,11 @@ typedef struct PIIX4PMState {
Notifier cpu_added_notifier; Notifier cpu_added_notifier;
} PIIX4PMState; } PIIX4PMState;
#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, static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
PCIBus *bus, PIIX4PMState *s); PCIBus *bus, PIIX4PMState *s);
@ -300,7 +305,7 @@ static const VMStateDescription vmstate_acpi = {
static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots)
{ {
BusChild *kid, *next; BusChild *kid, *next;
BusState *bus = qdev_get_parent_bus(&s->dev.qdev); BusState *bus = qdev_get_parent_bus(DEVICE(s));
int slot = ffs(slots) - 1; int slot = ffs(slots) - 1;
bool slot_free = true; bool slot_free = true;
@ -326,8 +331,7 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots)
static void piix4_update_hotplug(PIIX4PMState *s) static void piix4_update_hotplug(PIIX4PMState *s)
{ {
PCIDevice *dev = &s->dev; BusState *bus = qdev_get_parent_bus(DEVICE(s));
BusState *bus = qdev_get_parent_bus(&dev->qdev);
BusChild *kid, *next; BusChild *kid, *next;
/* Execute any pending removes during reset */ /* Execute any pending removes during reset */
@ -396,7 +400,7 @@ static void piix4_pm_machine_ready(Notifier *n, void *opaque)
static int piix4_pm_initfn(PCIDevice *dev) static int piix4_pm_initfn(PCIDevice *dev)
{ {
PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev, dev); PIIX4PMState *s = PIIX4_PM(dev);
uint8_t *pci_conf; uint8_t *pci_conf;
pci_conf = s->dev.config; pci_conf = s->dev.config;
@ -419,7 +423,7 @@ static int piix4_pm_initfn(PCIDevice *dev)
pci_conf[0x90] = s->smb_io_base | 1; pci_conf[0x90] = s->smb_io_base | 1;
pci_conf[0x91] = s->smb_io_base >> 8; pci_conf[0x91] = s->smb_io_base >> 8;
pci_conf[0xd2] = 0x09; pci_conf[0xd2] = 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_set_enabled(&s->smb.io, pci_conf[0xd2] & 1);
memory_region_add_subregion(pci_address_space_io(dev), memory_region_add_subregion(pci_address_space_io(dev),
s->smb_io_base, &s->smb.io); s->smb_io_base, &s->smb.io);
@ -450,18 +454,18 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
qemu_irq sci_irq, qemu_irq smi_irq, qemu_irq sci_irq, qemu_irq smi_irq,
int kvm_enabled, FWCfgState *fw_cfg) int kvm_enabled, FWCfgState *fw_cfg)
{ {
PCIDevice *dev; DeviceState *dev;
PIIX4PMState *s; PIIX4PMState *s;
dev = pci_create(bus, devfn, "PIIX4_PM"); dev = DEVICE(pci_create(bus, devfn, TYPE_PIIX4_PM));
qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base); qdev_prop_set_uint32(dev, "smb_io_base", smb_io_base);
s = DO_UPCAST(PIIX4PMState, dev, dev); s = PIIX4_PM(dev);
s->irq = sci_irq; s->irq = sci_irq;
s->smi_irq = smi_irq; s->smi_irq = smi_irq;
s->kvm_enabled = kvm_enabled; s->kvm_enabled = kvm_enabled;
qdev_init_nofail(&dev->qdev); qdev_init_nofail(dev);
if (fw_cfg) { if (fw_cfg) {
uint8_t suspend[6] = {128, 0, 0, 129, 128, 128}; uint8_t suspend[6] = {128, 0, 0, 129, 128, 128};
@ -501,7 +505,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo piix4_pm_info = { static const TypeInfo piix4_pm_info = {
.name = "PIIX4_PM", .name = TYPE_PIIX4_PM,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PIIX4PMState), .instance_size = sizeof(PIIX4PMState),
.class_init = piix4_pm_class_init, .class_init = piix4_pm_class_init,
@ -679,7 +683,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
"acpi-pci-hotplug", PCI_HOTPLUG_SIZE); "acpi-pci-hotplug", PCI_HOTPLUG_SIZE);
memory_region_add_subregion(parent, PCI_HOTPLUG_ADDR, memory_region_add_subregion(parent, PCI_HOTPLUG_ADDR,
&s->io_pci); &s->io_pci);
pci_bus_hotplug(bus, piix4_device_hotplug, &s->dev.qdev); pci_bus_hotplug(bus, piix4_device_hotplug, DEVICE(s));
qemu_for_each_cpu(piix4_init_cpu_status, &s->gpe_cpu); qemu_for_each_cpu(piix4_init_cpu_status, &s->gpe_cpu);
memory_region_init_io(&s->io_cpu, OBJECT(s), &cpu_hotplug_ops, s, memory_region_init_io(&s->io_cpu, OBJECT(s), &cpu_hotplug_ops, s,
@ -705,8 +709,7 @@ static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev,
PCIHotplugState state) PCIHotplugState state)
{ {
int slot = PCI_SLOT(dev->devfn); int slot = PCI_SLOT(dev->devfn);
PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev, PIIX4PMState *s = PIIX4_PM(qdev);
PCI_DEVICE(qdev));
/* Don't send event when device is enabled during qemu machine creation: /* Don't send event when device is enabled during qemu machine creation:
* it is present on boot, no hotplug event is necessary. We do send an * it is present on boot, no hotplug event is necessary. We do send an