void * v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * priv_data) {
struct intr_controller * ctrlr = (struct intr_controller *)V3_Malloc(sizeof(struct intr_controller));
+ if (!ctrlr) {
+ PrintError("Cannot allocate in registering an interrupt controller\n");
+ return NULL;
+ }
+
ctrlr->priv_data = priv_data;
ctrlr->ctrl_ops = ops;
void * v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops * ops, void * priv_data) {
struct intr_router * router = (struct intr_router *)V3_Malloc(sizeof(struct intr_router));
+ if (!router) {
+ PrintError("Cannot allocate in registering an interrupt router\n");
+ return NULL;
+ }
+
router->priv_data = priv_data;
router->router_ops = ops;
{
struct v3_irq_hook * hook = (struct v3_irq_hook *)V3_Malloc(sizeof(struct v3_irq_hook));
+
if (hook == NULL) {
+ PrintError("Cannot allocate when hooking an irq\n");
return -1;
}
if (get_irq_hook(vm, irq) != NULL) {
PrintError("IRQ %d already hooked\n", irq);
+ V3_Free(hook);
return -1;
}
if (V3_Hook_Interrupt(vm, irq)) {
PrintError("hook_irq: failed to hook irq %d\n", irq);
+ vm->intr_routers.hooks[irq] = NULL;
+ V3_Free(hook);
return -1;
} else {
PrintDebug("hook_irq: hooked irq %d\n", irq);
int v3_lower_irq(struct v3_vm_info * vm, int irq) {
+ struct v3_irq irq_state;
+
+ irq_state.irq = irq;
+ irq_state.ack = NULL;
+ irq_state.private_data = NULL;
+
+ return v3_lower_acked_irq(vm, irq_state);
+}
+
+int v3_raise_irq(struct v3_vm_info * vm, int irq) {
+ struct v3_irq irq_state;
+
+ irq_state.irq = irq;
+ irq_state.ack = NULL;
+ irq_state.private_data = NULL;
+
+ return v3_raise_acked_irq(vm, irq_state);
+}
+
+
+int v3_raise_acked_irq(struct v3_vm_info * vm, struct v3_irq irq) {
struct intr_router * router = NULL;
struct v3_intr_routers * routers = &(vm->intr_routers);
- // PrintDebug("[v3_lower_irq]\n");
+ // PrintDebug("[v3_raise_irq (%d)]\n", irq);
addr_t irq_state = v3_lock_irqsave(routers->irq_lock);
list_for_each_entry(router, &(routers->router_list), router_node) {
- router->router_ops->lower_intr(vm, router->priv_data, irq);
+ router->router_ops->raise_intr(vm, router->priv_data, &irq);
}
-
+
v3_unlock_irqrestore(routers->irq_lock, irq_state);
return 0;
}
-int v3_raise_irq(struct v3_vm_info * vm, int irq) {
+
+int v3_lower_acked_irq(struct v3_vm_info * vm, struct v3_irq irq) {
struct intr_router * router = NULL;
struct v3_intr_routers * routers = &(vm->intr_routers);
- // PrintDebug("[v3_raise_irq (%d)]\n", irq);
+ // PrintDebug("[v3_lower_irq]\n");
addr_t irq_state = v3_lock_irqsave(routers->irq_lock);
list_for_each_entry(router, &(routers->router_list), router_node) {
- router->router_ops->raise_intr(vm, router->priv_data, irq);
+ router->router_ops->lower_intr(vm, router->priv_data, &irq);
}
-
+
v3_unlock_irqrestore(routers->irq_lock, irq_state);
return 0;
-}
+}
// PrintDebug("[intr_pending]\n");
addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);
- // VIRQs have priority
+ // External IRQs have lowest priority
+ list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+ if (ctrl->ctrl_ops->intr_pending(info, ctrl->priv_data) == 1) {
+ ret = V3_EXTERNAL_IRQ;
+ break;
+ }
+ }
+
+ // VIRQs have 2nd priority
for (i = 0; i < MAX_IRQ / 8; i++) {
if (intr_state->virq_map[i] != 0) {
ret = V3_VIRTUAL_IRQ;
}
}
- if (ret == V3_INVALID_INTR) {
- list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
- if (ctrl->ctrl_ops->intr_pending(info, ctrl->priv_data) == 1) {
- ret = V3_EXTERNAL_IRQ;
- break;
- }
- }
- }
-
- /* for swintr injection */
+ /* SWINTRs have highest */
if (intr_state->swintr_posted == 1) {
ret = V3_SOFTWARE_INTR;
}