Semi-functional SMP (boots Kitten guest with two cores)

[palacios.git] / palacios / src / palacios / vmm_config_class.h

diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h
index 2160c6e..1770a6f 100644 (file)
--- a/palacios/src/palacios/vmm_config_class.h
+++ b/palacios/src/palacios/vmm_config_class.h
@@ -17,11 +17,22 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
+#include <palacios/vm_guest_mem.h>
+
 
 static int pre_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) { 
 
+    if (info->cpu_id!=0) { 
+       // I am an AP, so I will start in INIT mode,
+       // not in real mode.   This means I will wait for
+       // an INIT and then for a SIPI.   The SIPI will
+       // tell me where to start executing in real mode
+       info->cpu_mode = INIT;
+    } else {
+       // I am the MP, so I will start as normal
+       info->cpu_mode = REAL;
+    }
 
-    info->cpu_mode = REAL;
     info->mem_mode = PHYSICAL_MEM;
 
 
@@ -52,18 +63,28 @@ static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     {
        extern uint8_t v3_vgabios_start[];
        extern uint8_t v3_vgabios_end[];
-       
-       addr_t vgabios_dst = v3_get_shadow_addr(&(vm->mem_map.base_region), VGABIOS_START);
-       memcpy(V3_VAddr((void *)vgabios_dst), v3_vgabios_start, v3_vgabios_end - v3_vgabios_start);     
+       void * vgabios_dst = 0;
+
+       if (v3_gpa_to_hva(&(vm->cores[0]), VGABIOS_START, (addr_t *)&vgabios_dst) == -1) {
+           PrintError("Could not find VGABIOS destination address\n");
+           return -1;
+       }
+
+       memcpy(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[];
+       void * rombios_dst = 0;
+       
+       if (v3_gpa_to_hva(&(vm->cores[0]), ROMBIOS_START, (addr_t *)&rombios_dst) == -1) {
+           PrintError("Could not find ROMBIOS destination address\n");
+           return -1;
+       }
 
-       addr_t rombios_dst = v3_get_shadow_addr(&(vm->mem_map.base_region), ROMBIOS_START);
-       memcpy(V3_VAddr((void *)rombios_dst), v3_rombios_start, v3_rombios_end - v3_rombios_start);
+       memcpy(rombios_dst, v3_rombios_start, v3_rombios_end - v3_rombios_start);
     }
 
     return 0;