Fix to the HLT exit handler

[palacios.git] / palacios / src / palacios / vmm_config.c

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index cc3e431..39c4d49 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -28,18 +28,13 @@
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_cpuid.h>
 #include <palacios/vmm_xml.h>
+#include <palacios/vmm_io.h>
+#include <palacios/vmm_msr.h>
+
 
-#include <palacios/svm.h>
-#include <palacios/vmx.h>
 
-#ifdef CONFIG_SYMBIOTIC
-#include <palacios/vmm_sym_iface.h>
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-#include <palacios/vmm_sym_swap.h>
-#endif
 
-#endif
 
 
 #include <palacios/vmm_host_events.h>
@@ -189,6 +184,8 @@ static struct v3_config * parse_config(void * cfg_blob) {
 }
 
 static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
+
+
     char * memory_str = v3_cfg_val(vm_cfg, "memory");
     char * schedule_hz_str = v3_cfg_val(vm_cfg, "schedule_hz");
     char * vm_class = v3_cfg_val(vm_cfg, "class");
@@ -211,6 +208,7 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
        return -1;
     }
 
+
 #ifdef CONFIG_TELEMETRY
     {
        char * telemetry = v3_cfg_val(vm_cfg, "telemetry");
@@ -224,31 +222,13 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     }
 #endif
 
-    v3_init_hypercall_map(vm);
-    v3_init_io_map(vm);
-    v3_init_msr_map(vm);
-    v3_init_cpuid_map(vm);
-    v3_init_host_events(vm);
-    v3_init_intr_routers(vm);
-
-    // Initialize the memory map
-    if (v3_init_mem_map(&(vm->cores[0])) == -1) {
-       PrintError("Could not initialize shadow map\n");
+    if (v3_init_vm(vm) == -1) {
+       PrintError("Failed to initialize VM\n");
        return -1;
     }
 
-#ifdef CONFIG_SYMBIOTIC
-    v3_init_sym_iface(vm);
-#endif
-
-    v3_init_dev_mgr(vm);
 
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    PrintDebug("initializing symbiotic swap\n");
-    v3_init_sym_swap(vm);
-#endif
-
    if (schedule_hz_str) {
        sched_hz = atoi(schedule_hz_str);
     }
@@ -263,16 +243,9 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
 
 static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
     extern v3_cpu_arch_t v3_cpu_types[];
-    char * paging = v3_cfg_val(core_cfg, "paging");
+    v3_cfg_tree_t * paging_cfg = v3_cfg_subtree(core_cfg, "paging");
+    char * paging = v3_cfg_val(paging_cfg, "mode");
 
-    /*
-     * Initialize the subsystem data strutures
-     */
-#ifdef CONFIG_TELEMETRY
-    if (info->vm_info->enable_telemetry) {
-       v3_init_telemetry(info);
-    }
-#endif
 
     
     if ((v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) && 
@@ -281,18 +254,12 @@ static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
        info->shdw_pg_mode = NESTED_PAGING;
     } else {
        PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
-       v3_init_shadow_page_state(info);
+
        info->shdw_pg_mode = SHADOW_PAGING;
     }
 
 
-
-    v3_init_time(info);
-    v3_init_intr_controllers(info);
-    v3_init_exception_state(info);
-
-    v3_init_decoder(info);
-    
+    v3_init_core(info);
 
 
     if (info->vm_info->vm_class == V3_PC_VM) {
@@ -403,8 +370,18 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
 
     cores_cfg = v3_cfg_subtree(cfg_data->cfg, "cores");
 
+    if (!cores_cfg) {
+       PrintError("Could not find core configuration (new config format required)\n");
+       return NULL;
+    }
+
     num_cores = atoi(v3_cfg_val(cores_cfg, "count"));
 
+    if (num_cores == 0) {
+       PrintError("No cores specified in configuration\n");
+       return NULL;
+    }
+
     V3_Print("Configuring %d cores\n", num_cores);
 
     vm = allocate_guest(num_cores);    
@@ -437,28 +414,6 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
 
        pre_config_core(info, per_core_cfg);
 
-       // init SVM/VMX
-#ifdef CONFIG_SVM
-       if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) {
-           if (v3_init_svm_vmcb(info, vm->vm_class) == -1) {
-               PrintError("Error in SVM initialization\n");
-               return NULL;
-           }
-       }
-#endif
-#ifdef CONFIG_VMX
-       else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
-           if (v3_init_vmx_vmcs(info, vm->vm_class) == -1) {
-               PrintError("Error in VMX initialization\n");
-               return NULL;
-           }
-       }
-#endif
-       else {
-           PrintError("Invalid CPU Type\n");
-           return NULL;
-       }
-       
        per_core_cfg = v3_cfg_next_branch(per_core_cfg);
     }
 
@@ -500,7 +455,7 @@ static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        addr_t host_addr = atox(v3_cfg_val(mem_region, "host_addr"));
 
     
-       if (v3_add_shadow_mem(vm, start_addr, end_addr, host_addr) == -1) {
+       if (v3_add_shadow_mem(vm, V3_MEM_CORE_ANY, start_addr, end_addr, host_addr) == -1) {
            PrintError("Could not map memory region: %p-%p => %p\n", 
                       (void *)start_addr, (void *)end_addr, (void *)host_addr);
            return -1;