moved further along in the boot process....

[palacios.git] / palacios / src / palacios / vmm_intr.c

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index f0f177e..9582232 100644 (file)
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -34,7 +34,7 @@ int hook_irq(struct guest_info * info, int irq) {
 int raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) {
   struct vm_intr * intr_state = &(info->intr_state);
 
-  if (intr_state->excp_pending) {
+  if (intr_state->excp_pending == 0) {
     intr_state->excp_pending = 1;
     intr_state->excp_num = excp;
     intr_state->excp_error_code = error_code;
@@ -62,7 +62,7 @@ int raise_exception(struct guest_info * info, uint_t excp) {
 }
 
 
-int raise_irq(struct guest_info * info, int irq, int error_code) {
+int raise_irq(struct guest_info * info, int irq) {
   // Look up PIC and resend
   V3_ASSERT(info);
   V3_ASSERT(info->intr_state.controller);
@@ -70,7 +70,7 @@ int raise_irq(struct guest_info * info, int irq, int error_code) {
 
   //  if ((info->intr_state.controller) && 
   //  (info->intr_state.controller->raise_intr)) {
-    info->intr_state.controller->raise_intr(info->intr_state.controller_state, irq, error_code);
+    info->intr_state.controller->raise_intr(info->intr_state.controller_state, irq);
     //} else {
     // PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n");
     // return -1;
@@ -91,9 +91,9 @@ int raise_irq(struct guest_info * info, int irq, int error_code) {
 int intr_pending(struct guest_info * info) {
   struct vm_intr * intr_state = &(info->intr_state);
 
-  if (intr_state->excp_pending) {
+  if (intr_state->excp_pending == 1) {
     return 1;
-  } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
+  } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) {
     return 1;
   }
 
@@ -106,7 +106,7 @@ int intr_pending(struct guest_info * info) {
 uint_t get_intr_number(struct guest_info * info) {
   struct vm_intr * intr_state = &(info->intr_state);
 
-  if (intr_state->excp_pending) {
+  if (intr_state->excp_pending == 1) {
     return intr_state->excp_num;
   } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
     return intr_state->controller->get_intr_number(intr_state->controller_state);