X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=39790c8a531fee13e8c46d4b26097079f010f619;hb=4b93282ac2e60cd4d74b1e0be8ac758933140413;hp=dfb797442167ca18972cf109b2250bc5cd15f928;hpb=0e3fe455f4c490dc4c5d9412decf2420b905b3e9;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index dfb7974..39790c8 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -2,6 +2,7 @@
 #include <palacios/vmm.h>
 #include <palacios/vmm_debug.h>
 
+
 #include <devices/serial.h>
 #include <devices/keyboard.h>
 #include <devices/8259a.h>
@@ -11,6 +12,28 @@
 
 
 
+/*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;
+}
+
+
+
 int config_guest(struct guest_info * info, void * config_ptr) {
 
   struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr;
@@ -37,6 +60,8 @@ int config_guest(struct guest_info * info, void * config_ptr) {
   init_interrupt_state(info);
   
   dev_mgr_init(info);
+
+  init_emulator(info);
   
  
   //     SerialPrint("Guest Mem Dump at 0x%x\n", 0x100000);
@@ -73,8 +98,8 @@ 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);
+  //add_shadow_region_passthrough(info, 0xa0000, 0xc0000, 0xa0000); 
+  hook_guest_mem(info, 0xa0000, 0xc0000, passthrough_mem_read, passthrough_mem_write, NULL);
   
   
   // TEMP
@@ -91,11 +116,20 @@ int config_guest(struct guest_info * info, void * config_ptr) {
   }
   
   
-  //add_shadow_region_passthrough(info, 0x100000, 0x2000000, (addr_t)Allocate_VMM_Pages(8192));
+ 
   add_shadow_region_passthrough(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096));
-  
-  add_shadow_region_passthrough(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768));
-  
+ /* 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);
   
@@ -118,6 +152,8 @@ int config_guest(struct guest_info * info, void * config_ptr) {
 #if GENERIC
     generic_port_range_type range[] = {
 #if 1
+      // Make the DMA controller invisible
+
       {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
@@ -132,13 +168,28 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       {0xd0, 0xde, GENERIC_PRINT_AND_IGNORE},   // DMA 2 misc registers
 #endif
       
-      
+
+#if 1      
+      // Make the Serial ports invisible 
+
       {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 3
       {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 4
-      
-#if 0
+#endif
+
+
+#if 1
+      // Make the PCI bus invisible (at least it's configuration)
+
+      {0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE}, // PCI Config Address
+      {0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE}, // PCI Config Data
+#endif
+ 
+#if 1
+
+      // Monitor the IDE controllers (very slow)
+
       {0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
       {0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
       {0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0
@@ -147,6 +198,9 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       
 
 #if 0
+
+      // Make the floppy controllers invisible
+
       {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)
@@ -156,6 +210,46 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       
 #endif
 
+#if 1
+
+      // Make the parallel port invisible
+      
+      {0x378, 0x37f, GENERIC_PRINT_AND_IGNORE},
+
+#endif
+
+#if 1
+
+      // Monitor graphics card operations
+
+      {0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH},
+      {0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH},
+      
+#endif
+
+
+#if 1
+      // Make the ISA PNP features invisible
+
+      {0x274, 0x277, GENERIC_PRINT_AND_IGNORE},
+      {0x279, 0x279, GENERIC_PRINT_AND_IGNORE},
+      {0xa79, 0xa79, GENERIC_PRINT_AND_IGNORE},
+#endif
+
+
+#if 1
+      // Monitor any network card (realtek ne2000) operations 
+      {0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH},
+#endif
+
+
+#if 1
+      // Make any Bus master ide controller invisible
+      
+      {0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE},
+#endif
+
+
       //	  {0x378, 0x400, GENERIC_PRINT_AND_IGNORE}
       
       {0,0,0},  // sentinal - must be last