X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=ca42f017a99aefbd8e2424259aa65fbaff1bb3b0;hb=fa7a42a55338e5fa49ec760b367225ca752df4fd;hp=1e59299634051783ef15395680030765d1264586;hpb=28b1d0ae6db40cb3e1f5a9b3596b625d2f2af0e4;p=palacios.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index 1e59299..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) {
@@ -18,15 +18,46 @@ void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, v
 }
 
 
+
+
+
+
+
+
+
+int hook_irq(struct guest_info * info, int irq) {
+  extern struct vmm_os_hooks * os_hooks;
+
+  return os_hooks->hook_interrupt(info, 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 == 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;
+  }
+
+  return 0;
+}
+
 int raise_exception(struct guest_info * info, uint_t excp) {
+  struct vm_intr * intr_state = &(info->intr_state);
 
-  /* We can't stack exceptions, 
-     but do we need to have some sort of priority?
-  */
-  if (info->intr_state.excp_pending) {
-    info->intr_state.excp_pending = 1;
-    info->intr_state.excp_num = excp;
+  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 {
+    PrintDebug("exception already pending, currently not implemented\n");
     return -1;
   }
 
@@ -34,18 +65,38 @@ int raise_exception(struct guest_info * info, uint_t excp) {
 }
 
 
-int raise_irq(struct guest_info * info, int irq, int error_code) {
+int v3_raise_irq(struct guest_info * info, int irq) {
   // Look up PIC and resend
-  info->intr_state.controller->raise_intr(info->intr_state.controller_state, irq, error_code);
-
+  V3_ASSERT(info);
+  V3_ASSERT(info->intr_state.controller);
+  V3_ASSERT(info->intr_state.controller->raise_intr);
+
+  //  if ((info->intr_state.controller) && 
+  //  (info->intr_state.controller->raise_intr)) {
+    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;
+    //}
   return 0;
 }
 
 
-int intr_pending(struct vm_intr * intr) {
-  if (intr->excp_pending) {
+
+
+
+
+
+
+
+
+
+int intr_pending(struct guest_info * info) {
+  struct vm_intr * intr_state = &(info->intr_state);
+
+  if (intr_state->excp_pending == 1) {
     return 1;
-  } else if (intr->controller->intr_pending(intr->controller_state)) {
+  } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) {
     return 1;
   }
 
@@ -55,11 +106,13 @@ int intr_pending(struct vm_intr * intr) {
 }
 
 
-uint_t get_intr_number(struct vm_intr * intr) {
-  if (intr->excp_pending) {
-    return intr->excp_num;
-  } else if (intr->controller->intr_pending(intr->controller_state)) {
-    return intr->controller->get_intr_number(intr->controller_state) + 32;
+uint_t get_intr_number(struct guest_info * info) {
+  struct vm_intr * intr_state = &(info->intr_state);
+
+  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);
   }
 
   /* someway to get the [A]PIC intr */
@@ -68,18 +121,36 @@ uint_t get_intr_number(struct vm_intr * intr) {
 }
 
 
-uint_t get_intr_type(struct vm_intr * intr) {
-  if (intr->excp_pending) {
+intr_type_t get_intr_type(struct guest_info * info) {
+ struct vm_intr * intr_state = &(info->intr_state);
+
+  if (intr_state->excp_pending) {
     return EXCEPTION;
-  } else if (intr->controller->intr_pending(intr->controller_state)) {
+  } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
     return EXTERNAL_IRQ;
   }
 
   return INVALID_INTR;
 }
 
-int hook_irq(struct guest_info * info, int irq) {
-  extern struct vmm_os_hooks * os_hooks;
 
-  return os_hooks->hook_interrupt(info, irq);
+
+
+
+
+int injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type) {
+  struct vm_intr * intr_state = &(info->intr_state);
+
+  if (type == EXCEPTION) {
+
+    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) {
+    return intr_state->controller->begin_irq(intr_state->controller_state, intr_num);
+  }
+
+  return 0;
 }