X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8259a.c;h=0d5e5ffdf09c62f72fff889981301b38cde056d7;hb=fe9b69407ae9ac7aeb6a9d1500c89d48953864ac;hp=66787d3923e6b22cde2ab3585b1cefb4266751a8;hpb=a0d3be5212e7a5053ba213ce7bd26c7124cf01e3;p=palacios.git

diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c
index 66787d3..0d5e5ff 100644
--- a/palacios/src/devices/8259a.c
+++ b/palacios/src/devices/8259a.c
@@ -23,6 +23,7 @@
 #include <palacios/vmm_types.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_dev_mgr.h>
+#include <palacios/vm_guest.h>
 
 #ifndef CONFIG_DEBUG_PIC
 #undef PrintDebug
@@ -155,6 +156,12 @@ struct pic_internal {
 
     pic_state_t master_state;
     pic_state_t slave_state;
+
+    struct guest_info * core;
+
+
+    void * router_handle;
+    void * controller_handle;
 };
 
 
@@ -209,7 +216,9 @@ static int pic_raise_intr(struct v3_vm_info * vm, void * private_data, int irq)
 	return -1;
     }
 
+#ifdef CONFIG_MULTITHREAD_OS
     v3_interrupt_cpu(vm, 0, 0);
+#endif
 
     return 0;
 }
@@ -718,56 +727,51 @@ static int write_elcr_port(struct guest_info * core, ushort_t port, void * src,
 
 
 
+static int pic_free(struct pic_internal * state) {
+    struct guest_info * core = state->core;
 
+    v3_remove_intr_controller(core, state->controller_handle);
+    v3_remove_intr_router(core->vm_info, state->router_handle);
 
-
-static int pic_free(struct vm_device * dev) {
-    v3_dev_unhook_io(dev, MASTER_PORT1);
-    v3_dev_unhook_io(dev, MASTER_PORT2);
-    v3_dev_unhook_io(dev, SLAVE_PORT1);
-    v3_dev_unhook_io(dev, SLAVE_PORT2);
-
+    V3_Free(state);
     return 0;
 }
 
 
-
-
-
-
-
 static struct v3_device_ops dev_ops = {
-    .free = pic_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))pic_free,
+
 };
 
 
 
-#include <palacios/vm_guest.h>
+
 
 static int pic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct pic_internal * state = NULL;
-    state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal));
     char * dev_id = v3_cfg_val(cfg, "ID");
+    int ret = 0;
 
     // PIC is only usable in non-multicore environments
     // just hardcode the core context
     struct guest_info * core = &(vm->cores[0]);
+	
+    state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal));
 
     V3_ASSERT(state != NULL);
 
-    struct vm_device * dev = v3_allocate_device(dev_id, &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", dev_id);
+    if (dev == NULL) {
+	PrintError("Could not add device %s\n", dev_id);
+	V3_Free(state);
 	return -1;
     }
 
+    state->core = core;
 
-    v3_register_intr_controller(core, &intr_ops, state);
-    v3_register_intr_router(vm, &router_ops, state);
+    state->controller_handle = v3_register_intr_controller(core, &intr_ops, state);
+    state->router_handle = v3_register_intr_router(vm, &router_ops, state);
 
     state->master_irr = 0;
     state->master_isr = 0;
@@ -797,14 +801,20 @@ static int pic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     state->slave_state = ICW1;
 
 
-    v3_dev_hook_io(dev, MASTER_PORT1, &read_master_port1, &write_master_port1);
-    v3_dev_hook_io(dev, MASTER_PORT2, &read_master_port2, &write_master_port2);
-    v3_dev_hook_io(dev, SLAVE_PORT1, &read_slave_port1, &write_slave_port1);
-    v3_dev_hook_io(dev, SLAVE_PORT2, &read_slave_port2, &write_slave_port2);
+    ret |= v3_dev_hook_io(dev, MASTER_PORT1, &read_master_port1, &write_master_port1);
+    ret |= v3_dev_hook_io(dev, MASTER_PORT2, &read_master_port2, &write_master_port2);
+    ret |= v3_dev_hook_io(dev, SLAVE_PORT1, &read_slave_port1, &write_slave_port1);
+    ret |= v3_dev_hook_io(dev, SLAVE_PORT2, &read_slave_port2, &write_slave_port2);
+
 
+    ret |= v3_dev_hook_io(dev, ELCR1_PORT, &read_elcr_port, &write_elcr_port);
+    ret |= v3_dev_hook_io(dev, ELCR2_PORT, &read_elcr_port, &write_elcr_port);
 
-    v3_dev_hook_io(dev, ELCR1_PORT, &read_elcr_port, &write_elcr_port);
-    v3_dev_hook_io(dev, ELCR2_PORT, &read_elcr_port, &write_elcr_port);
+    if (ret != 0) {
+	PrintError("Error hooking io ports\n");
+	v3_remove_device(dev);
+	return -1;
+    }
 
     return 0;
 }