X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=544b8488e8ef276aaddadb84462b1a1b1d8aefe9;hb=4d1d8fadad33de7d3ebce2083d9782048f78b44e;hp=daf8eeea08c6c285859915944c075528163f24d6;hpb=cfc3d544077dfbcc8b407fef7b76fa4c4b30f300;p=palacios.git

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index daf8eee..544b848 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -546,7 +546,10 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
     vmx_ret |= check_vmcs_write(VMCS_LINK_PTR_HIGH, (addr_t)0xffffffffUL);
 #endif
 
-
+    if (vmx_ret != VMX_SUCCESS) { 
+	PrintError(core->vm_info, core, "Error configuring VMX\n");
+	return -1;
+    }
 
  
 
@@ -621,6 +624,11 @@ static void __init_vmx_vmcs(void * arg) {
     PrintDebug(core->vm_info, core, "Serializing VMCS: %p\n", (void *)vmx_state->vmcs_ptr_phys);
     vmx_ret = vmcs_clear(vmx_state->vmcs_ptr_phys);
 
+    if (vmx_ret != VMX_SUCCESS) { 
+	PrintError(core->vm_info,core,"VMCS Clear failed\n");
+	return;
+    }
+
     core->core_run_state = CORE_STOPPED;
     return;
 }
@@ -1198,6 +1206,13 @@ int v3_start_vmx_guest(struct guest_info * info) {
 
     PrintDebug(info->vm_info, info, "Starting VMX core %u\n", info->vcpu_id);
 
+#ifdef V3_CONFIG_MULTIBOOT
+    if (v3_setup_multiboot_core_for_boot(info)) { 
+	PrintError(info->vm_info, info, "Failed to setup Multiboot core...\n");
+	return -1;
+    }
+#endif
+
 #ifdef V3_CONFIG_HVM
     if (v3_setup_hvm_hrt_core_for_boot(info)) { 
 	PrintError(info->vm_info, info, "Failed to setup HRT core...\n");
@@ -1252,6 +1267,18 @@ int v3_start_vmx_guest(struct guest_info * info) {
 	}
 	
 	
+#ifdef V3_CONFIG_HVM
+        if (v3_handle_hvm_reset(info) > 0) {
+	    continue;
+        }
+#endif
+	
+#ifdef V3_CONFIG_MULTIBOOT
+        if (v3_handle_multiboot_reset(info) > 0) {
+	    continue;
+        }
+#endif
+
 #ifdef V3_CONFIG_PMU_TELEMETRY
 	v3_pmu_telemetry_start(info);
 #endif