booting geekos up to the timer initialization

[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 25f300b..47e8886 100644 (file)
--- 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;
     }
@@ -52,10 +52,9 @@ struct guest_info * irq_map[256];
 static void pic_intr_handler(struct Interrupt_State * state) {
   Begin_IRQ(state);
   struct guest_info * info =   irq_map[state->intNum - 32];
-  SerialPrint("Interrupt %d\n", state->intNum);
+  SerialPrint("Interrupt %d (IRQ=%d)\n", state->intNum, state->intNum - 32);
 
   if (info) {
-    SerialPrint("Calling handler(info=%x)->%x\n", info, info->vm_ops.raise_irq);
     info->vm_ops.raise_irq(info, state->intNum - 32, state->errorCode);
   } else {
     SerialPrint("Interrupt handler error: NULL pointer found, no action taken\n");
@@ -74,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;
 }