commit 6872ef610bad337701e0dcb0ab06558c04a0146f
author Blue Swirl <blauwirbel@gmail.com> Sat Feb 05 14:34:41 2011 +0000
committer Blue Swirl <blauwirbel@gmail.com> Sat Feb 12 08:28:24 2011 +0000
tree a0b80249727f81b681c133f58582c5ee4648271a
parent 7ba7e49e6a7493e1cd0fe07cc67403846d642fc5

vmport: convert to qdev

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

hw/vmport.c

diff --git a/hw/vmport.c b/hw/vmport.c
index 6c9d7c9..4432be0 100644
--- a/hw/vmport.c
+++ b/hw/vmport.c
@@ -26,6 +26,7 @@
 #include "pc.h"
 #include "sysemu.h"
 #include "kvm.h"
+#include "qdev.h"
 
 //#define VMPORT_DEBUG
 
@@ -37,6 +38,7 @@
 
 typedef struct _VMPortState
 {
+    ISADevice dev;
     IOPortReadFunc *func[VMPORT_ENTRIES];
     void *opaque[VMPORT_ENTRIES];
 } VMPortState;
@@ -100,12 +102,28 @@
     return ram_size;
 }
 
-void vmport_init(void)
+static int vmport_initfn(ISADevice *dev)
 {
-    register_ioport_read(0x5658, 1, 4, vmport_ioport_read, &port_state);
-    register_ioport_write(0x5658, 1, 4, vmport_ioport_write, &port_state);
+    VMPortState *s = DO_UPCAST(VMPortState, dev, dev);
 
+    register_ioport_read(0x5658, 1, 4, vmport_ioport_read, &s);
+    register_ioport_write(0x5658, 1, 4, vmport_ioport_write, &s);
+    isa_init_ioport(dev, 0x5658);
     /* Register some generic port commands */
     vmport_register(VMPORT_CMD_GETVERSION, vmport_cmd_get_version, NULL);
     vmport_register(VMPORT_CMD_GETRAMSIZE, vmport_cmd_ram_size, NULL);
+    return 0;
 }
+
+static ISADeviceInfo vmport_info = {
+    .qdev.name     = "vmport",
+    .qdev.size     = sizeof(VMPortState),
+    .qdev.no_user  = 1,
+    .init          = vmport_initfn,
+};
+
+static void vmport_dev_register(void)
+{
+    isa_qdev_register(&vmport_info);
+}
+device_init(vmport_dev_register)