X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=701449f7e10adf563d17c91d82cfff350dcd31e0;hb=2201970a66ded078c9228c9e4053189a00f0a882;hp=5bfe537350a43e5a4deef2bba5f550eabd602ac7;hpb=9019b8dedfa7de9da84c55bc488a60a784231899;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 5bfe537..701449f 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -97,12 +97,14 @@ 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
@@ -176,17 +178,23 @@ 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
+#ifdef CONFIG_CRAY_XT
     {
 #define SEASTAR_START 0xffe00000 
 #define SEASTAR_END 0xffffffff 
@@ -226,10 +234,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);