X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fi440fx.c;h=510d08ac04dc0d388df2886c4a327405d00c56d2;hb=2282a040e60b24d3fb7c48bb197c5bff6636df67;hp=4f7b48f67bea2e5599c24a6e8eacd95d3631a8c4;hpb=d0886c953a9e5969ee0f54f11bb146bfe888bfe3;p=palacios.git

diff --git a/palacios/src/devices/i440fx.c b/palacios/src/devices/i440fx.c
index 4f7b48f..510d08a 100644
--- a/palacios/src/devices/i440fx.c
+++ b/palacios/src/devices/i440fx.c
@@ -18,47 +18,103 @@
  */
 
 #include <palacios/vmm.h>
-#include <devices/i440fx.h>
+#include <palacios/vm_guest.h>
+#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....
+
 struct i440_state {
     struct vm_device * pci;
 };
 
 
-static int io_read(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
-    PrintError("Unhandled read on port %x\n", port);
+static int io_read(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    PrintError(core->vm_info, core, "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) {
-    PrintError("Unhandled write on port %x\n", port);
+static int io_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    PrintError(core->vm_info, core, "Unhandled write on port %x\n", port);
     return -1;
 }
 
 
 
-static int i440_init(struct vm_device * dev) {
-    struct i440_state * state = (struct i440_state *)(dev->private_data);
+
+
+static int i440_free(struct i440_state * state) {
+
+    // unregister from PCI
+
+    V3_Free(state);
+
+    return 0;
+}
+
+static struct v3_device_ops dev_ops = {
+    .free = (int (*)(void *))i440_free,
+
+};
+
+
+
+
+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, v3_cfg_val(cfg, "bus"));
+    char * dev_id = v3_cfg_val(cfg, "ID");
+    int ret = 0;
+
+    if (!pci) {
+	PrintError(vm, VCORE_NONE, "could not find PCI Device\n");
+	return -1;
+    }
+
+    state = (struct i440_state *)V3_Malloc(sizeof(struct i440_state));
+
+    if (!state) {
+	PrintError(vm, VCORE_NONE, "Cannot allocate state\n");
+	return -1;
+    }
+
+    state->pci = pci;
+	
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
+
+    if (dev == NULL) {
+	PrintError(vm, VCORE_NONE, "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(vm, VCORE_NONE, "Error hooking i440FX io ports\n");
+	//v3_remove_device(dev);
+	//return -1;
     }
 
     for (i = 0; i < 6; i++) {
 	bars[i].type = PCI_BAR_NONE;
     }    
 
-    pci_dev = v3_pci_register_device(state->pci, PCI_STD_DEVICE, 0, 0, 0, "i440FX", bars,
-				     NULL, NULL, NULL, dev);
+    pci_dev = v3_pci_register_device(state->pci, PCI_STD_DEVICE, 
+				     0, 0, 0, "i440FX", bars,
+				     NULL, NULL, NULL, NULL, state);
 
     if (!pci_dev) {
+	v3_remove_device(dev);
  	return -1;
     }
 
@@ -66,36 +122,11 @@ static int i440_init(struct vm_device * dev) {
     pci_dev->config_header.device_id = 0x1237;
     pci_dev->config_header.revision = 0x02;
     pci_dev->config_header.subclass = 0x00; //  SubClass: host2pci
-    pci_dev->config_header.class = 0x06;    // Class: PCI bridge
+    pci_dev->config_header.class = PCI_CLASS_BRIDGE;    // Class: PCI bridge
 
     pci_dev->config_space[0x72] = 0x02; // SMRAM (?)
 
     return 0;
 }
 
-
-static int i440_deinit(struct vm_device * dev) {
-    return 0;
-}
-
-static struct vm_device_ops dev_ops = {
-    .init = i440_init, 
-    .deinit = i440_deinit,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
-};
-
-
-
-struct vm_device * v3_create_i440fx(struct vm_device * pci) {
-    struct i440_state * state = NULL;
-
-    state = (struct i440_state *)V3_Malloc(sizeof(struct i440_state));
-
-    state->pci = pci;
-	
-    struct vm_device * i440_dev = v3_create_device("i440FX", &dev_ops, state);
-
-    return i440_dev;
-}
+device_register("i440FX", i440_init);