X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=ec242b6167650f9b670fa85160fb8a87529f8147;hb=75d9c52b3ee8673c9f358b7815d2026da5319ca7;hp=8e80bfdd8f215a957b2470a2991d1ee02c027762;hpb=a5c5675571882a9b8a7594ef07fe303b195ef9ae;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 8e80bfd..ec242b6 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -1,3 +1,7 @@
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
+
 #include <palacios/vmm_config.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_debug.h>
@@ -10,8 +14,52 @@
 #include <devices/nvram.h>
 #include <devices/generic.h>
 
+//Zheng 09/29/2008
+#ifdef RAMDISK_BOOT
+#include <devices/ramdisk.h>
+#endif
+
+
+static int mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
+  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);
+    return length;
+}
+
+static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
+  memcpy((void*)guest_addr, src, length);
+  return length;
+}
 
 
+/*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) {
 
   struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr;
@@ -76,9 +124,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);
@@ -94,11 +144,17 @@ int config_guest(struct guest_info * info, void * config_ptr) {
   }
   
   
-  //add_shadow_region_passthrough(info, 0x100000, 0x2000000, (addr_t)Allocate_VMM_Pages(8192));
+  if (1) {
   add_shadow_region_passthrough(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096));
-  
-  add_shadow_region_passthrough(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768));
-  
+  } 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); 
+    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
   add_shadow_region_passthrough(info, 0xc0000000,0xffffffff,0xc0000000);
   
@@ -115,6 +171,11 @@ int config_guest(struct guest_info * info, void * config_ptr) {
     struct vm_device * pit = create_pit(); 
     //struct vm_device * serial = create_serial();
     
+    //Zheng 09/29/2008
+
+#ifdef RAMDISK_BOOT
+    struct vm_device * ramdisk = create_ramdisk();
+#endif
     
 #define GENERIC 1
     
@@ -143,6 +204,11 @@ int config_guest(struct guest_info * info, void * config_ptr) {
 
       {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 1
       {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
+
+#endif
+
+#ifndef DEBUG_RAMDISK
+
       {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 3
       {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 4
 #endif
@@ -155,12 +221,17 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       {0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE}, // PCI Config Data
 #endif
  
-#if 0
+
+#ifndef RAMDISK_BOOT
 
       // Monitor the IDE controllers (very slow)
 
       {0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
       {0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
+
+#endif
+
+#if 1
       {0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0
       {0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0
 #endif
@@ -237,6 +308,10 @@ int config_guest(struct guest_info * info, void * config_ptr) {
     v3_attach_device(info, keyboard);
     // v3_attach_device(info, serial);
 
+//Zheng 09/29/2008    
+#ifdef RAMDISK_BOOT
+    v3_attach_device(info, ramdisk);
+#endif
 
 #if GENERIC
     // Important that this be attached last!
@@ -260,11 +335,16 @@ int config_guest(struct guest_info * info, void * config_ptr) {
   //primary ide
   v3_hook_irq_for_guest_injection(info, 14);
   
+#endif
+
+#ifndef RAMDISK_BOOT
   // secondary ide
   v3_hook_irq_for_guest_injection(info, 15);
 #endif
   
 
+  //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
+
   info->rip = 0xfff0;
   info->vm_regs.rsp = 0x0;
   
@@ -327,6 +407,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;