X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fi440fx.c;h=9b52eeda52a0d6c0fd2f76a39e051292fce3b981;hb=ec660ce1c5410ef08a7820f7ee064a30b416a523;hp=2408cdd87b235256a0a32b2287fd7c43abbacf2f;hpb=afb2a35b2e15ba0fa932c4e49a3678f958a4502a;p=palacios-OLD.git

diff --git a/palacios/src/devices/i440fx.c b/palacios/src/devices/i440fx.c
index 2408cdd..9b52eed 100644
--- a/palacios/src/devices/i440fx.c
+++ b/palacios/src/devices/i440fx.c
@@ -21,6 +21,8 @@
 #include <palacios/vmm_dev_mgr.h>
 #include <devices/pci.h>
 
+#include <palacios/vmm_io.h>
+
 
 // We Have to setup some sort of PIC interrupt mapping here....
 
@@ -29,12 +31,14 @@ struct i440_state {
 };
 
 
-static int io_read(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int io_read(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    //    struct vm_device * dev = priv_data;
     PrintError("Unhandled read on port %x\n", port);
     return -1;
 }
 
-static int io_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int io_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    //    struct vm_device * dev = priv_data;
     PrintError("Unhandled write on port %x\n", port);
     return -1;
 }
@@ -44,6 +48,18 @@ static int io_write(ushort_t port, void * src, uint_t length, struct vm_device *
 
 
 static int i440_free(struct vm_device * dev) {
+    struct i440_state * state = dev->private_data;
+    int i;
+
+    for (i = 0; i < 4; i++) {
+	v3_unhook_io_port(dev->vm, 0x0cf8 + i);
+	v3_unhook_io_port(dev->vm, 0x0cfc + i);
+    }
+
+    // unregister from PCI
+
+    V3_Free(state);
+
     return 0;
 }
 
@@ -57,12 +73,13 @@ static struct v3_device_ops dev_ops = {
 
 
 
-static int i440_init(struct guest_info * vm, void * cfg_data) {
+static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct pci_device * pci_dev = NULL;
     struct v3_pci_bar bars[6];
     int i;
     struct i440_state * state = NULL;
-    struct vm_device * pci = v3_find_dev(vm, (char *)cfg_data);
+    struct vm_device * pci = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     if (!pci) {
 	PrintError("could not find PCI Device\n");
@@ -73,19 +90,17 @@ static int i440_init(struct guest_info * vm, void * cfg_data) {
 
     state->pci = pci;
 	
-    struct vm_device * dev = v3_allocate_device("i440FX", &dev_ops, state);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", "i440FX");
+	PrintError("Could not attach device %s\n", dev_id);
+	V3_Free(state);
 	return -1;
     }
 
-
     for (i = 0; i < 4; i++) {
-	v3_dev_hook_io(dev, 0x0cf8 + i,
-		       &io_read, &io_write);
-	v3_dev_hook_io(dev, 0x0cfc + i,
-		       &io_read, &io_write);
+	v3_hook_io_port(vm, 0x0cf8 + i, &io_read, &io_write, dev);
+	v3_hook_io_port(vm, 0x0cfc + i, &io_read, &io_write, dev);
     }
 
     for (i = 0; i < 6; i++) {
@@ -97,6 +112,7 @@ static int i440_init(struct guest_info * vm, void * cfg_data) {
 				     NULL, NULL, NULL, dev);
 
     if (!pci_dev) {
+	v3_detach_device(dev);
  	return -1;
     }
 
@@ -111,4 +127,4 @@ static int i440_init(struct guest_info * vm, void * cfg_data) {
     return 0;
 }
 
-device_register("i440FX", i440_init)
+device_register("i440FX", i440_init);