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>
diff --git a/hw/i82374.c b/hw/i82374.c
index 616d1fc..2814379 100644
--- a/hw/i82374.c
+++ b/hw/i82374.c
@@ -135,12 +135,19 @@
return 0;
}
-static ISADeviceInfo i82374_isa_info = {
- .qdev.name = "i82374",
- .qdev.size = sizeof(ISAi82374State),
- .qdev.vmsd = &vmstate_isa_i82374,
- .init = i82374_isa_init,
- .qdev.props = (Property[]) {
+static void i82374_class_init(ObjectClass *klass, void *data)
+{
+ ISADeviceClass *k = ISA_DEVICE_CLASS(klass);
+
+ k->init = i82374_isa_init;
+}
+
+static DeviceInfo i82374_isa_info = {
+ .name = "i82374",
+ .size = sizeof(ISAi82374State),
+ .vmsd = &vmstate_isa_i82374,
+ .class_init = i82374_class_init,
+ .props = (Property[]) {
DEFINE_PROP_HEX32("iobase", ISAi82374State, iobase, 0x400),
DEFINE_PROP_END_OF_LIST()
},
