*** empty log message ***

[palacios.git] / palacios / src / geekos / vmm_stubs.c

diff --git a/palacios/src/geekos/vmm_stubs.c b/palacios/src/geekos/vmm_stubs.c
index 22ae6ef..28f1126 100644 (file)
--- a/palacios/src/geekos/vmm_stubs.c
+++ b/palacios/src/geekos/vmm_stubs.c
@@ -47,14 +47,20 @@ void VMM_Free(void * addr) {
 
 
 
-
 struct guest_info * irq_map[256];
 
-
 static void pic_intr_handler(struct Interrupt_State * state) {
   Begin_IRQ(state);
-
-  irq_map[state->intNum]->vm_ops.raise_irq(irq_map[state->intNum], state->intNum, state->errorCode);
+  struct guest_info * info =   irq_map[state->intNum - 32];
+  SerialPrint("Interrupt %d (IRQ=%d)\n", state->intNum, state->intNum - 32);
+
+  if (info) {
+    info->vm_ops.raise_irq(info, state->intNum - 32, state->errorCode);
+  } else {
+    SerialPrint("Interrupt handler error: NULL pointer found, no action taken\n");
+    End_IRQ(state);
+    return;
+  }
 
   // End_IRQ(state);
 }
@@ -67,8 +73,10 @@ int hook_irq_stub(struct guest_info * info, int irq) {
 
   SerialPrint("Hooking IRQ: %d (vm=0x%x)\n", irq, info);
   irq_map[irq] = info;
-  Install_IRQ(irq, pic_intr_handler);
-  Enable_IRQ(irq);
+  volatile void *foo = pic_intr_handler;
+  foo=0;
+  //  Install_IRQ(irq, pic_intr_handler);
+  // Enable_IRQ(irq);
   return 0;
 }
 
@@ -81,5 +89,4 @@ int ack_irq(int irq) {
   
 void Init_Stubs() {
   memset(irq_map, 0, sizeof(struct guest_info *) * 256);
-
 }