X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=e29285a6fb30aa4c668ac2fc5b23d11f376c6a61;hb=18cc68af5caa15264a853167e9d2d885cb79317a;hp=e3878e2ca48169b0b28f0e0ee3e50d9fe7f6a314;hpb=f737ee43ce5cef6dbebf40940482811bfd3169b8;p=palacios.git diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c index e3878e2..e29285a 100644 --- a/palacios/src/palacios/vmm_intr.c +++ b/palacios/src/palacios/vmm_intr.c @@ -22,6 +22,7 @@ #include #include +#include #ifndef DEBUG_INTERRUPTS #undef PrintDebug @@ -40,9 +41,9 @@ struct intr_controller { void v3_init_interrupt_state(struct guest_info * info) { - info->intr_state.excp_pending = 0; - info->intr_state.excp_num = 0; - info->intr_state.excp_error_code = 0; + + info->intr_state.irq_pending = 0; + info->intr_state.irq_vector = 0; INIT_LIST_HEAD(&(info->intr_state.controller_list)); @@ -143,45 +144,12 @@ int v3_deliver_irq(struct guest_info * info, struct v3_interrupt * intr) { -int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) { - struct v3_intr_state * intr_state = &(info->intr_state); - - if (intr_state->excp_pending == 0) { - intr_state->excp_pending = 1; - intr_state->excp_num = excp; - intr_state->excp_error_code = error_code; - intr_state->excp_error_code_valid = 1; - PrintDebug("[v3_raise_exception_with_error] error code: %x\n", error_code); - } else { - PrintError("exception already pending, currently not implemented\n"); - return -1; - } - - return 0; -} - -int v3_raise_exception(struct guest_info * info, uint_t excp) { - struct v3_intr_state * intr_state = &(info->intr_state); - PrintDebug("[v3_raise_exception]\n"); - if (intr_state->excp_pending == 0) { - intr_state->excp_pending = 1; - intr_state->excp_num = excp; - intr_state->excp_error_code = 0; - intr_state->excp_error_code_valid = 0; - } else { - PrintError("exception already pending, currently not implemented\n"); - return -1; - } - - return 0; -} - int v3_lower_irq(struct guest_info * info, int irq) { struct intr_controller * ctrl = NULL; struct v3_intr_state * intr_state = &(info->intr_state); - PrintDebug("[v3_lower_irq]\n"); + // PrintDebug("[v3_lower_irq]\n"); list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { ctrl->ctrl_ops->lower_intr(ctrl->priv_data, irq); @@ -194,7 +162,7 @@ int v3_raise_irq(struct guest_info * info, int irq) { struct intr_controller * ctrl = NULL; struct v3_intr_state * intr_state = &(info->intr_state); - PrintDebug("[v3_raise_irq (%d)]\n", irq); + // PrintDebug("[v3_raise_irq (%d)]\n", irq); list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { ctrl->ctrl_ops->raise_intr(ctrl->priv_data, irq); @@ -207,65 +175,55 @@ int v3_raise_irq(struct guest_info * info, int irq) { int v3_intr_pending(struct guest_info * info) { struct v3_intr_state * intr_state = &(info->intr_state); - + struct intr_controller * ctrl = NULL; + struct rflags * flags = (struct rflags *)&(info->ctrl_regs.rflags); // PrintDebug("[intr_pending]\n"); - if (intr_state->excp_pending == 1) { - return 1; - } else { - struct intr_controller * ctrl = NULL; + + // Check if the guest has interrupts enabled + if (flags->intr == 0) { + return 0; + } - list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { - if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) { - return 1; - } + list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { + if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) { + return 1; } } + return 0; } uint_t v3_get_intr_number(struct guest_info * info) { struct v3_intr_state * intr_state = &(info->intr_state); + struct intr_controller * ctrl = NULL; - if (intr_state->excp_pending == 1) { - return intr_state->excp_num; - } else { - struct intr_controller * ctrl = NULL; - - list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { - if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data)) { - uint_t intr_num = ctrl->ctrl_ops->get_intr_number(ctrl->priv_data); - - PrintDebug("[get_intr_number] intr_number = %d\n", intr_num); - - return intr_num; - } + list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { + if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data)) { + uint_t intr_num = ctrl->ctrl_ops->get_intr_number(ctrl->priv_data); + + // PrintDebug("[get_intr_number] intr_number = %d\n", intr_num); + + return intr_num; } } - return 0; } intr_type_t v3_get_intr_type(struct guest_info * info) { struct v3_intr_state * intr_state = &(info->intr_state); + struct intr_controller * ctrl = NULL; - if (intr_state->excp_pending) { - PrintDebug("[get_intr_type] Exception\n"); - return EXCEPTION; - } else { - struct intr_controller * ctrl = NULL; - - list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { - if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) { - PrintDebug("[get_intr_type] External_irq\n"); - return EXTERNAL_IRQ; - } + list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { + if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) { + //PrintDebug("[get_intr_type] External_irq\n"); + return EXTERNAL_IRQ; } } - PrintDebug("[get_intr_type] Invalid_Intr\n"); + PrintError("[get_intr_type] Invalid_Intr\n"); return INVALID_INTR; } @@ -277,17 +235,10 @@ intr_type_t v3_get_intr_type(struct guest_info * info) { int v3_injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type) { struct v3_intr_state * intr_state = &(info->intr_state); - if (type == EXCEPTION) { - PrintDebug("[injecting_intr] Exception\n"); - intr_state->excp_pending = 0; - intr_state->excp_num = 0; - intr_state->excp_error_code = 0; - intr_state->excp_error_code_valid = 0; - - } else if (type == EXTERNAL_IRQ) { + if (type == EXTERNAL_IRQ) { struct intr_controller * ctrl = NULL; - PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num); + // PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num); list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { ctrl->ctrl_ops->begin_irq(ctrl->priv_data, intr_num); }