Changeset 47988 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Aug 22, 2013 1:01:54 PM (11 years ago)

Author:

vboxsync

Message:

Solaris reads MSR_RAPL_POWER_UNIT, give it some fake values.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (2 diffs)
• IEMAllCImpl.cpp.h (modified) (1 diff)

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

@@ -1103 +1103 @@
         case MSR_IA32_MC0_CTL:
         case MSR_IA32_MC0_STATUS:
+        case MSR_RAPL_POWER_UNIT:
             *puValue = 0;
             if (CPUMGetGuestCpuVendor(pVCpu->CTX_SUFF(pVM)) != CPUMCPUVENDOR_INTEL)
@@ -1108 +1109 @@
                 Log(("MSR %#x is Intel, the virtual CPU isn't an Intel one -> #GP\n", idMsr));
                 rc = VERR_CPUM_RAISE_GP_0;
+                break;
+            }
+
+            /* Provide more plausive values for some of them. */
+            switch (idMsr)
+            {
+                case MSR_RAPL_POWER_UNIT:
+                    *puValue = RT_MAKE_U32_FROM_U8(3 /* power units (1/8 W)*/,
+                                                   16 /* 15.3 micro-Joules */,
+                                                   10 /* 976 microseconds increments */,
+                                                   0);
+                    break;
             }
             break;

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -4668 +4668 @@
     if (rc != VINF_SUCCESS)
     {
+#ifdef IN_RING3
+        static uint32_t s_cTimes = 0;
+        if (s_cTimes++ < 10)
+            LogRel(("IEM: rdmsr(%#x) -> GP(0)\n", pCtx->ecx));
+#endif
         Log(("IEM: rdmsr(%#x) -> GP(0)\n", pCtx->ecx));
         AssertMsgReturn(rc == VERR_CPUM_RAISE_GP_0, ("%Rrc\n", rc), VERR_IPE_UNEXPECTED_STATUS);