X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=801e4147f0a8812a064cbee2de562317442a8bce;hb=c34c7a69079dd6165db965454104f20c7d873c20;hp=464bc79ed8ca8708747b42e02eae1ba46cdb65da;hpb=fc90c3287f85c66e1f6616685b66a8339145c3ee;p=palacios.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index 464bc79..801e414 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -1,6 +1,23 @@
 #include <palacios/vmm_intr.h>
+#include <palacios/vmm.h>
+
 #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;
+}
+
+void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) {
+  info->intr_state.controller = ops;
+  info->intr_state.controller_state = state;
+}
+
+
 int raise_exception(struct guest_info * info, uint_t excp) {
 
   /* We can't stack exceptions, 
@@ -17,9 +34,28 @@ int raise_exception(struct guest_info * info, uint_t excp) {
 }
 
 
+int raise_irq(struct guest_info * info, int irq, int error_code) {
+  // Look up PIC and resend
+  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, error_code);
+    //} 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) {
     return 1;
+  } else if (intr->controller->intr_pending(intr->controller_state)) {
+    return 1;
   }
 
   /* Check [A]PIC */
@@ -31,7 +67,9 @@ 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;
+  }
 
   /* someway to get the [A]PIC intr */
 
@@ -42,7 +80,15 @@ uint_t get_intr_number(struct vm_intr * intr) {
 uint_t get_intr_type(struct vm_intr * intr) {
   if (intr->excp_pending) {
     return EXCEPTION;
+  } else if (intr->controller->intr_pending(intr->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);
+}