Changeset 49728 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Nov 29, 2013 2:12:56 PM (11 years ago)

Author:

vboxsync

Message:

MSR prober fixes.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -5189 +5189 @@
             else if (rc == VERR_ACCESS_DENIED)
             {
-                pReq->u.Out.uResults.Read.fGp    = true;
+                pReq->u.Out.uResults.Write.fGp   = true;
                 rc  = VINF_SUCCESS;
             }

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -868 +868 @@
 
     if (idCpu == NIL_RTCPUID)
-        idCpu = RTMpCpuId();
-    else if (!RTMpIsCpuOnline(idCpu))
+        rc = rdmsr_safe(uMsr, &u32Low, &u32High);
+    else if (RTMpIsCpuOnline(idCpu))
+        rc = rdmsr_safe_on_cpu(idCpu, uMsr, &u32Low, &u32High);
+    else
         return VERR_CPU_OFFLINE;
-    rc = rdmsr_safe_on_cpu(idCpu, uMsr, &u32Low, &u32High);
-    if (rc >= 0)
+    if (rc == 0)
     {
         *puValue = RT_MAKE_U64(u32Low, u32High);
@@ -890 +891 @@
 
     if (idCpu == NIL_RTCPUID)
-        idCpu = RTMpCpuId();
-    else if (!RTMpIsCpuOnline(idCpu))
+        rc = wrmsr_safe(uMsr, RT_LODWORD(uValue), RT_HIDWORD(uValue));
+    else if (RTMpIsCpuOnline(idCpu))
+        rc = wrmsr_safe_on_cpu(idCpu, uMsr, RT_LODWORD(uValue), RT_HIDWORD(uValue));
+    else
         return VERR_CPU_OFFLINE;
-    rc = wrmsr_safe_on_cpu(idCpu, uMsr, RT_LODWORD(uValue), RT_HIDWORD(uValue));
-    if (rc >= 0)
+    if (rc == 0)
         return VINF_SUCCESS;
     return VERR_ACCESS_DENIED;
@@ -958 +960 @@
     pReq->u.Out.uResults.Modify.uWritten   = uWritten;
     pReq->u.Out.uResults.Modify.uAfter     = uAfter;
-    pReq->u.Out.uResults.Modify.fBeforeGp  = rcBefore  < 0;
-    pReq->u.Out.uResults.Modify.fModifyGp  = rcWrite   < 0;
-    pReq->u.Out.uResults.Modify.fAfterGp   = rcAfter   < 0;
-    pReq->u.Out.uResults.Modify.fRestoreGp = rcRestore < 0;
+    pReq->u.Out.uResults.Modify.fBeforeGp  = rcBefore  != 0;
+    pReq->u.Out.uResults.Modify.fModifyGp  = rcWrite   != 0;
+    pReq->u.Out.uResults.Modify.fAfterGp   = rcAfter   != 0;
+    pReq->u.Out.uResults.Modify.fRestoreGp = rcRestore != 0;
     RT_ZERO(pReq->u.Out.uResults.Modify.afReserved);
 }