X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=18d183b8cef6a9cd5de11b537fd5b4f529bc1f3f;hb=381d76bf7d07e428b66672b766e93837dca67d3a;hp=d2e3a79f7b295ad4e9248e42c58188ca1cb0fc43;hpb=c4e343e346404fcc7674dcfa32e588a282be0f86;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index d2e3a79..18d183b 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -33,6 +33,13 @@
 #include <palacios/vmx_io.h>
 #include <palacios/vmx_msr.h>
 
+
+#ifndef CONFIG_DEBUG_VMX
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
+
 static addr_t host_vmcs_ptrs[CONFIG_MAX_CPUS] = { [0 ... CONFIG_MAX_CPUS - 1] = 0};
 
 
@@ -341,7 +348,7 @@ static int init_vmcs_bios(struct guest_info * info, struct vmx_data * vmx_state)
 #define VMXASSIST_GDT   0x10000
 	addr_t vmxassist_gdt = 0;
 
-	if (guest_pa_to_host_va(info, VMXASSIST_GDT, &vmxassist_gdt) == -1) {
+	if (v3_gpa_to_hva(info, VMXASSIST_GDT, &vmxassist_gdt) == -1) {
 	    PrintError("Could not find VMXASSIST GDT destination\n");
 	    return -1;
 	}
@@ -375,7 +382,7 @@ static int init_vmcs_bios(struct guest_info * info, struct vmx_data * vmx_state)
 	extern uint8_t v3_vmxassist_end[];
 	addr_t vmxassist_dst = 0;
 
-	if (guest_pa_to_host_va(info, VMXASSIST_START, &vmxassist_dst) == -1) {
+	if (v3_gpa_to_hva(info, VMXASSIST_START, &vmxassist_dst) == -1) {
 	    PrintError("Could not find VMXASSIST destination\n");
 	    return -1;
 	}
@@ -661,7 +668,6 @@ int v3_vmx_enter(struct guest_info * info) {
     // We do timer injection here to track real host time.
     rdtscll(tmp_tsc);
     v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
-    info->time_state.cached_hlt_tsc = 0;
     rdtscll(info->time_state.cached_host_tsc);
 
     if (info->vm_info->run_state == VM_STOPPED) {