struct redir_tbl_entry redir_tbl[24];
void * apic_dev_data;
+
+ void * router_handle;
+
+ struct v3_vm_info * vm;
};
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, &ipi, ioapic->apic_dev_data) == -1) {
PrintError("Error sending IPI to apic %d\n", ipi.dst);
static int io_apic_free(struct io_apic_state * ioapic) {
- // unregister intr router
+ v3_remove_intr_router(ioapic->vm, ioapic->router_handle);
// unhook memory
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);