X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=18f7ee77323cb16258a1fe831d667f31cefda7d8;hb=b1aec98739d57c1bc4d1834414a0206eb37aab92;hp=f1d0939db22a69ba5aca4d693c725dce661fdbd0;hpb=7ded4d4eee46a7bccff35de9e4438fd94624547f;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index f1d0939..18f7ee7 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -31,6 +31,7 @@
 #include <palacios/vmm_direct_paging.h>
 #include <palacios/vmx_io.h>
 #include <palacios/vmx_msr.h>
+#include <palacios/vmm_decoder.h>
 
 #include <palacios/vmx_ept.h>
 #include <palacios/vmx_assist.h>
@@ -758,7 +759,9 @@ int v3_vmx_enter(struct guest_info * info) {
     v3_update_timers(info);
 
     if (vmcs_store() != vmx_info->vmcs_ptr_phys) {
+	vmcs_clear(vmx_info->vmcs_ptr_phys);
 	vmcs_load(vmx_info->vmcs_ptr_phys);
+	vmx_info->state = VMX_UNLAUNCHED;
     }
 
     v3_vmx_restore_vmcs(info);
@@ -786,6 +789,7 @@ int v3_vmx_enter(struct guest_info * info) {
     check_vmcs_write(VMCS_TSC_OFFSET_HIGH, tsc_offset_high);
     check_vmcs_write(VMCS_TSC_OFFSET, tsc_offset_low);
 
+
     if (v3_update_vmcs_host_state(info)) {
 	v3_enable_ints();
         PrintError("Could not write host state\n");
@@ -795,6 +799,7 @@ int v3_vmx_enter(struct guest_info * info) {
 
     if (vmx_info->state == VMX_UNLAUNCHED) {
 	vmx_info->state = VMX_LAUNCHED;
+
 	info->vm_info->run_state = VM_RUNNING;
 	ret = v3_vmx_launch(&(info->vm_regs), info, &(info->ctrl_regs));
     } else {
@@ -871,7 +876,7 @@ int v3_vmx_enter(struct guest_info * info) {
     v3_yield_cond(info);
 
     if (v3_handle_vmx_exit(info, &exit_info) == -1) {
-	PrintError("Error in VMX exit handler\n");
+	PrintError("Error in VMX exit handler (Exit reason=%x)\n", exit_info.exit_reason);
 	return -1;
     }
 
@@ -916,6 +921,36 @@ int v3_start_vmx_guest(struct guest_info * info) {
 	}
 
 	if (v3_vmx_enter(info) == -1) {
+
+  addr_t host_addr;
+            addr_t linear_addr = 0;
+            
+            info->vm_info->run_state = VM_ERROR;
+            
+            V3_Print("VMX core %u: VMX ERROR!!\n", info->vcpu_id); 
+            
+            v3_print_guest_state(info);
+            
+            V3_Print("VMX core %u\n", info->vcpu_id); 
+            
+
+            
+            linear_addr = get_addr_linear(info, info->rip, &(info->segments.cs));
+            
+            if (info->mem_mode == PHYSICAL_MEM) {
+                v3_gpa_to_hva(info, linear_addr, &host_addr);
+            } else if (info->mem_mode == VIRTUAL_MEM) {
+                v3_gva_to_hva(info, linear_addr, &host_addr);
+            }
+            
+            V3_Print("VMX core %u: Host Address of rip = 0x%p\n", info->vcpu_id, (void *)host_addr);
+            
+            V3_Print("VMX core %u: Instr (15 bytes) at %p:\n", info->vcpu_id, (void *)host_addr);
+            v3_dump_mem((uint8_t *)host_addr, 15);
+            
+            v3_print_stack(info);
+
+
 	    v3_print_vmcs();
 	    print_exit_log(info);
 	    return -1;