added functioning ramdisk, makefile support

[palacios.git] / palacios / src / palacios / vmm_config.c

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 1dc5996..027b036 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -17,7 +17,7 @@
 
 
 #define USE_GENERIC 1
-#define USE_RAMDISK 0
+#define USE_RAMDISK 1
 
 
 
@@ -177,12 +177,15 @@ int config_guest(struct guest_info * info, void * config_ptr) {
     struct vm_device * generic = NULL;
     //Zheng 09/29/2008
 
+
     if (use_ramdisk) {
+      PrintDebug("Creating Ramdisk\n");
       ramdisk = create_ramdisk();
     }
     
     
     if (use_generic) {
+      PrintDebug("Creating Generic Device\n");
       generic = create_generic();
       
       // Make the DMA controller invisible
@@ -209,11 +212,10 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       
 
       
-#ifndef DEBUG_RAMDISK
-      
+
       v3_generic_add_port_range(generic, 0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 3
       v3_generic_add_port_range(generic, 0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 4
-#endif
+
       
       
 
@@ -224,13 +226,14 @@ int config_guest(struct guest_info * info, void * config_ptr) {
 
       
       
+#if 0
       if (!use_ramdisk) {
        // Monitor the IDE controllers (very slow)
        v3_generic_add_port_range(generic, 0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1
        v3_generic_add_port_range(generic, 0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1
       }
       
-#if 1
+
       v3_generic_add_port_range(generic, 0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
       v3_generic_add_port_range(generic, 0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
 #endif