From: Peter Dinda <pdinda@northwestern.edu>
Date: Tue, 15 Jul 2008 19:34:09 +0000 (+0000)
Subject: Debugging changes for use on physical machines
X-Git-Tag: reaches-user-mode-on-qemu-and-both-amd-boxes-nested-paging-faults~1
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=92edb55927cdc35201e59a6a25fee6edbffc60df

Debugging changes for use on physical machines
---

diff --git a/palacios/src/geekos/keyboard.c b/palacios/src/geekos/keyboard.c
index e24c3c0..e33e989 100644
--- 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.7 $
+ * $Revision: 1.8 $
  * 
  * 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/vm.c b/palacios/src/geekos/vm.c
index 2e07e65..3477c28 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -350,24 +350,21 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
 #if GENERIC
 	generic_port_range_type range[] = {
-	  /*
-          {0x00, 0x07, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channels 0,1,2,3 (address, counter)
-          {0xc0, 0xc7, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channels 4,5,6,7 (address, counter)
-          {0x87, 0x87, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channel 0 page register
-          {0x83, 0x83, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channel 1 page register
-          {0x81, 0x81, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channel 2 page register
-          {0x82, 0x82, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channel 3 page register
-          {0x8f, 0x8f, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channel 4 page register
-          {0x8b, 0x8b, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channel 5 page register
-          {0x89, 0x89, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channel 6 page register
-          {0x8a, 0x8a, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channel 7 page register
-	  {0x08, 0x0f, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
-          {0xd0, 0xde, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 misc registers
-	  */
-	  {0x08, 0x0f, GENERIC_PRINT_AND_IGNORE},
-	  {0x81, 0x8F, GENERIC_PRINT_AND_IGNORE},
-	  {0xd0, 0xdf, GENERIC_PRINT_AND_IGNORE}, 
-
+#if 0
+          {0x00, 0x07, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channels 0,1,2,3 (address, counter)
+          {0xc0, 0xc7, GENERIC_PRINT_AND_
+IGNORE},   // DMA 2 channels 4,5,6,7 (address, counter)
+          {0x87, 0x87, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 0 page register
+          {0x83, 0x83, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 1 page register
+          {0x81, 0x81, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 2 page register
+          {0x82, 0x82, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 3 page register
+          {0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channel 4 page register
+          {0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channel 5 page register
+          {0x89, 0x89, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channel 6 page register
+          {0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channel 7 page register
+	  {0x08, 0x0f, GENERIC_PRINT_AND_IGNORE},   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
+          {0xd0, 0xde, GENERIC_PRINT_AND_IGNORE},   // DMA 2 misc registers
+#endif
 
 	  {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 1
 	  {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
@@ -390,10 +387,9 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
         };
 
-	struct vm_device * generic = create_generic(range,13,  // THIS NUMBER IS CRITICAL
+	struct vm_device * generic = create_generic(range,10,  // THIS NUMBER IS CRITICAL
 
 						    NULL,0,NULL,0);
-	
 #endif
 
 	attach_device(&(vm_info), nvram);