Changeset 64310 in vbox for trunk/src/VBox

Timestamp:

Oct 18, 2016 10:23:35 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

111366

Message:

VMM/GIM/KVM: Don't GP fault on invalid time-struct MSR write

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GIMAllKvm.cpp (modified) (2 diffs)
• VMMR3/GIMKvm.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/GIMAllKvm.cpp ¶

@@ -275 +275 @@
 
             /* Is the system-time struct. already enabled? If so, get flags that need preserving. */
-            /*uint8_t fFlags = 0; - unused */
             GIMKVMSYSTEMTIME SystemTime;
             RT_ZERO(SystemTime);
@@ -294 +293 @@
             {
                 pKvmCpu->u64SystemTimeMsr = 0;
-                return VERR_CPUM_RAISE_GP_0;
+                /* We shouldn't throw a #GP(0) here for buggy guests (neither does KVM apparently), see @bugref{8627}. */
             }
             return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR3/GIMKvm.cpp ¶

@@ -284 +284 @@
     {
         PCGIMKVMCPU pKvmCpu = &pVM->aCpus[i].gim.s.u.KvmCpu;
-
-        /* Guest may alter flags (namely GIM_KVM_SYSTEM_TIME_FLAGS_GUEST_PAUSED bit). So re-read them from guest-memory. */
-        GIMKVMSYSTEMTIME SystemTime;
-        RT_ZERO(SystemTime);
-        if (MSR_GIM_KVM_SYSTEM_TIME_IS_ENABLED(pKvmCpu->u64SystemTimeMsr))
-        {
-            int rc = PGMPhysSimpleReadGCPhys(pVM, &SystemTime, pKvmCpu->GCPhysSystemTime, sizeof(GIMKVMSYSTEMTIME));
-            AssertRCReturn(rc, rc);
-        }
-
         SSMR3PutU64(pSSM, pKvmCpu->u64SystemTimeMsr);
         SSMR3PutU64(pSSM, pKvmCpu->uTsc);
@@ -299 +289 @@
         SSMR3PutGCPhys(pSSM, pKvmCpu->GCPhysSystemTime);
         SSMR3PutU32(pSSM, pKvmCpu->u32SystemTimeVersion);
-        SSMR3PutU8(pSSM, SystemTime.fFlags);
+        SSMR3PutU8(pSSM, pKvmCpu->fSystemTimeFlags);
     }
 
@@ -359 +349 @@
             Assert(!TMVirtualIsTicking(pVM));       /* paranoia. */
             Assert(!TMCpuTickIsTicking(pVCpu));
-            rc = gimR3KvmEnableSystemTime(pVM, pVCpu);
-            AssertRCReturn(rc, rc);
+            gimR3KvmEnableSystemTime(pVM, pVCpu);
         }
     }