add interrupt deinitialization to devices

[palacios-OLD.git] / palacios / src / devices / apic.c

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 8e07132..e7d0177 100644 (file)
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -207,6 +207,8 @@ struct apic_state {
 
     struct guest_info * core;
 
+    void * controller_handle;
+
     struct v3_timer * timer;
 
     uint32_t eoi;
@@ -1462,16 +1464,17 @@ static struct v3_timer_ops timer_ops = {
 
 
 
-static int apic_free(struct vm_device * dev) {
-    struct apic_dev_state * apic_dev = (struct apic_dev_state *)dev->private_data;
+static int apic_free(struct apic_dev_state * apic_dev) {
     int i = 0;
+    struct v3_vm_info * vm = NULL;
 
-    for (i = 0; i < dev->vm->num_cores; i++) {
+    for (i = 0; i < apic_dev->num_apics; i++) {
        struct apic_state * apic = &(apic_dev->apics[i]);
-       struct guest_info * core = &(dev->vm->cores[i]);
+       struct guest_info * core = apic->core;
        
+       vm = core->vm_info;
 
-       // unregister intr controller
+       v3_remove_intr_controller(core, apic->controller_handle);
 
        if (apic->timer) {
            v3_remove_timer(core, apic->timer);
@@ -1481,7 +1484,7 @@ static int apic_free(struct vm_device * dev) {
 
     }
 
-    v3_unhook_msr(dev->vm, BASE_ADDR_MSR);
+    v3_unhook_msr(vm, BASE_ADDR_MSR);
 
     V3_Free(apic_dev);
     return 0;
@@ -1489,7 +1492,7 @@ static int apic_free(struct vm_device * dev) {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = apic_free,
+    .free = (int (*)(void *))apic_free,
 };
 
 
@@ -1525,7 +1528,7 @@ static int apic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
        init_apic_state(apic, i);
 
-       v3_register_intr_controller(core, &intr_ops, apic_dev);
+       apic->controller_handle = v3_register_intr_controller(core, &intr_ops, apic_dev);
 
        apic->timer = v3_add_timer(core, &timer_ops, apic_dev);