Changeset 52770 in vbox

Timestamp:

Sep 17, 2014 11:04:43 AM (10 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Fix EFER WRMSR to ignore EFER.LMA bit, trunk regression caused by r96058.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllMsrs.cpp (modified) (2 diffs)
• CPUMAllRegs.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

@@ -1328 +1328 @@
                                  : 0;
     uint64_t        fMask        = 0;
+    uint64_t        fIgnoreMask  = MSR_K6_EFER_LMA;
 
     /* Filter out those bits the guest is allowed to change. (e.g. LMA is read-only) */
@@ -1340 +1341 @@
 
     /* #GP(0) If anything outside the allowed bits is set. */
-    if ((uValue | fMask) != fMask)
+    if (uValue & ~(fIgnoreMask | fMask))
     {
         Log(("CPUM: Settings disallowed EFER bit. uValue=%#RX64 fAllowed=%#RX64 -> #GP(0)\n", uValue, fMask));

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1417 +1417 @@
                                          : 0;
             uint64_t        fMask        = 0;
+            uint64_t        fIgnoreMask  = MSR_K6_EFER_LMA;
 
             /* Filter out those bits the guest is allowed to change. (e.g. LMA is read-only) */
@@ -1429 +1430 @@
 
             /* #GP(0) If anything outside the allowed bits is set. */
-            if ((uValue | fMask) != fMask)
+            if (uValue & ~(fIgnoreMask | fMask))
             {
                 Log(("CPUM: Settings disallowed EFER bit. uValue=%#RX64 fAllowed=%#RX64 -> #GP(0)\n", uValue, fMask));