diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-24 13:12:29 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-27 10:50:50 -0600 |
| commit | 999e12bbe85c5dcf49bef13bce4f97399c7105f4 (patch) | |
| tree | 73b6ed8633a73134e9f728baa1ed2b1dab58b5b0 /hw/sun4m_iommu.c | |
| parent | 40021f08882aaef93c66c8c740087b6d3031b63a (diff) | |
| download | focaccia-qemu-999e12bbe85c5dcf49bef13bce4f97399c7105f4.tar.gz focaccia-qemu-999e12bbe85c5dcf49bef13bce4f97399c7105f4.zip | |
sysbus: apic: ioapic: convert to QEMU Object Model
This converts three devices because apic and ioapic are subclasses of sysbus. Converting subclasses independently of their base class is prohibitively hard. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/sun4m_iommu.c')
| -rw-r--r-- | hw/sun4m_iommu.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/hw/sun4m_iommu.c b/hw/sun4m_iommu.c index ef7627c467..823bfaca1b 100644 --- a/hw/sun4m_iommu.c +++ b/hw/sun4m_iommu.c @@ -357,16 +357,25 @@ static int iommu_init1(SysBusDevice *dev) return 0; } -static SysBusDeviceInfo iommu_info = { - .init = iommu_init1, - .qdev.name = "iommu", - .qdev.size = sizeof(IOMMUState), - .qdev.vmsd = &vmstate_iommu, - .qdev.reset = iommu_reset, - .qdev.props = (Property[]) { - DEFINE_PROP_HEX32("version", IOMMUState, version, 0), - DEFINE_PROP_END_OF_LIST(), - } +static Property iommu_properties[] = { + DEFINE_PROP_HEX32("version", IOMMUState, version, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void iommu_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + + k->init = iommu_init1; +} + +static DeviceInfo iommu_info = { + .name = "iommu", + .size = sizeof(IOMMUState), + .vmsd = &vmstate_iommu, + .reset = iommu_reset, + .props = iommu_properties, + .class_init = iommu_class_init, }; static void iommu_register_devices(void) |