Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

[palacios.releases.git] / palacios / src / devices / io_apic.c

diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c
index 757e96e..b0e9584 100644 (file)
--- a/palacios/src/devices/io_apic.c
+++ b/palacios/src/devices/io_apic.c
@@ -307,15 +307,20 @@ static struct intr_router_ops router_ops = {
 
 
 
-static int io_apic_free(struct vm_device * dev) {
-    //  struct guest_info * info = dev->vm;
+static int io_apic_free(struct io_apic_state * ioapic) {
+
+    // unregister intr router
+
+    // unhook memory
+
+    V3_Free(ioapic);
 
     return 0;
 }
 
 
 static struct v3_device_ops dev_ops = {
-    .free = io_apic_free,
+    .free = (int (*)(void *))io_apic_free,
 
 };
 
@@ -332,15 +337,14 @@ static int ioapic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     ioapic->apic_dev_data = apic_dev;
 
-    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ioapic);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, ioapic);
 
-
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
        PrintError("ioapic: Could not attach device %s\n", dev_id);
+       V3_Free(ioapic);
        return -1;
     }
 
-
     v3_register_intr_router(vm, &router_ops, ioapic);
 
     init_ioapic_state(ioapic, vm->num_cores);