X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=ec8891ffba690bd5c508bd48f61bc461c22f32a5;hb=db45b5a19f672956e8875a116b06d7ed44c9258c;hp=5ef7461538949d27d6d8a6f6c53207e8ae94a31e;hpb=f84bd0ca67af7c0a1143d5e279e0af408729128e;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 5ef7461..ec8891f 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,6 +14,10 @@
 #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) {
@@ -33,6 +41,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) {
 
@@ -145,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
     
@@ -173,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
@@ -185,12 +221,17 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       {0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE}, // PCI Config Data
 #endif
  
-#if 1
+
+#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
@@ -267,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!
@@ -290,84 +335,19 @@ 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;
   
 
   return 0;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#if 0
-
-    
-    if (0) {
-      
-      //    add_shared_mem_range(&(vm_info.mem_layout), 0, 0x800000, 0x10000);    
-      //    add_shared_mem_range(&(vm_info.mem_layout), 0, 0x1000000, 0);
-      
-      rip = (ulong_t)(void*)&BuzzVM;
-      //  rip -= 0x10000;
-      //    rip = (addr_t)(void*)&exit_test;
-      //  rip -= 0x2000;
-      vm_info.rip = rip;
-      rsp = (addr_t)Alloc_Page();
-      
-      vm_info.vm_regs.rsp = (rsp +4092 );// - 0x2000;
-      
-            
-    } else if (0) {
-      //add_shared_mem_range(&(vm_info.mem_layout), 0x0, 0x1000, 0x100000);
-      //      add_shared_mem_range(&(vm_info.mem_layout), 0x0, 0x100000, 0x0);
-      
-      /*
-	shadow_region_t *ent = Malloc(sizeof(shadow_region_t));;
-	init_shadow_region_physical(ent,0,0x100000,GUEST_REGION_PHYSICAL_MEMORY,
-	0x100000, HOST_REGION_PHYSICAL_MEMORY);
-	add_shadow_region(&(vm_info.mem_map),ent);
-      */
-
-      add_shadow_region_passthrough(&vm_info, 0x0, 0x100000, 0x100000);
-
-      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;
-	vm_info.cs.limit=0xffff;
-      */
-      //vm_info.rip = 0xfff0;
-
-      vm_info.rip = 0;
-      vm_info.vm_regs.rsp = 0x0;
-    } else {
-   
-    }
-
-#endif