X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=7dc3c3bdb989e59dfc9f953a6b0ec44565bae646;hb=bc2c46a12649344d973e2201271c05390ce924bf;hp=9582232fa07152d3aedd6b475e5f25048451dc5e;hpb=684409c4ad29c0f06167bebf2bb51e21374a6840;p=palacios.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index 9582232..7dc3c3b 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -3,13 +3,17 @@
 
 #include <palacios/vm_guest.h>
 
+#ifndef DEBUG_INTERRUPTS
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
 
 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) {
@@ -19,19 +23,85 @@ 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 v3_hook_irq(uint_t irq,
+	     void (*handler)(struct vmm_intr_state *state),
+	     void  *opaque)
+{
+  struct vmm_intr_decode *d = (struct vmm_intr_decode *)V3_Malloc(sizeof(struct vmm_intr_decode));
 
+  if (!d) { return -1; }
 
+  d->handler = handler;
+  d->opaque = opaque;
+  
+  if (V3_Hook_Interrupt(irq,d)) { 
+    PrintError("hook_irq: failed to hook irq 0x%x to decode 0x%x\n", irq,d);
+    return -1;
+  } else {
+    PrintDebug("hook_irq: hooked irq 0x%x to decode 0x%x\n", irq,d);
+    return 0;
+  }
+}
 
 
+void deliver_interrupt_to_vmm(struct vmm_intr_state *state)
+{
 
-int hook_irq(struct guest_info * info, int irq) {
-  extern struct vmm_os_hooks * os_hooks;
+  PrintDebug("deliver_interrupt_to_vmm: state=0x%x\n",state);
 
-  return os_hooks->hook_interrupt(info, irq);
+  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;
 }
 
-int raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) {
+
+static 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 v3_hook_irq_for_guest_injection(struct guest_info *info, int irq)
+{
+
+  int rc = v3_hook_irq(irq,
+		       guest_injection_irq_handler,
+		       info);
+
+  if (rc) { 
+    PrintError("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 v3_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) {
@@ -39,14 +109,16 @@ int raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t err
     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 {
+    PrintError("exception already pending, currently not implemented\n");
     return -1;
   }
 
   return 0;
 }
 
-int raise_exception(struct guest_info * info, uint_t excp) {
+int v3_raise_exception(struct guest_info * info, uint_t excp) {
   struct vm_intr * intr_state = &(info->intr_state);
 
   if (intr_state->excp_pending == 0) {
@@ -55,6 +127,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 {
+    PrintError("exception already pending, currently not implemented\n");
     return -1;
   }
 
@@ -62,7 +135,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);
@@ -80,14 +153,6 @@ int raise_irq(struct guest_info * info, int irq) {
 
 
 
-
-
-
-
-
-
-
-
 int intr_pending(struct guest_info * info) {
   struct vm_intr * intr_state = &(info->intr_state);