X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=2e07e6573b3ca14585a43a03ee176be4e54a7865;hb=d4073a9dbe24ae160b8d6bd8fd5fd4ad8aa995a3;hp=23ed809ac3e0d1fc71c7cbee05ceecf5f0af6329;hpb=8edf271b9a8987eecac71ed9bbbb8de0d1062897;p=palacios.releases.git

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index 23ed809..2e07e65 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -200,10 +200,17 @@ int RunVMM(struct Boot_Info * bootInfo) {
   
 
     /* MOVE THIS TO AN INIT GUEST ROUTINE */
-    init_shadow_map(&(vm_info.mem_map));
-    init_shadow_page_state(&(vm_info.shdw_pg_state));
+   
+    
     v3_init_time(&(vm_info.time_state));
-    vm_info.shdw_pg_mode = SHADOW_PAGING;
+    init_shadow_map(&(vm_info.mem_map));
+
+    if ((vmm_ops).has_nested_paging()) {
+      vm_info.shdw_pg_mode = NESTED_PAGING;
+    } else {
+      init_shadow_page_state(&(vm_info.shdw_pg_state));
+      vm_info.shdw_pg_mode = SHADOW_PAGING;
+    }
 
     vm_info.cpu_mode = REAL;
     vm_info.mem_mode = PHYSICAL_MEM;
@@ -336,43 +343,55 @@ int RunVMM(struct Boot_Info * bootInfo) {
 	//struct vm_device * timer = create_timer();
 	struct vm_device * pic = create_pic();
 	struct vm_device * keyboard = create_keyboard();
-	struct vm_device * pit = create_pit();
+	struct vm_device * pit = create_pit(); 
 
 
-#define GENERIC 0
+#define GENERIC 1
 
 #if GENERIC
 	generic_port_range_type range[] = {
 	  /*
-          {0x00, 0x07},   // DMA 1 channels 0,1,2,3 (address, counter)
-          {0xc0, 0xc7},   // DMA 2 channels 4,5,6,7 (address, counter)
-          {0x87, 0x87},   // DMA 1 channel 0 page register
-          {0x83, 0x83},   // DMA 1 channel 1 page register
-          {0x81, 0x81},   // DMA 1 channel 2 page register
-          {0x82, 0x82},   // DMA 1 channel 3 page register
-          {0x8f, 0x8f},   // DMA 2 channel 4 page register
-          {0x8b, 0x8b},   // DMA 2 channel 5 page register
-          {0x89, 0x89},   // DMA 2 channel 6 page register
-          {0x8a, 0x8a},   // DMA 2 channel 7 page register
-	  {0x08, 0x0f},   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
-          {0xd0, 0xde},   // DMA 2 misc registers
+          {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
 	  */
-          {0x170, 0x178}, // IDE 1
-	  {0x376, 0x377}, // IDE 1
-          {0x1f0, 0x1f8}, // IDE 0
-	  {0x3f6, 0x3f7}, // IDE 0
+	  {0x08, 0x0f, GENERIC_PRINT_AND_IGNORE},
+	  {0x81, 0x8F, GENERIC_PRINT_AND_IGNORE},
+	  {0xd0, 0xdf, GENERIC_PRINT_AND_IGNORE}, 
+
+
+	  {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 1
+	  {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
+	  {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
+	  {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
 	  /*
-          {0x3f0, 0x3f2}, // Primary floppy controller (base,statusa/statusb,DOR)
-          {0x3f4, 0x3f5}, // Primary floppy controller (mainstat/datarate,data)
-          {0x3f7, 0x3f7}, // Primary floppy controller (DIR)
-          {0x370, 0x372}, // Secondary floppy controller (base,statusa/statusb,DOR)
-          {0x374, 0x375}, // Secondary floppy controller (mainstat/datarate,data)
-          {0x377, 0x377}, // Secondary floppy controller (DIR)
-          {0x378, 0x400}
+	    {0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
+	    {0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
+	    {0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0
+	    {0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0
 	  */
+	  {0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (base,statusa/statusb,DOR)
+	  {0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (mainstat/datarate,data)
+	  {0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (DIR)
+	  {0x370, 0x372, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (base,statusa/statusb,DOR)
+	  {0x374, 0x375, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (mainstat/datarate,data)
+	  {0x377, 0x377, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (DIR)
+
+	  //	  {0x378, 0x400, GENERIC_PRINT_AND_IGNORE}
+
         };
 
-	struct vm_device * generic = create_generic(range,4,  // THIS NUMBER IS CRITICAL
+	struct vm_device * generic = create_generic(range,13,  // THIS NUMBER IS CRITICAL
+
 						    NULL,0,NULL,0);
 	
 #endif