X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvmm_stubs.c;h=aae237676aded553b802a7eccfae817bc2b79bc0;hb=2b1f4ef19d766727f873476861c64339c8836a40;hp=22ae6ef5f8758e50ef9e8b732ac93d7d1cfccd03;hpb=09149700a57ced21de742451c9302320ca4eebc2;p=palacios.git

diff --git a/palacios/src/geekos/vmm_stubs.c b/palacios/src/geekos/vmm_stubs.c
index 22ae6ef..aae2376 100644
--- a/palacios/src/geekos/vmm_stubs.c
+++ b/palacios/src/geekos/vmm_stubs.c
@@ -7,7 +7,7 @@ void * Identity(void *addr) { return addr; };
 
 void * Allocate_VMM_Pages(int num_pages) {
   void * start_page = Alloc_Page();
-  //SerialPrint("Allocating Page: %x (%d of %d)\n",start_page, 1, num_pages); 
+  //SerialPrint("Starting by Allocating Page: %x (%d of %d)\n",start_page, 1, num_pages); 
   int i = 1;
 
   while (i < num_pages) {
@@ -21,7 +21,7 @@ void * Allocate_VMM_Pages(int num_pages) {
 	i--;
       }
       start_page = Alloc_Page();
-      //SerialPrint("Allocating Page: %x (%d of %d)\n",start_page, 1, num_pages);
+      //SerialPrint("Starting over by Allocating Page: %x (%d of %d)\n",start_page, 1, num_pages);
       i = 1;
       continue;
     }
@@ -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,6 +73,9 @@ int hook_irq_stub(struct guest_info * info, int irq) {
 
   SerialPrint("Hooking IRQ: %d (vm=0x%x)\n", irq, info);
   irq_map[irq] = info;
+  volatile void *foo = pic_intr_handler;
+  foo=0;
+  Disable_IRQ(irq);
   Install_IRQ(irq, pic_intr_handler);
   Enable_IRQ(irq);
   return 0;
@@ -81,5 +90,4 @@ int ack_irq(int irq) {
   
 void Init_Stubs() {
   memset(irq_map, 0, sizeof(struct guest_info *) * 256);
-
 }