X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fi440fx.c;h=800633f10cb117d95891c8cda6a02deba7dfc12a;hb=ffd6d915b585a4a17a2d5b081313f0968885a105;hp=618a8ca6df22487f21efdfb39fafd7b0896cba34;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/devices/i440fx.c b/palacios/src/devices/i440fx.c
index 618a8ca..800633f 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,12 @@ struct i440_state {
 };
 
 
-static int io_read(struct guest_info * core, 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) {
     PrintError("Unhandled read on port %x\n", port);
     return -1;
 }
 
-static int io_write(struct guest_info * core, 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) {
     PrintError("Unhandled write on port %x\n", port);
     return -1;
 }
@@ -43,15 +45,18 @@ static int io_write(struct guest_info * core, ushort_t port, void * src, uint_t
 
 
 
-static int i440_free(struct vm_device * dev) {
+static int i440_free(struct i440_state * state) {
+
+    // unregister from PCI
+
+    V3_Free(state);
+
     return 0;
 }
 
 static struct v3_device_ops dev_ops = {
-    .free = i440_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))i440_free,
+
 };
 
 
@@ -63,7 +68,8 @@ static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     int i;
     struct i440_state * state = NULL;
     struct vm_device * pci = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
+    int ret = 0;
 
     if (!pci) {
 	PrintError("could not find PCI Device\n");
@@ -72,22 +78,33 @@ static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     state = (struct i440_state *)V3_Malloc(sizeof(struct i440_state));
 
+    if (!state) {
+	PrintError("Cannot allocate state\n");
+	return -1;
+    }
+
     state->pci = pci;
 	
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, state);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
 
-    if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", name);
+    if (dev == NULL) {
+	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);
+	ret |= v3_dev_hook_io(dev, 0x0cf8 + i, &io_read, &io_write);
+	ret |= v3_dev_hook_io(dev, 0x0cfc + i, &io_read, &io_write);
+    }
+
+    /*
+    if (ret != 0) {
+	PrintError("Error hooking i440FX io ports\n");
+	v3_remove_device(dev);
+	return -1;
     }
+    */
 
     for (i = 0; i < 6; i++) {
 	bars[i].type = PCI_BAR_NONE;
@@ -95,9 +112,10 @@ static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     pci_dev = v3_pci_register_device(state->pci, PCI_STD_DEVICE, 
 				     0, 0, 0, "i440FX", bars,
-				     NULL, NULL, NULL, dev);
+				     NULL, NULL, NULL, NULL, state);
 
     if (!pci_dev) {
+	v3_remove_device(dev);
  	return -1;
     }
 
@@ -112,4 +130,4 @@ static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     return 0;
 }
 
-device_register("i440FX", i440_init)
+device_register("i440FX", i440_init);