struct redir_tbl_entry redir_tbl[24];
- struct vm_device * apic_dev;
+ void * apic_dev_data;
+
+ void * router_handle;
+
+ struct v3_vm_info * vm;
};
static int ioapic_read(struct guest_info * core, addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
- struct vm_device * dev = (struct vm_device *)priv_data;
- struct io_apic_state * ioapic = (struct io_apic_state *)(dev->private_data);
+ struct io_apic_state * ioapic = (struct io_apic_state *)(priv_data);
uint32_t reg_tgt = guest_addr - ioapic->base_addr;
uint32_t * op_val = (uint32_t *)dst;
static int ioapic_write(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data) {
- struct vm_device * dev = (struct vm_device *)priv_data;
- struct io_apic_state * ioapic = (struct io_apic_state *)(dev->private_data);
+ struct io_apic_state * ioapic = (struct io_apic_state *)(priv_data);
uint32_t reg_tgt = guest_addr - ioapic->base_addr;
uint32_t op_val = *(uint32_t *)src;
static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq) {
- struct vm_device * dev = (struct vm_device *)private_data;
- struct io_apic_state * ioapic = (struct io_apic_state *)(dev->private_data);
+ struct io_apic_state * ioapic = (struct io_apic_state *)(private_data);
struct redir_tbl_entry * irq_entry = NULL;
if (irq > 24) {
if (irq_entry->mask == 0) {
struct v3_gen_ipi ipi;
- PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n",
+ PrintDebug("ioapic %u: IOAPIC Signaling APIC to raise INTR %d\n",
ioapic->ioapic_id.id, irq_entry->vec);
ipi.dst = irq_entry->dst_field;
ipi.dst_shorthand = 0;
+
+ PrintDebug("ioapic %u: IPI: vector 0x%x, mode 0x%x, logical 0x%x, trigger 0x%x, dst 0x%x, shorthand 0x%x\n",
+ ioapic->ioapic_id.id, ipi.vector, ipi.mode, ipi.logical, ipi.trigger_mode, ipi.dst, ipi.dst_shorthand);
// Need to add destination argument here...
- if (v3_apic_send_ipi(vm, ioapic->apic_dev, &ipi) == -1) {
+ if (v3_apic_send_ipi(vm, &ipi, ioapic->apic_dev_data) == -1) {
PrintError("Error sending IPI to apic %d\n", ipi.dst);
return -1;
}
-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,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
+ .free = (int (*)(void *))io_apic_free,
+
};
struct io_apic_state * ioapic = (struct io_apic_state *)V3_Malloc(sizeof(struct io_apic_state));
- ioapic->apic_dev = apic_dev;
+ 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;
}
+ ioapic->router_handle = v3_register_intr_router(vm, &router_ops, ioapic);
+ ioapic->vm = vm;
- v3_register_intr_router(vm, &router_ops, dev);
-
- init_ioapic_state(ioapic,vm->num_cores);
+ init_ioapic_state(ioapic, vm->num_cores);
v3_hook_full_mem(vm, V3_MEM_CORE_ANY, ioapic->base_addr, ioapic->base_addr + PAGE_SIZE_4KB,
- ioapic_read, ioapic_write, dev);
+ ioapic_read, ioapic_write, ioapic);
return 0;
}