X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=fea0959aaa4e16a6f98c9b9ff3cf36a4e161628a;hb=refs%2Ftags%2Fboots-puppy-iso-to-command-prompt;hp=dd36143119a009fb5d5a111d483946bbf41a9106;hpb=4b013fe3750a387fc034352a7e4379f025dad7c2;p=palacios.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index dd36143..fea0959 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -4,12 +4,13 @@
 #include <palacios/vm_guest.h>
 
 
+
 void 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->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 +19,120 @@ void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, v
 }
 
 
+
+// This structure is used to dispatch
+// interrupts delivered to vmm via deliver interrupt to vmm 
+// it is what we put into the opaque field given to 
+// the host os when we install the handler
+struct vmm_intr_decode { 
+  void              (*handler)(struct vmm_intr_state *state);
+  // This opaque is user supplied by the caller
+  // of hook_irq_new
+  void              *opaque;
+};
+
+int hook_irq_new(uint_t irq,
+		 void (*handler)(struct vmm_intr_state *state),
+		 void  *opaque)
+{
+  extern struct vmm_os_hooks * os_hooks;
+
+  struct vmm_intr_decode *d = V3_Malloc(sizeof(struct vmm_intr_decode));
+
+  if (!d) { return -1; }
+
+  d->handler = handler;
+  d->opaque = opaque;
+  
+  if (os_hooks->hook_interrupt_new(irq,d)) { 
+    PrintDebug("hook_irq_new: failed to hook irq 0x%x to decode 0x%x\n", irq,d);
+    return -1;
+  } else {
+    PrintDebug("hook_irq_new: hooked irq 0x%x to decode 0x%x\n", irq,d);
+    return 0;
+  }
+}
+
+
+void deliver_interrupt_to_vmm(struct vmm_intr_state *state)
+{
+
+  PrintDebug("deliver_interrupt_to_vmm: state=0x%x\n",state);
+
+  struct vmm_intr_decode *d = (struct vmm_intr_decode *)(state->opaque);
+  
+  void *temp = state->opaque;
+  state->opaque = d->opaque;
+
+  d->handler(state);
+  
+  state->opaque=temp;
+}
+
+
+void guest_injection_irq_handler(struct vmm_intr_state *state)
+{
+  PrintDebug("guest_irq_injection: state=0x%x\n",state);
+
+  struct guest_info *guest = (struct guest_info *)(state->opaque);
+
+  PrintDebug("guest_irq_injection: injecting irq 0x%x into guest 0x%x\n",state->irq,guest);
+  guest->vm_ops.raise_irq(guest,state->irq);
+}
+
+
+int hook_irq_for_guest_injection(struct guest_info *info, int irq)
+{
+
+  int rc = hook_irq_new(irq,
+			guest_injection_irq_handler,
+			info);
+
+  if (rc) { 
+    PrintDebug("guest_irq_injection: failed to hook irq 0x%x for guest 0x%x\n", irq,info);
+    return -1;
+  } else {
+    PrintDebug("guest_irq_injection: hooked irq 0x%x for guest 0x%x\n", irq,info);
+    return 0;
+  }
+}
+
+
+
+
+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,7 +140,7 @@ 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
   V3_ASSERT(info);
   V3_ASSERT(info->intr_state.controller);
@@ -42,7 +148,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;
@@ -51,10 +157,13 @@ int raise_irq(struct guest_info * info, int irq, int error_code) {
 }
 
 
-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;
   }
 
@@ -64,11 +173,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);
+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 */
@@ -77,18 +188,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;
 }