fixed configuration macro checks and a few configuration bugs

[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 f226ea5..7ec24c6 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -25,7 +25,7 @@
 #include <palacios/vmm_profiler.h>
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_hypercall.h>
-
+#include <palacios/vmm_dev_mgr.h>
 
 
 #include <devices/generic.h>
@@ -97,13 +97,23 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
        info->shdw_pg_mode = SHADOW_PAGING;
     }
 
+#ifdef CONFIG_PROFILE_VMM
     if (config_ptr->enable_profiling) {
        info->enable_profiler = 1;
        v3_init_profiler(info);
     } else {
        info->enable_profiler = 0;
     }
+#endif
+
+    if (config_ptr->schedule_freq == 0) {
+       // set the schedule frequency to 100 HZ
+       config_ptr->schedule_freq = 100;
+    }
+
+    PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), (void *)config_ptr->schedule_freq);
 
+    info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / config_ptr->schedule_freq;
     
     // Initial CPU operating mode
     info->cpu_mode = REAL;
@@ -161,21 +171,27 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
        }
     } else {
        v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000,  passthrough_mem_write, NULL);
-    }  
+    }
 
 #define VGABIOS_START 0x000c0000
 #define ROMBIOS_START 0x000f0000
 
     /* layout vgabios */
     {
+       extern uint8_t v3_vgabios_start[];
+       extern uint8_t v3_vgabios_end[];
+
        addr_t vgabios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), VGABIOS_START);
-       memcpy(V3_VAddr((void *)vgabios_dst), config_ptr->vgabios, config_ptr->vgabios_size);   
+       memcpy(V3_VAddr((void *)vgabios_dst), v3_vgabios_start, v3_vgabios_end - v3_vgabios_start);     
     }
     
     /* layout rombios */
     {
+       extern uint8_t v3_rombios_start[];
+       extern uint8_t v3_rombios_end[];
+
        addr_t rombios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), ROMBIOS_START);
-       memcpy(V3_VAddr((void *)rombios_dst), config_ptr->rombios, config_ptr->rombios_size);
+       memcpy(V3_VAddr((void *)rombios_dst), v3_rombios_start, v3_rombios_end - v3_rombios_start);
     }
 
 #ifdef CRAY_XT
@@ -188,7 +204,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
            return -1;
        }
     }
-#endif    
+#endif
 
     print_shadow_map(info);
 
@@ -199,7 +215,6 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
 
 static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
-
     v3_create_device(info, "8259A", NULL);
     v3_create_device(info, "KEYBOARD", NULL);
     v3_create_device(info, "8254_PIT", NULL); 
@@ -207,28 +222,30 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     v3_create_device(info, "OS_DEBUG", NULL);
     v3_create_device(info, "LAPIC", NULL);
     v3_create_device(info, "IOAPIC", "LAPIC");
-    v3_create_device(info, "PARANET", NULL);
+    v3_create_device(info, "VMNET", NULL);
     
     int use_generic = USE_GENERIC;
 
-
     if (config_ptr->enable_pci == 1) {
-       struct ide_cfg ide_config = {"PCI", "PIIX3"};   
+       struct ide_cfg ide_config = {"PCI", "PIIX3"};
        
        v3_create_device(info, "PCI", NULL);
        v3_create_device(info, "i440FX", "PCI");
        v3_create_device(info, "PIIX3", "PCI");
        
+
+       v3_create_device(info, "LNX_VIRTIO_SYM", "PCI");
+       v3_create_device(info, "LNX_VIRTIO_BLK", "PCI");
+       v3_create_device(info, "LNX_VIRTIO_BALLOON", "PCI");
+       v3_create_device(info, "SYM_SWAP", "LNX_VIRTIO_BLK");
+
+
        v3_create_device(info, "IDE", &ide_config);
     } else {
        v3_create_device(info, "IDE", NULL);
-
     }
 
 
-
-
-
     if (config_ptr->pri_disk_type != NONE) {
        if (config_ptr->pri_disk_type == CDROM) {
            if (config_ptr->pri_disk_con == RAM) {
@@ -246,7 +263,7 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
                                         config_ptr->pri_disk_info.net.disk_name};
                PrintDebug("Creating NET CD\n");
 
-               v3_create_device(info, "NET-CD", &cfg);    
+               v3_create_device(info, "NET-CD", &cfg);
            }
        } else if (config_ptr->pri_disk_type == HARDDRIVE) {
            if (config_ptr->pri_disk_con == RAM) {
@@ -434,10 +451,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con
     v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH);
 #endif
 
-
-
     //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
     
-
     return 0;
 }