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/etraxfs_eth.c | |
| parent | 40021f08882aaef93c66c8c740087b6d3031b63a (diff) | |
| download | hqemu-999e12bbe85c5dcf49bef13bce4f97399c7105f4.zip hqemu-999e12bbe85c5dcf49bef13bce4f97399c7105f4.tar.gz | |
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/etraxfs_eth.c')
| -rw-r--r-- | hw/etraxfs_eth.c | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index 1b6b71d..92c822b 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -613,17 +613,26 @@ static int fs_eth_init(SysBusDevice *dev) return 0; } -static SysBusDeviceInfo etraxfs_eth_info = { - .init = fs_eth_init, - .qdev.name = "etraxfs-eth", - .qdev.size = sizeof(struct fs_eth), - .qdev.props = (Property[]) { - DEFINE_PROP_UINT32("phyaddr", struct fs_eth, phyaddr, 1), - DEFINE_PROP_PTR("dma_out", struct fs_eth, vdma_out), - DEFINE_PROP_PTR("dma_in", struct fs_eth, vdma_in), - DEFINE_NIC_PROPERTIES(struct fs_eth, conf), - DEFINE_PROP_END_OF_LIST(), - } +static Property etraxfs_eth_properties[] = { + DEFINE_PROP_UINT32("phyaddr", struct fs_eth, phyaddr, 1), + DEFINE_PROP_PTR("dma_out", struct fs_eth, vdma_out), + DEFINE_PROP_PTR("dma_in", struct fs_eth, vdma_in), + DEFINE_NIC_PROPERTIES(struct fs_eth, conf), + DEFINE_PROP_END_OF_LIST(), +}; + +static void etraxfs_eth_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + + k->init = fs_eth_init; +} + +static DeviceInfo etraxfs_eth_info = { + .name = "etraxfs-eth", + .size = sizeof(struct fs_eth), + .props = etraxfs_eth_properties, + .class_init = etraxfs_eth_class_init, }; static void etraxfs_eth_register(void) |
