X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config_class.h;h=a0b2ba4104c458811b7faf77652ad768492d8ea3;hb=17f8752ad440dba7d414d0812e3680066dcb8c9e;hp=36fee9b526f85723597f4b2061819b32e9f7f470;hpb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h
index 36fee9b..a0b2ba4 100644
--- a/palacios/src/palacios/vmm_config_class.h
+++ b/palacios/src/palacios/vmm_config_class.h
@@ -18,7 +18,7 @@
  */
 
 
-static int post_config_pc(struct guest_info * info, struct v3_config * config_ptr) {
+static int pre_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) { 
 
 
     info->cpu_mode = REAL;
@@ -34,6 +34,16 @@ static int post_config_pc(struct guest_info * info, struct v3_config * config_pt
     info->vm_regs.rcx = 0;
     info->vm_regs.rax = 0;
 
+    return 0;
+}
+
+static int post_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) { 
+
+    v3_print_mem_map(info->vm_info);
+    return 0;
+}
+
+static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
 #define VGABIOS_START 0x000c0000
 #define ROMBIOS_START 0x000f0000
@@ -43,7 +53,7 @@ static int post_config_pc(struct guest_info * info, struct v3_config * config_pt
 	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);
+	addr_t vgabios_dst = v3_get_shadow_addr(&(vm->mem_map.base_region), V3_MEM_CORE_ANY, VGABIOS_START);
 	memcpy(V3_VAddr((void *)vgabios_dst), v3_vgabios_start, v3_vgabios_end - v3_vgabios_start);	
     }
     
@@ -52,12 +62,10 @@ static int post_config_pc(struct guest_info * info, struct v3_config * config_pt
 	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);
+	addr_t rombios_dst = v3_get_shadow_addr(&(vm->mem_map.base_region), V3_MEM_CORE_ANY, ROMBIOS_START);
 	memcpy(V3_VAddr((void *)rombios_dst), v3_rombios_start, v3_rombios_end - v3_rombios_start);
     }
 
-    v3_print_mem_map(info);
-
     return 0;
 }