X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=38cfb70a787049a921e793599977a5bc832df381;hp=374c1a511d53d8480b2bd0f4a21100e7a6027012;hb=60ad6a41c6d0ee08ed689e8505eb0c3df0c2a289;hpb=d240aa16811174593dc6e6ca9c796db05948c353

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 374c1a5..38cfb70 100644
--- 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);
     }