Basic HRT startup for HVM, plus assorted cleanup

[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 374c1a5..38cfb70 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -355,6 +355,11 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     }
 #endif
 
+    if (v3_init_vm(vm) == -1) {
+       PrintError(VM_NONE, VCORE_NONE, "Failed to initialize VM\n");
+       return -1;
+    }
+
 #ifdef V3_CONFIG_HVM
     if (v3_init_hvm_vm(vm,vm_cfg)) { 
        PrintError(vm,VCORE_NONE,"Cannot initialize HVM for VM\n");
@@ -362,14 +367,6 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     }
 #endif
 
-
-    if (v3_init_vm(vm) == -1) {
-       PrintError(VM_NONE, VCORE_NONE, "Failed to initialize VM\n");
-       return -1;
-    }
-
-
-
    if (schedule_hz_str) {
        sched_hz = atoi(schedule_hz_str);
     }