X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvmm_stubs.c;h=20c0c7153e54c3e8e648d48cc64efd2058f366f2;hb=4f7c3b759e3889870c5b5e7d09b3ffcc168e5632;hp=1e6a3a35e7f623b027d97257b9ebbcff7e60a629;hpb=a4b341afa075a6620dd087ee3a8ed850730c05c7;p=palacios.git

diff --git a/palacios/src/geekos/vmm_stubs.c b/palacios/src/geekos/vmm_stubs.c
index 1e6a3a3..20c0c71 100644
--- a/palacios/src/geekos/vmm_stubs.c
+++ b/palacios/src/geekos/vmm_stubs.c
@@ -1,3 +1,6 @@
+/* Northwestern University */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+
 #include <geekos/vmm_stubs.h>
 #include <geekos/serial.h>
 #include <palacios/vm_guest.h>
@@ -75,10 +78,53 @@ void VMM_Free(void * addr) {
   Free(addr);
 }
 
+//
+//
+// This is the interrupt state that the VMM's interrupt handlers need to see
+//
+struct vmm_intr_state {
+  uint_t irq;
+  uint_t error;
+
+  uint_t should_ack;  // Should the vmm ack this interrupt, or will
+                      // the host OS do it?
+
+  // This is the value given when the interrupt is hooked.
+  // This will never be NULL
+  void *opaque;
+};
+
+// This is the function the interface code should call to deliver
+// the interrupt to the vmm for handling
+extern void deliver_interrupt_to_vmm(struct vmm_intr_state *state);
 
 
 struct guest_info * irq_map[256];
 
+void *my_opaque[256];
+
+
+static void translate_intr_handler(struct Interrupt_State *state)
+{
+
+
+  struct vmm_intr_state mystate;
+
+  mystate.irq=state->intNum-32;
+  mystate.error=state->errorCode;
+  mystate.should_ack=0;
+  mystate.opaque=my_opaque[mystate.irq];
+
+  //  PrintBoth("translate_intr_handler: opaque=0x%x\n",mystate.opaque);
+
+  deliver_interrupt_to_vmm(&mystate);
+
+  End_IRQ(state);
+
+}
+
+
+/*
 static void pic_intr_handler(struct Interrupt_State * state) {
   Begin_IRQ(state);
   struct guest_info * info =   irq_map[state->intNum - 32];
@@ -94,8 +140,12 @@ static void pic_intr_handler(struct Interrupt_State * state) {
 
   // End_IRQ(state);
 }
-
-
+*/
+//
+//
+// I really don't know what the heck this is doing... PAD
+//
+/*
 int hook_irq_stub(struct guest_info * info, int irq) {
   if (irq_map[irq]) {
     return -1;
@@ -105,7 +155,7 @@ int hook_irq_stub(struct guest_info * info, int irq) {
   irq_map[irq] = info;
   volatile void *foo = pic_intr_handler;
 
-  /* This is disabled for the time being */
+  // This is disabled for the time being 
   foo = 0;
 
 
@@ -114,6 +164,23 @@ int hook_irq_stub(struct guest_info * info, int irq) {
   Enable_IRQ(irq);
   return 0;
 }
+*/
+
+int geekos_hook_interrupt_new(uint_t irq, void * opaque)
+{
+  if (my_opaque[irq]) { 
+    PrintBoth("Attempt to hook interrupt that is already hooked\n");
+    return -1;
+  } else {
+    PrintBoth("Hooked interrupt 0x%x with opaque 0x%x\n",irq,opaque);
+    my_opaque[irq]=opaque;
+  }
+
+  Disable_IRQ(irq);
+  Install_IRQ(irq,translate_intr_handler);
+  Enable_IRQ(irq);
+  return 0;
+}
 
 
 int ack_irq(int irq) {