Debug stuff for testing boot on physical machines

diff --git a/palacios/src/geekos/irq.c b/palacios/src/geekos/irq.c
index c94aeeb..07543ba 100644 (file)
--- a/palacios/src/geekos/irq.c
+++ b/palacios/src/geekos/irq.c
@@ -1,7 +1,7 @@
 /*
  * This is the device-driver interface to the interrupt system.
  * Copyright (c) 2001,2003 David H. Hovemeyer <daveho@cs.umd.edu>
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -112,7 +112,7 @@ void Disable_IRQ(int irq)
  */
 void Begin_IRQ(struct Interrupt_State* state)
 {
-  
+  //   SerialPrint("Begin_IRQ for interrupt 0x%x\n",state->intNum);
 }
 
 /*

diff --git a/palacios/src/geekos/keyboard.c b/palacios/src/geekos/keyboard.c
index 44f0dfe..e24c3c0 100644 (file)
--- a/palacios/src/geekos/keyboard.c
+++ b/palacios/src/geekos/keyboard.c
@@ -1,7 +1,7 @@
 /*
  * Keyboard driver
  * Copyright (c) 2001,2004 David H. Hovemeyer <daveho@cs.umd.edu>
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -191,7 +191,7 @@ static void Keyboard_Interrupt_Handler(struct Interrupt_State* state)
       /* There is a byte available */
       scanCode = In_Byte(KB_DATA);
       raw_scancode=scanCode;
-      //Print("Keyboard: status=0x%x, scancode=0x%x\n", raw_status, raw_scancode);
+      Print("Keyboard: status=0x%x, scancode=0x%x\n", raw_status, raw_scancode);
       IO_Delay();
       /*
        *       Print("code=%x%s\n", scanCode, (scanCode&0x80) ? " [release]" : "");

diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index e557664..706665f 100644 (file)
--- a/palacios/src/geekos/main.c
+++ b/palacios/src/geekos/main.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2001,2003,2004 David H. Hovemeyer <daveho@cs.umd.edu>
  * Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
  * Copyright (c) 2004, Iulian Neamtiu <neamtiu@cs.umd.edu>
- * $Revision: 1.37 $
+ * $Revision: 1.38 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -239,7 +239,8 @@ void Main(struct Boot_Info* bootInfo)
   }
 
 
-  
+  SerialPrint("RunVMM returned, spinning\n");
+  while (1) {} 
 
 
   TODO("Write a Virtual Machine Monitor");

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index 6f9d4d8..591a6ed 100644 (file)
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -377,7 +377,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
          */
         };
 
-       struct vm_device * generic = create_generic(range,8,  // THIS NUMBER IS CRITICAL
+       struct vm_device * generic = create_generic(range,4,  // THIS NUMBER IS CRITICAL
                                                    NULL,0,NULL,0);
        
 #endif
@@ -402,7 +402,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
       // no longer needed since we have a keyboard device
       //hook_irq(&vm_info, 1);
       
-#if 1
+#if 0
       // give floppy controller to vm
       hook_irq(&vm_info, 6);