struct redir_tbl_entry redir_tbl[24];
void * apic_dev_data;
+
+ void * router_handle;
+
+ struct v3_vm_info * vm;
};
-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) {
+
+ v3_remove_intr_router(ioapic->vm, ioapic->router_handle);
+
+ // unhook memory
+
+ V3_Free(ioapic);
return 0;
}
static struct v3_device_ops dev_ops = {
- .free = io_apic_free,
+ .free = (int (*)(void *))io_apic_free,
};
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);
+ ioapic->router_handle = v3_register_intr_router(vm, &router_ops, ioapic);
+ ioapic->vm = vm;
init_ioapic_state(ioapic, vm->num_cores);