Semi-functional SMP (boots Kitten guest with two cores)

[palacios.git] / palacios / src / palacios / vmx.c

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index d2e3a79..b9f99bd 100644 (file)
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -341,7 +341,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 +375,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 +661,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) {