[Qemu-devel] [PATCH v3 043/197] kill off ISADeviceInfo

[Anthony Liguori]

---
 hw/applesmc.c    |   12 ++++++------
 hw/cs4231a.c     |   14 +++++++-------
 hw/debugcon.c    |   10 +++++-----
 hw/fdc.c         |   18 +++++++++---------
 hw/gus.c         |   14 +++++++-------
 hw/i8254.c       |   16 ++++++++--------
 hw/i8259.c       |   16 ++++++++--------
 hw/ide/isa.c     |   14 +++++++-------
 hw/isa-bus.c     |    8 ++++----
 hw/isa.h         |    7 +------
 hw/m48t59.c      |   14 +++++++-------
 hw/mc146818rtc.c |   14 +++++++-------
 hw/ne2000-isa.c  |   10 +++++-----
 hw/parallel.c    |   10 +++++-----
 hw/pc.c          |   14 +++++++-------
 hw/pckbd.c       |   12 ++++++------
 hw/sb16.c        |   14 +++++++-------
 hw/serial.c      |   12 ++++++------
 hw/sga.c         |   10 +++++-----
 hw/vga-isa.c     |   12 ++++++------
 hw/vmmouse.c     |   16 ++++++++--------
 hw/vmport.c      |   10 +++++-----
 hw/wdt_ib700.c   |   12 ++++++------
 23 files changed, 142 insertions(+), 147 deletions(-)

diff --git a/hw/applesmc.c b/hw/applesmc.c
index 279c4d3..a6e88bc 100644
--- a/hw/applesmc.c
+++ b/hw/applesmc.c
@@ -226,12 +226,12 @@ static void qdev_applesmc_class_init(ObjectClass *klass, 
void *data)
     ic->init = applesmc_isa_init;
 }
 
-static ISADeviceInfo applesmc_isa_info = {
-    .qdev.name  = "isa-applesmc",
-    .qdev.size  = sizeof(struct AppleSMCStatus),
-    .qdev.reset = qdev_applesmc_isa_reset,
-    .qdev.class_init = qdev_applesmc_class_init,
-    .qdev.props = (Property[]) {
+static DeviceInfo applesmc_isa_info = {
+    .name  = "isa-applesmc",
+    .size  = sizeof(struct AppleSMCStatus),
+    .reset = qdev_applesmc_isa_reset,
+    .class_init = qdev_applesmc_class_init,
+    .props = (Property[]) {
         DEFINE_PROP_HEX32("iobase", struct AppleSMCStatus, iobase,
                           APPLESMC_DEFAULT_IOBASE),
         DEFINE_PROP_STRING("osk", struct AppleSMCStatus, osk),
diff --git a/hw/cs4231a.c b/hw/cs4231a.c
index 25af773..3474aec 100644
--- a/hw/cs4231a.c
+++ b/hw/cs4231a.c
@@ -671,13 +671,13 @@ static void cs4231a_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = cs4231a_initfn;
 }
 
-static ISADeviceInfo cs4231a_info = {
-    .qdev.name     = "cs4231a",
-    .qdev.desc     = "Crystal Semiconductor CS4231A",
-    .qdev.size     = sizeof (CSState),
-    .qdev.vmsd     = &vmstate_cs4231a,
-    .qdev.class_init = cs4231a_class_initfn,
-    .qdev.props    = (Property[]) {
+static DeviceInfo cs4231a_info = {
+    .name     = "cs4231a",
+    .desc     = "Crystal Semiconductor CS4231A",
+    .size     = sizeof (CSState),
+    .vmsd     = &vmstate_cs4231a,
+    .class_init = cs4231a_class_initfn,
+    .props    = (Property[]) {
         DEFINE_PROP_HEX32  ("iobase",  CSState, port, 0x534),
         DEFINE_PROP_UINT32 ("irq",     CSState, irq,  9),
         DEFINE_PROP_UINT32 ("dma",     CSState, dma,  3),
diff --git a/hw/debugcon.c b/hw/debugcon.c
index 1490bfa..f290122 100644
--- a/hw/debugcon.c
+++ b/hw/debugcon.c
@@ -93,11 +93,11 @@ static void debugcon_isa_class_initfn(ObjectClass *klass, 
void *data)
     ic->init = debugcon_isa_initfn;
 }
 
-static ISADeviceInfo debugcon_isa_info = {
-    .qdev.name  = "isa-debugcon",
-    .qdev.size  = sizeof(ISADebugconState),
-    .qdev.class_init = debugcon_isa_class_initfn,
-    .qdev.props = (Property[]) {
+static DeviceInfo debugcon_isa_info = {
+    .name  = "isa-debugcon",
+    .size  = sizeof(ISADebugconState),
+    .class_init = debugcon_isa_class_initfn,
+    .props = (Property[]) {
         DEFINE_PROP_HEX32("iobase", ISADebugconState, iobase, 0xe9),
         DEFINE_PROP_CHR("chardev",  ISADebugconState, state.chr),
         DEFINE_PROP_HEX32("readback", ISADebugconState, state.readback, 0xe9),
diff --git a/hw/fdc.c b/hw/fdc.c
index dfeb138..7223033 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -1975,15 +1975,15 @@ static void isabus_fdc_class_init1(ObjectClass *klass, 
void *data)
     ic->init = isabus_fdc_init1;
 }
 
-static ISADeviceInfo isa_fdc_info = {
-    .qdev.class_init = isabus_fdc_class_init1,
-    .qdev.name  = "isa-fdc",
-    .qdev.fw_name  = "fdc",
-    .qdev.size  = sizeof(FDCtrlISABus),
-    .qdev.no_user = 1,
-    .qdev.vmsd  = &vmstate_isa_fdc,
-    .qdev.reset = fdctrl_external_reset_isa,
-    .qdev.props = (Property[]) {
+static DeviceInfo isa_fdc_info = {
+    .class_init = isabus_fdc_class_init1,
+    .name  = "isa-fdc",
+    .fw_name  = "fdc",
+    .size  = sizeof(FDCtrlISABus),
+    .no_user = 1,
+    .vmsd  = &vmstate_isa_fdc,
+    .reset = fdctrl_external_reset_isa,
+    .props = (Property[]) {
         DEFINE_PROP_DRIVE("driveA", FDCtrlISABus, state.drives[0].bs),
         DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.drives[1].bs),
         DEFINE_PROP_INT32("bootindexA", FDCtrlISABus, bootindexA, -1),
diff --git a/hw/gus.c b/hw/gus.c
index 49e0d16..1675cf5 100644
--- a/hw/gus.c
+++ b/hw/gus.c
@@ -305,13 +305,13 @@ static void gus_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = gus_initfn;
 }
 
-static ISADeviceInfo gus_info = {
-    .qdev.name     = "gus",
-    .qdev.desc     = "Gravis Ultrasound GF1",
-    .qdev.size     = sizeof (GUSState),
-    .qdev.vmsd     = &vmstate_gus,
-    .qdev.class_init          = gus_class_initfn,
-    .qdev.props    = (Property[]) {
+static DeviceInfo gus_info = {
+    .name     = "gus",
+    .desc     = "Gravis Ultrasound GF1",
+    .size     = sizeof (GUSState),
+    .vmsd     = &vmstate_gus,
+    .class_init          = gus_class_initfn,
+    .props    = (Property[]) {
         DEFINE_PROP_UINT32 ("freq",    GUSState, freq,        44100),
         DEFINE_PROP_HEX32  ("iobase",  GUSState, port,        0x240),
         DEFINE_PROP_UINT32 ("irq",     GUSState, emu.gusirq,  7),
diff --git a/hw/i8254.c b/hw/i8254.c
index 5d10206..7766ce2 100644
--- a/hw/i8254.c
+++ b/hw/i8254.c
@@ -541,14 +541,14 @@ static void pit_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = pit_initfn;
 }
 
-static ISADeviceInfo pit_info = {
-    .qdev.name     = "isa-pit",
-    .qdev.size     = sizeof(PITState),
-    .qdev.vmsd     = &vmstate_pit,
-    .qdev.reset    = pit_reset,
-    .qdev.no_user  = 1,
-    .qdev.class_init          = pit_class_initfn,
-    .qdev.props = (Property[]) {
+static DeviceInfo pit_info = {
+    .name     = "isa-pit",
+    .size     = sizeof(PITState),
+    .vmsd     = &vmstate_pit,
+    .reset    = pit_reset,
+    .no_user  = 1,
+    .class_init          = pit_class_initfn,
+    .props = (Property[]) {
         DEFINE_PROP_UINT32("irq", PITState, irq,  -1),
         DEFINE_PROP_HEX32("iobase", PITState, iobase,  -1),
         DEFINE_PROP_END_OF_LIST(),
diff --git a/hw/i8259.c b/hw/i8259.c
index da34f2b..12cd269 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -562,14 +562,14 @@ static void pic_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = pic_initfn;
 }
 
-static ISADeviceInfo i8259_info = {
-    .qdev.name     = "isa-i8259",
-    .qdev.size     = sizeof(PicState),
-    .qdev.vmsd     = &vmstate_pic,
-    .qdev.reset    = pic_reset,
-    .qdev.no_user  = 1,
-    .qdev.class_init          = pic_class_initfn,
-    .qdev.props = (Property[]) {
+static DeviceInfo i8259_info = {
+    .name     = "isa-i8259",
+    .size     = sizeof(PicState),
+    .vmsd     = &vmstate_pic,
+    .reset    = pic_reset,
+    .no_user  = 1,
+    .class_init          = pic_class_initfn,
+    .props = (Property[]) {
         DEFINE_PROP_HEX32("iobase", PicState, iobase,  -1),
         DEFINE_PROP_HEX32("elcr_addr", PicState, elcr_addr,  -1),
         DEFINE_PROP_HEX8("elcr_mask", PicState, elcr_mask,  -1),
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index aeca96d..3c1b479 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -100,13 +100,13 @@ static void isa_ide_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = isa_ide_initfn;
 }
 
-static ISADeviceInfo isa_ide_info = {
-    .qdev.name  = "isa-ide",
-    .qdev.fw_name  = "ide",
-    .qdev.size  = sizeof(ISAIDEState),
-    .qdev.class_init       = isa_ide_class_initfn,
-    .qdev.reset = isa_ide_reset,
-    .qdev.props = (Property[]) {
+static DeviceInfo isa_ide_info = {
+    .name  = "isa-ide",
+    .fw_name  = "ide",
+    .size  = sizeof(ISAIDEState),
+    .class_init       = isa_ide_class_initfn,
+    .reset = isa_ide_reset,
+    .props = (Property[]) {
         DEFINE_PROP_HEX32("iobase",  ISAIDEState, iobase,  0x1f0),
         DEFINE_PROP_HEX32("iobase2", ISAIDEState, iobase2, 0x3f6),
         DEFINE_PROP_UINT32("irq",    ISAIDEState, isairq,  14),
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 9d02919..e3d67fe 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -126,11 +126,11 @@ static int isa_qdev_init(DeviceState *qdev, DeviceInfo 
*base)
     return 0;
 }
 
-void isa_qdev_register(ISADeviceInfo *info)
+void isa_qdev_register(DeviceInfo *info)
 {
-    info->qdev.init = isa_qdev_init;
-    info->qdev.bus_info = &isa_bus_info;
-    qdev_register_subclass(&info->qdev, TYPE_ISA_DEVICE);
+    info->init = isa_qdev_init;
+    info->bus_info = &isa_bus_info;
+    qdev_register_subclass(info, TYPE_ISA_DEVICE);
 }
 
 ISADevice *isa_create(const char *name)
diff --git a/hw/isa.h b/hw/isa.h
index a1afc7b..08a24da 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -11,7 +11,6 @@
 
 typedef struct ISABus ISABus;
 typedef struct ISADevice ISADevice;
-typedef struct ISADeviceInfo ISADeviceInfo;
 
 #define TYPE_ISA_DEVICE "isa-device"
 #define ISA_DEVICE(obj) \
@@ -33,15 +32,11 @@ struct ISADevice {
     int ioport_id;
 };
 
-struct ISADeviceInfo {
-    DeviceInfo qdev;
-};
-
 ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io);
 void isa_bus_irqs(qemu_irq *irqs);
 qemu_irq isa_get_irq(int isairq);
 void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
-void isa_qdev_register(ISADeviceInfo *info);
+void isa_qdev_register(DeviceInfo *info);
 MemoryRegion *isa_address_space(ISADevice *dev);
 ISADevice *isa_create(const char *name);
 ISADevice *isa_try_create(const char *name);
diff --git a/hw/m48t59.c b/hw/m48t59.c
index e58b48f..760ccdd 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -730,13 +730,13 @@ static void m48t59_init_class_isa1(ObjectClass *klass, 
void *data)
     ic->init = m48t59_init_isa1;
 }
 
-static ISADeviceInfo m48t59_isa_info = {
-    .qdev.class_init = m48t59_init_class_isa1,
-    .qdev.name = "m48t59_isa",
-    .qdev.size = sizeof(M48t59ISAState),
-    .qdev.reset = m48t59_reset_isa,
-    .qdev.no_user = 1,
-    .qdev.props = (Property[]) {
+static DeviceInfo m48t59_isa_info = {
+    .class_init = m48t59_init_class_isa1,
+    .name = "m48t59_isa",
+    .size = sizeof(M48t59ISAState),
+    .reset = m48t59_reset_isa,
+    .no_user = 1,
+    .props = (Property[]) {
         DEFINE_PROP_UINT32("size",    M48t59ISAState, state.size,    -1),
         DEFINE_PROP_UINT32("type",    M48t59ISAState, state.type,    -1),
         DEFINE_PROP_HEX32( "io_base", M48t59ISAState, state.io_base,  0),
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index e2acf12..0674e06 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -700,13 +700,13 @@ static void rtc_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = rtc_initfn;
 }
 
-static ISADeviceInfo mc146818rtc_info = {
-    .qdev.name     = "mc146818rtc",
-    .qdev.size     = sizeof(RTCState),
-    .qdev.no_user  = 1,
-    .qdev.vmsd     = &vmstate_rtc,
-    .qdev.class_init          = rtc_class_initfn,
-    .qdev.props    = (Property[]) {
+static DeviceInfo mc146818rtc_info = {
+    .name     = "mc146818rtc",
+    .size     = sizeof(RTCState),
+    .no_user  = 1,
+    .vmsd     = &vmstate_rtc,
+    .class_init          = rtc_class_initfn,
+    .props    = (Property[]) {
         DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980),
         DEFINE_PROP_END_OF_LIST(),
     }
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
index da86a61..e1d1603 100644
--- a/hw/ne2000-isa.c
+++ b/hw/ne2000-isa.c
@@ -88,11 +88,11 @@ static void isa_ne2000_class_initfn(ObjectClass *klass, 
void *data)
     ic->init = isa_ne2000_initfn;
 }
 
-static ISADeviceInfo ne2000_isa_info = {
-    .qdev.name  = "ne2k_isa",
-    .qdev.size  = sizeof(ISANE2000State),
-    .qdev.class_init       = isa_ne2000_class_initfn,
-    .qdev.props = (Property[]) {
+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),
diff --git a/hw/parallel.c b/hw/parallel.c
index ac7dc46..622e4d2 100644
--- a/hw/parallel.c
+++ b/hw/parallel.c
@@ -592,11 +592,11 @@ static void parallel_isa_class_initfn(ObjectClass *klass, 
void *data)
     ic->init = parallel_isa_initfn;
 }
 
-static ISADeviceInfo parallel_isa_info = {
-    .qdev.name  = "isa-parallel",
-    .qdev.size  = sizeof(ISAParallelState),
-    .qdev.class_init       = parallel_isa_class_initfn,
-    .qdev.props = (Property[]) {
+static DeviceInfo parallel_isa_info = {
+    .name  = "isa-parallel",
+    .size  = sizeof(ISAParallelState),
+    .class_init       = parallel_isa_class_initfn,
+    .props = (Property[]) {
         DEFINE_PROP_UINT32("index", ISAParallelState, index,   -1),
         DEFINE_PROP_HEX32("iobase", ISAParallelState, iobase,  -1),
         DEFINE_PROP_UINT32("irq",   ISAParallelState, isairq,  7),
diff --git a/hw/pc.c b/hw/pc.c
index 4e4dc6d..2d69208 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -502,13 +502,13 @@ static void port92_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = port92_initfn;
 }
 
-static ISADeviceInfo port92_info = {
-    .qdev.name     = "port92",
-    .qdev.size     = sizeof(Port92State),
-    .qdev.vmsd     = &vmstate_port92_isa,
-    .qdev.no_user  = 1,
-    .qdev.reset    = port92_reset,
-    .qdev.class_init          = port92_class_initfn,
+static DeviceInfo port92_info = {
+    .name     = "port92",
+    .size     = sizeof(Port92State),
+    .vmsd     = &vmstate_port92_isa,
+    .no_user  = 1,
+    .reset    = port92_reset,
+    .class_init          = port92_class_initfn,
 };
 
 static void port92_register(void)
diff --git a/hw/pckbd.c b/hw/pckbd.c
index fe5cc6e..2ebe1c5 100644
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -503,12 +503,12 @@ static void i8042_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = i8042_initfn;
 }
 
-static ISADeviceInfo i8042_info = {
-    .qdev.name     = "i8042",
-    .qdev.size     = sizeof(ISAKBDState),
-    .qdev.vmsd     = &vmstate_kbd_isa,
-    .qdev.no_user  = 1,
-    .qdev.class_init          = i8042_class_initfn,
+static DeviceInfo i8042_info = {
+    .name     = "i8042",
+    .size     = sizeof(ISAKBDState),
+    .vmsd     = &vmstate_kbd_isa,
+    .no_user  = 1,
+    .class_init          = i8042_class_initfn,
 };
 
 static void i8042_register(void)
diff --git a/hw/sb16.c b/hw/sb16.c
index f7a6b7e..1e28f66 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -1397,13 +1397,13 @@ static void sb16_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = sb16_initfn;
 }
 
-static ISADeviceInfo sb16_info = {
-    .qdev.name     = "sb16",
-    .qdev.desc     = "Creative Sound Blaster 16",
-    .qdev.size     = sizeof (SB16State),
-    .qdev.vmsd     = &vmstate_sb16,
-    .qdev.class_init          = sb16_class_initfn,
-    .qdev.props    = (Property[]) {
+static DeviceInfo sb16_info = {
+    .name     = "sb16",
+    .desc     = "Creative Sound Blaster 16",
+    .size     = sizeof (SB16State),
+    .vmsd     = &vmstate_sb16,
+    .class_init          = sb16_class_initfn,
+    .props    = (Property[]) {
         DEFINE_PROP_HEX32  ("version", SB16State, ver,  0x0405), /* 4.5 */
         DEFINE_PROP_HEX32  ("iobase",  SB16State, port, 0x220),
         DEFINE_PROP_UINT32 ("irq",     SB16State, irq,  5),
diff --git a/hw/serial.c b/hw/serial.c
index 74ed5fe..2644b13 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -885,12 +885,12 @@ static void serial_isa_class_initfn(ObjectClass *klass, 
void *data)
     ic->init = serial_isa_initfn;
 }
 
-static ISADeviceInfo serial_isa_info = {
-    .qdev.name  = "isa-serial",
-    .qdev.size  = sizeof(ISASerialState),
-    .qdev.vmsd  = &vmstate_isa_serial,
-    .qdev.class_init       = serial_isa_class_initfn,
-    .qdev.props = (Property[]) {
+static DeviceInfo serial_isa_info = {
+    .name  = "isa-serial",
+    .size  = sizeof(ISASerialState),
+    .vmsd  = &vmstate_isa_serial,
+    .class_init       = serial_isa_class_initfn,
+    .props = (Property[]) {
         DEFINE_PROP_UINT32("index", ISASerialState, index,   -1),
         DEFINE_PROP_HEX32("iobase", ISASerialState, iobase,  -1),
         DEFINE_PROP_UINT32("irq",   ISASerialState, isairq,  -1),
diff --git a/hw/sga.c b/hw/sga.c
index 6801995..07ed2d0 100644
--- a/hw/sga.c
+++ b/hw/sga.c
@@ -47,11 +47,11 @@ static void isa_cirrus_vga_class_initfn(ObjectClass *klass, 
void *data)
     ic->init = isa_cirrus_vga_initfn;
 }
 
-static ISADeviceInfo sga_info = {
-    .qdev.name    = "sga",
-    .qdev.desc    = "Serial Graphics Adapter",
-    .qdev.size    = sizeof(ISASGAState),
-    .qdev.class_init         = isa_cirrus_vga_class_initfn,
+static DeviceInfo sga_info = {
+    .name    = "sga",
+    .desc    = "Serial Graphics Adapter",
+    .size    = sizeof(ISASGAState),
+    .class_init         = isa_cirrus_vga_class_initfn,
 };
 
 static void sga_register(void)
diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index ba7f9bf..cb6af91 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -75,12 +75,12 @@ static void vga_class_initfn(ObjectClass *klass, void *data)
     ic->init = vga_initfn;
 }
 
-static ISADeviceInfo vga_info = {
-    .qdev.name     = "isa-vga",
-    .qdev.size     = sizeof(ISAVGAState),
-    .qdev.vmsd     = &vmstate_vga_common,
-    .qdev.reset     = vga_reset_isa,
-    .qdev.class_init          = vga_class_initfn,
+static DeviceInfo vga_info = {
+    .name     = "isa-vga",
+    .size     = sizeof(ISAVGAState),
+    .vmsd     = &vmstate_vga_common,
+    .reset     = vga_reset_isa,
+    .class_init          = vga_class_initfn,
 };
 
 static void vga_register(void)
diff --git a/hw/vmmouse.c b/hw/vmmouse.c
index f936089..da2ea32 100644
--- a/hw/vmmouse.c
+++ b/hw/vmmouse.c
@@ -275,14 +275,14 @@ static void vmmouse_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = vmmouse_initfn;
 }
 
-static ISADeviceInfo vmmouse_info = {
-    .qdev.class_init          = vmmouse_class_initfn,
-    .qdev.name     = "vmmouse",
-    .qdev.size     = sizeof(VMMouseState),
-    .qdev.vmsd     = &vmstate_vmmouse,
-    .qdev.no_user  = 1,
-    .qdev.reset    = vmmouse_reset,
-    .qdev.props = (Property[]) {
+static DeviceInfo vmmouse_info = {
+    .class_init          = vmmouse_class_initfn,
+    .name     = "vmmouse",
+    .size     = sizeof(VMMouseState),
+    .vmsd     = &vmstate_vmmouse,
+    .no_user  = 1,
+    .reset    = vmmouse_reset,
+    .props = (Property[]) {
         DEFINE_PROP_PTR("ps2_mouse", VMMouseState, ps2_mouse),
         DEFINE_PROP_END_OF_LIST(),
     }
diff --git a/hw/vmport.c b/hw/vmport.c
index 7468812..ffea73d 100644
--- a/hw/vmport.c
+++ b/hw/vmport.c
@@ -150,11 +150,11 @@ static void vmport_class_initfn(ObjectClass *klass, void 
*data)
     ic->init = vmport_initfn;
 }
 
-static ISADeviceInfo vmport_info = {
-    .qdev.name     = "vmport",
-    .qdev.size     = sizeof(VMPortState),
-    .qdev.no_user  = 1,
-    .qdev.class_init          = vmport_class_initfn,
+static DeviceInfo vmport_info = {
+    .name     = "vmport",
+    .size     = sizeof(VMPortState),
+    .no_user  = 1,
+    .class_init          = vmport_class_initfn,
 };
 
 static void vmport_dev_register(void)
diff --git a/hw/wdt_ib700.c b/hw/wdt_ib700.c
index 3869e91..68965d6 100644
--- a/hw/wdt_ib700.c
+++ b/hw/wdt_ib700.c
@@ -126,12 +126,12 @@ static void wdt_ib700_class_init(ObjectClass *klass, void 
*data)
     ic->init = wdt_ib700_init;
 }
 
-static ISADeviceInfo wdt_ib700_info = {
-    .qdev.name  = "ib700",
-    .qdev.size  = sizeof(IB700State),
-    .qdev.vmsd  = &vmstate_ib700,
-    .qdev.reset = wdt_ib700_reset,
-    .qdev.class_init       = wdt_ib700_class_init,
+static DeviceInfo wdt_ib700_info = {
+    .name  = "ib700",
+    .size  = sizeof(IB700State),
+    .vmsd  = &vmstate_ib700,
+    .reset = wdt_ib700_reset,
+    .class_init       = wdt_ib700_class_init,
 };
 
 static void wdt_ib700_register_devices(void)
-- 
1.7.4.1