Changeset 106640 in vbox

Timestamp:

Oct 24, 2024 12:31:41 AM (4 months ago)

Author:

vboxsync

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

165482

Message:

SUPDrv: Some tiny fixes and cleanup. jiraref:VBP-1253

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.cpp (modified) (5 diffs)
• SUPDrvGip.cpp (modified) (3 diffs)
• SUPLibAll.cpp (modified) (3 diffs)

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

@@ -2580 +2580 @@
         }
 
-#endif /* !defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86) */
+#endif /* defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) */
 
         default:
@@ -2667 +2667 @@
             return 0;
         }
-#endif /* !defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86) */
+#endif /* defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) */
 
         default:
@@ -4227 +4227 @@
     }
     return enmMode;
-#else
+
+#elif defined(RT_ARCH_ARM64)
     /** @todo portme? */
     return SUPPAGINGMODE_INVALID;
+
+#else
+# error "port me"
 #endif
 }
@@ -4807 +4811 @@
     int rc;
     RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
-    NOREF(fForce);
+    RT_NOREF_PV(fForce);
 
     /*
@@ -4898 +4902 @@
 SUPR0_EXPORT_SYMBOL(SUPR0GetHwvirtMsrs);
 
-#endif /* !defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86) */
+#endif /* defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) */
 
 

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -214 +214 @@
     RT_NOREF(pGip);
     return (uint32_t)ASMGetThreadIdRoEL0();
+
 #else
 # error "port me"
@@ -264 +265 @@
 #elif defined(RT_ARCH_ARM64) && defined(RT_OS_WINDOWS)
     return (uint32_t)ASMGetThreadIdRoEL0();
+
 #else
 # error "port me"
@@ -373 +375 @@
 
     AssertMsg(idCpu == RTMpCpuId(), ("idCpu=%#x RTMpCpuId()=%#x\n", idCpu, RTMpCpuId())); /* paranoia^3 */
-
 
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)

trunk/src/VBox/HostDrivers/Support/SUPLibAll.cpp

@@ -101 +101 @@
         for (;;)
         {
-            uint16_t cbLim = ASMGetIdtrLimit();
+            uint16_t const cbLim = ASMGetIdtrLimit();
             uTsc = ASMReadTSC();
             if (RT_LIKELY(ASMGetIdtrLimit() == cbLim))
@@ -124 +124 @@
         for (;;)
         {
-            uint32_t idApic = ASMGetApicIdExt0B();
+            uint32_t const idApic = ASMGetApicIdExt0B();
             uTsc = ASMReadTSC();
             if (RT_LIKELY(ASMGetApicIdExt0B() == idApic))
@@ -145 +145 @@
         for (;;)
         {
-            uint32_t idApic = ASMGetApicIdExt8000001E();
+            uint32_t const idApic = ASMGetApicIdExt8000001E();
             uTsc = ASMReadTSC();
             if (RT_LIKELY(ASMGetApicIdExt8000001E() == idApic))