X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=5bac0d43882046a65cdd5fa6d77475e7364f9d84;hb=f9bb3db89469169bb5775dc031d89e570c6fed70;hp=65c6eff29399362cf9835e8937fa5257597ba910;hpb=c373d9a80b116014c546e7761982fedf7419664b;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 65c6eff..5bac0d4 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -1,3 +1,6 @@
+/* Northwestern University */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+
 #include <palacios/vmm_config.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_debug.h>
@@ -13,14 +16,14 @@
 
 
 static int mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
- int foo = 20;
+  int foo = 20;
 
 
   memcpy(dst, &foo, length);
 
   PrintDebug("Passthrough mem read returning: %d (length=%d)\n", foo + (guest_addr & 0xfff), length);
   return length;
- }
+}
 
 static int passthrough_mem_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
     memcpy(dst, (void*)guest_addr, length);
@@ -33,6 +36,24 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v
 }
 
 
+/*static int IO_Read(ushort_t port, void * dst, uint_t length, void * priv_data) {
+
+  struct guest_info * info = priv_data;
+  ulong_t tsc_spread = 0;
+  ullong_t exit_tsc = 0;
+
+  
+  *(ulong_t *)(&exit_tsc) = info->vm_regs.rbx;
+  *(ulong_t *)((&exit_tsc) + 4) = info->vm_regs.rcx; 
+  tsc_spread = info->exit_tsc - exit_tsc;
+  
+  PrintError("IOREAD tsc diff = %lu\n",tsc_spread); 
+  info->rip += 3;
+
+
+  return 1;
+}
+*/
 
 int config_guest(struct guest_info * info, void * config_ptr) {
 
@@ -98,9 +119,11 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       //     
   add_shadow_region_passthrough(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160));
   
-  //add_shadow_region_passthrough(info, 0xa0000, 0xc0000, 0xa0000); 
-  hook_guest_mem(info, 0xa0000, 0xc0000, passthrough_mem_read, passthrough_mem_write, NULL);
-  
+  if (1) {
+    add_shadow_region_passthrough(info, 0xa0000, 0xc0000, 0xa0000); 
+  } else {
+    hook_guest_mem(info, 0xa0000, 0xc0000, passthrough_mem_read, passthrough_mem_write, NULL);
+  }  
   
   // TEMP
   //add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000);
@@ -116,16 +139,15 @@ int config_guest(struct guest_info * info, void * config_ptr) {
   }
   
   
- 
-  //  add_shadow_region_passthrough(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096));
-  { 
+  if (1) {
+  add_shadow_region_passthrough(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096));
+  } else {
     /* MEMORY HOOK TEST */
     add_shadow_region_passthrough(info, 0x100000, 0xa00000, (addr_t)V3_AllocPages(2304));
-    hook_guest_mem(info, 0xa00000, 0xa01000, mem_test_read, passthrough_mem_write, NULL);
-    
+    hook_guest_mem(info, 0xa00000, 0xa01000, mem_test_read, passthrough_mem_write, NULL); 
     add_shadow_region_passthrough(info, 0xa01000, 0x1000000, (addr_t)V3_AllocPages(1791));
-
   }
+
     add_shadow_region_passthrough(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768));
  
   // test - give linux accesss to PCI space - PAD
@@ -167,7 +189,7 @@ int config_guest(struct guest_info * info, void * config_ptr) {
 #endif
       
 
-#if 0      
+#if 1      
       // Make the Serial ports invisible 
 
       {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 1
@@ -184,7 +206,7 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       {0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE}, // PCI Config Data
 #endif
  
-#if 0
+#if 1
 
       // Monitor the IDE controllers (very slow)
 
@@ -294,6 +316,8 @@ int config_guest(struct guest_info * info, void * config_ptr) {
 #endif
   
 
+  //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
+
   info->rip = 0xfff0;
   info->vm_regs.rsp = 0x0;
   
@@ -356,6 +380,8 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       v3_hook_io_port(&vm_info, 0x61, &IO_Read, &IO_Write, NULL);
       v3_hook_io_port(&vm_info, 0x05, &IO_Read, &IO_Write_to_Serial, NULL);
       
+
+
       /*
 	vm_info.cr0 = 0;
 	vm_info.cs.base=0xf000;