X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=e01eee73c3dd5fe04abe2439912f46db51f1ae29;hb=d34450b1e6fe3c2e1295c268c1722c669ba8d545;hp=00123f34671f5ff6a4ad12dd8651e00b14c451eb;hpb=942df9bb1e2570764d24c74f797247536639502e;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 00123f3..e01eee7 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -104,6 +104,14 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
 	info->enable_profiler = 0;
     }
 
+    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;
@@ -168,14 +176,20 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
 
     /* 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
@@ -218,9 +232,12 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
 	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);