Changeset 72386 in vbox

Timestamp:

May 29, 2018 2:59:15 PM (7 years ago)

Author:

vboxsync

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

122846

Message:

NEM/win: intel MSR register import/export adjustments. bugref:9044

File:

• trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp

@@ -1154 +1154 @@
         iReg++;
 
+#if 0 /** @todo Why can't we write these on Intel systems? Not that we really care... */
         const CPUMCPUVENDOR enmCpuVendor = CPUMGetHostCpuVendor(pGVM->pVM);
         if (enmCpuVendor != CPUMCPUVENDOR_AMD)
@@ -1166 +1167 @@
             iReg++;
         }
+#endif
     }
 
@@ -1456 +1458 @@
     }
 
+#ifdef LOG_ENABLED
     const CPUMCPUVENDOR enmCpuVendor = CPUMGetHostCpuVendor(pGVM->pVM);
+#endif
     if (fWhat & CPUMCTX_EXTRN_OTHER_MSRS)
     {
@@ -1476 +1480 @@
         pInput->Names[iReg++] = HvX64RegisterMtrrFix4kF0000;
         pInput->Names[iReg++] = HvX64RegisterMtrrFix4kF8000;
+#if 0 /** @todo why can't we read HvX64RegisterIa32MiscEnable? */
         if (enmCpuVendor != CPUMCPUVENDOR_AMD)
-        {
             pInput->Names[iReg++] = HvX64RegisterIa32MiscEnable;
+#endif
 #ifdef LOG_ENABLED
+        if (enmCpuVendor != CPUMCPUVENDOR_AMD)
             pInput->Names[iReg++] = HvX64RegisterIa32FeatureControl;
 #endif
-        }
     }
 
@@ -2043 +2048 @@
         iReg++;
 
+#if 0 /** @todo why can't we even read HvX64RegisterIa32MiscEnable? */
         if (enmCpuVendor != CPUMCPUVENDOR_AMD)
         {
@@ -2050 +2056 @@
             pCtxMsrs->msr.MiscEnable = paValues[iReg].Reg64;
             iReg++;
+        }
+#endif
 #ifdef LOG_ENABLED
+        if (enmCpuVendor != CPUMCPUVENDOR_AMD)
+        {
             Assert(pInput->Names[iReg] == HvX64RegisterIa32FeatureControl);
             if (paValues[iReg].Reg64 != CPUMGetGuestIa32FeatureControl(pVCpu))
                 Log7(("NEM/%u: MSR FEATURE_CONTROL changed %RX64 -> %RX64 (!!)\n", pVCpu->idCpu, CPUMGetGuestIa32FeatureControl(pVCpu), paValues[iReg].Reg64));
             iReg++;
+        }
 #endif
-        }
-
-        /** @todo we don't save state for HvX64RegisterIa32FeatureControl */
     }