diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-04 12:22:06 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-27 10:50:50 -0600 |
| commit | 40021f08882aaef93c66c8c740087b6d3031b63a (patch) | |
| tree | a0429c040df66503d807770a3b89da9a0c70d8ac /hw/pcnet-pci.c | |
| parent | 6e4ec3f9bb32d6f41e4fb30b872d2b7b084bc9a9 (diff) | |
| download | qemu-40021f08882aaef93c66c8c740087b6d3031b63a.tar.gz | |
pci: convert to QEMU Object Model
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pcnet-pci.c')
| -rw-r--r-- | hw/pcnet-pci.c | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 4e164da3ac..be3bd79ae8 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -348,21 +348,30 @@ static void pci_reset(DeviceState *dev) pcnet_h_reset(&d->state); } -static PCIDeviceInfo pcnet_info = { - .qdev.name = "pcnet", - .qdev.size = sizeof(PCIPCNetState), - .qdev.reset = pci_reset, - .qdev.vmsd = &vmstate_pci_pcnet, - .init = pci_pcnet_init, - .exit = pci_pcnet_uninit, - .vendor_id = PCI_VENDOR_ID_AMD, - .device_id = PCI_DEVICE_ID_AMD_LANCE, - .revision = 0x10, - .class_id = PCI_CLASS_NETWORK_ETHERNET, - .qdev.props = (Property[]) { - DEFINE_NIC_PROPERTIES(PCIPCNetState, state.conf), - DEFINE_PROP_END_OF_LIST(), - } +static Property pcnet_properties[] = { + DEFINE_NIC_PROPERTIES(PCIPCNetState, state.conf), + DEFINE_PROP_END_OF_LIST(), +}; + +static void pcnet_class_init(ObjectClass *klass, void *data) +{ + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->init = pci_pcnet_init; + k->exit = pci_pcnet_uninit; + k->vendor_id = PCI_VENDOR_ID_AMD; + k->device_id = PCI_DEVICE_ID_AMD_LANCE; + k->revision = 0x10; + k->class_id = PCI_CLASS_NETWORK_ETHERNET; +} + +static DeviceInfo pcnet_info = { + .name = "pcnet", + .size = sizeof(PCIPCNetState), + .reset = pci_reset, + .vmsd = &vmstate_pci_pcnet, + .props = pcnet_properties, + .class_init = pcnet_class_init, }; static void pci_pcnet_register_devices(void) |