X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config_class.h;h=9a508bd7975a279cb1fb27779954c6a27c210cdd;hb=475a9909153784cf9308ace2fa47896ad5a34eac;hp=7b867926ddc53f3e3ec0cecd7c876f67f13d8e22;hpb=3e69f5a7f3d695b0025b88181e657fa3ff364643;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h
index 7b86792..9a508bd 100644
--- a/palacios/src/palacios/vmm_config_class.h
+++ b/palacios/src/palacios/vmm_config_class.h
@@ -45,55 +45,111 @@ static int post_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) {
 
 static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
+    v3_cfg_tree_t * bios_tree = NULL;
+    v3_cfg_tree_t * bios_list = NULL;
+
+    bios_tree = v3_cfg_subtree(cfg, "bioses");
+
+
+    if (!v3_cfg_val(bios_tree, "disable_vgabios")) {
 
 #if defined(V3_CONFIG_SEABIOS) || defined(V3_CONFIG_BOCHSBIOS)
 
 #define VGABIOS_START 0x000c0000
-    /* layout vgabios */
-    {
-	extern uint8_t v3_vgabios_start[];
-	extern uint8_t v3_vgabios_end[];
-	void * vgabios_dst = 0;
-
-	if (v3_gpa_to_hva(&(vm->cores[0]), VGABIOS_START, (addr_t *)&vgabios_dst) == -1) {
-	    PrintError(vm, VCORE_NONE, "Could not find VGABIOS destination address\n");
-	    return -1;
-	}
-
-	V3_Print(vm,VCORE_NONE,"Mapping VGA BIOS of %llu bytes at address %p\n", (uint64_t)(v3_vgabios_end-v3_vgabios_start), (void*)VGABIOS_START);
-	memcpy(vgabios_dst, v3_vgabios_start, v3_vgabios_end - v3_vgabios_start);	
-    }
-    
+        /* layout vgabios */
+        {
+            extern uint8_t v3_vgabios_start[];
+            extern uint8_t v3_vgabios_end[];
+            void * vgabios_dst = 0;
+
+            if (v3_gpa_to_hva(&(vm->cores[0]), VGABIOS_START, (addr_t *)&vgabios_dst) == -1) {
+                PrintError(vm, VCORE_NONE, "Could not find VGABIOS destination address\n");
+                return -1;
+            }
+
+            V3_Print(vm,VCORE_NONE,"Mapping VGA BIOS of %llu bytes at address %p\n", (uint64_t)(v3_vgabios_end-v3_vgabios_start), (void*)VGABIOS_START);
+            memcpy(vgabios_dst, v3_vgabios_start, v3_vgabios_end - v3_vgabios_start);	
+        }
+
 #endif
 
+    }
+
+
+    if (!v3_cfg_val(bios_tree, "disable_rombios")) {
+
+        /* layout rombios */
+        {
+            extern uint8_t v3_rombios_start[];
+            extern uint8_t v3_rombios_end[];
+            void * rombios_dst = 0;
+
 
-    /* layout rombios */
-    {
-	extern uint8_t v3_rombios_start[];
-	extern uint8_t v3_rombios_end[];
-	void * rombios_dst = 0;
-	
-	if (v3_gpa_to_hva(&(vm->cores[0]), V3_CONFIG_BIOS_START, (addr_t *)&rombios_dst) == -1) {
-	    PrintError(vm, VCORE_NONE, "Could not find ROMBIOS destination address\n");
-	    return -1;
-	}
 
-	V3_Print(vm,VCORE_NONE,"Mapping BIOS of %llu bytes at address %p\n", (uint64_t)(v3_rombios_end-v3_rombios_start), (void*)V3_CONFIG_BIOS_START);
-	memcpy(rombios_dst, v3_rombios_start, v3_rombios_end - v3_rombios_start);
+            if (v3_gpa_to_hva(&(vm->cores[0]), V3_CONFIG_BIOS_START, (addr_t *)&rombios_dst) == -1) {
+                PrintError(vm, VCORE_NONE, "Could not find ROMBIOS destination address\n");
+                return -1;
+            }
+
+            V3_Print(vm,VCORE_NONE,"Mapping BIOS of %llu bytes at address %p\n", (uint64_t)(v3_rombios_end-v3_rombios_start), (void*)V3_CONFIG_BIOS_START);
+            memcpy(rombios_dst, v3_rombios_start, v3_rombios_end - v3_rombios_start);
 
 #ifdef V3_CONFIG_SEABIOS
-	// SEABIOS is also mapped into end of 4GB region
-	if (v3_add_shadow_mem(vm, V3_MEM_CORE_ANY, 
-			      0xfffe0000, 0xffffffff,
-			      (addr_t)V3_PAddr(rombios_dst)) == -1) {
-	    PrintError(vm, VCORE_NONE, "Error mapping SEABIOS to end of memory\n");
-	    return -1;
-	}
-	V3_Print(vm,VCORE_NONE,"Additionally mapping SEABIOS of %llu bytes at address %p\n", (uint64_t)(v3_rombios_end-v3_rombios_start), (void*)0xfffe0000);
+            // SEABIOS is also mapped into end of 4GB region
+            if (v3_add_shadow_mem(vm, V3_MEM_CORE_ANY, 
+                        0xfffe0000, 0xffffffff,
+                        (addr_t)V3_PAddr(rombios_dst)) == -1) {
+                PrintError(vm, VCORE_NONE, "Error mapping SEABIOS to end of memory\n");
+                return -1;
+            }
+            V3_Print(vm,VCORE_NONE,"Additionally mapping SEABIOS of %llu bytes at address %p\n", (uint64_t)(v3_rombios_end-v3_rombios_start), (void*)0xfffe0000);
 #endif
 
+        }
     }
 
+    bios_list = v3_cfg_subtree(bios_tree, "bios");
+
+    while (bios_list) {
+        char * id = v3_cfg_val(bios_list, "file");
+        char * addr = v3_cfg_val(bios_list, "address");
+        uint64_t file_ptr = 0;
+        void * dest = NULL;
+        struct v3_cfg_file * file = NULL;
+
+        if (!id) {
+            PrintError(vm, VCORE_NONE, "Could not find bios file\n");
+            continue;
+        }
+
+        if (!addr) {
+            PrintError(vm, VCORE_NONE, "Could not find bios address\n");
+            continue;
+        }
+
+        file = v3_cfg_get_file(vm, id);
+        if (!file) {
+            PrintError(vm, VCORE_NONE, "Invalid BIOS file: %s\n", id);
+            continue;
+        }
+
+        file_ptr = atox(addr);
+
+        V3_Print(vm, VCORE_NONE, "Copying BIOS ROM (%s) to %p (size=%lld)\n", 
+                 id,
+                 (void*)file_ptr,
+                 file->size);
+
+        if (v3_gpa_to_hva(&(vm->cores[0]), (addr_t)file_ptr, (addr_t *)&dest) == -1) {
+            PrintError(vm, VCORE_NONE, "Could not find BIOS (%s) destination address\n", id);
+            continue;
+        }
+
+        memcpy((void*)dest, file->data, file->size);
+
+        V3_Print(vm, VCORE_NONE, "Moving on to next BIOS file\n");
+        bios_list = v3_cfg_next_branch(bios_list);
+    }
 
     return 0;
 }