isa: pic: convert to QEMU Object Model

This converts two devices at once because PIC subclasses ISA and converting
subclasses independently is extremely hard.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2011-12-04 11:52:49 -06:00
parent e855761ca8
commit 8f04ee0882
28 changed files with 390 additions and 192 deletions

View file

@ -82,11 +82,17 @@ static int isa_ne2000_initfn(ISADevice *dev)
return 0;
}
static ISADeviceInfo ne2000_isa_info = {
.qdev.name = "ne2k_isa",
.qdev.size = sizeof(ISANE2000State),
.init = isa_ne2000_initfn,
.qdev.props = (Property[]) {
static void isa_ne2000_class_initfn(ObjectClass *klass, void *data)
{
ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
ic->init = isa_ne2000_initfn;
}
static DeviceInfo ne2000_isa_info = {
.name = "ne2k_isa",
.size = sizeof(ISANE2000State),
.class_init = isa_ne2000_class_initfn,
.props = (Property[]) {
DEFINE_PROP_HEX32("iobase", ISANE2000State, iobase, 0x300),
DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9),
DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c),