X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=ca42f017a99aefbd8e2424259aa65fbaff1bb3b0;hb=d8e510143aa094363d5bf21d6cb7e31a29a6e826;hp=e1dbfd885f3f83fd0b18596eb0aee7aed23c316c;hpb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index e1dbfd8..ca42f01 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -9,7 +9,7 @@ void init_interrupt_state(struct guest_info * info) {
   info->intr_state.excp_num = 0;
   info->intr_state.excp_error_code = 0;
 
-  info->vm_ops.raise_irq = &raise_irq;
+  info->vm_ops.raise_irq = &v3_raise_irq;
 }
 
 void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) {
@@ -34,12 +34,14 @@ 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;
     intr_state->excp_error_code_valid = 1;
+    PrintDebug("Raising exception with error code: %x\n", error_code);
   } else {
+    PrintDebug("exception already pending, currently not implemented\n");
     return -1;
   }
 
@@ -55,6 +57,7 @@ int raise_exception(struct guest_info * info, uint_t excp) {
     intr_state->excp_error_code = 0;
     intr_state->excp_error_code_valid = 0;
   } else {
+    PrintDebug("exception already pending, currently not implemented\n");
     return -1;
   }
 
@@ -62,7 +65,7 @@ int raise_exception(struct guest_info * info, uint_t excp) {
 }
 
 
-int raise_irq(struct guest_info * info, int irq) {
+int v3_raise_irq(struct guest_info * info, int irq) {
   // Look up PIC and resend
   V3_ASSERT(info);
   V3_ASSERT(info->intr_state.controller);
@@ -91,9 +94,9 @@ int raise_irq(struct guest_info * info, int irq) {
 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 +109,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);