fixed ins/outs and moved the gs.base save/restore point

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

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 00a9ebd..b9f4a9f 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -301,21 +301,28 @@ static int start_svm_guest(struct guest_info *info) {
 
   while (1) {
     ullong_t tmp_tsc;
+    uint_t vm_cr_low = 0, vm_cr_high = 0;
 
 
     v3_enable_ints();
     v3_clgi();
 
+
     PrintDebug("SVM Entry to rip=%x...\n", info->rip);
 
+    v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low);
+
     rdtscll(info->time_state.cached_host_tsc);
+
     guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
 
     v3_svm_launch((vmcb_t*)V3_PAddr(info->vmm_data), &(info->vm_regs));
-
     rdtscll(tmp_tsc);
+
+    v3_set_msr(0xc0000101, vm_cr_high, vm_cr_low);
     PrintDebug("SVM Returned\n");
-    
+
+
     {
       uint_t x = 0;
       PrintDebug("RSP=%p\n", &x);