Changeset 90429 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Jul 30, 2021 1:58:59 PM (3 years ago)

Author:

vboxsync

Message:

Intel IOMMU: Fixed buggy status code handling in DMAR_LOCK_RET. bugref:9967 bugref:6695

File:

• trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp

@@ -59 +59 @@
 #define DMAR_LOCK_RET(a_pDevIns, a_pThisCC, a_rcBusy) \
     do { \
-        if ((a_pThisCC)->CTX_SUFF(pIommuHlp)->pfnLock((a_pDevIns), (a_rcBusy)) == VINF_SUCCESS) \
+        int const rcLock = (a_pThisCC)->CTX_SUFF(pIommuHlp)->pfnLock((a_pDevIns), (a_rcBusy)); \
+        if (RT_LIKELY(rcLock == VINF_SUCCESS)) \
         { /* likely */ } \
         else \
-            return (a_rcBusy); \
+            return rcLock; \
     } while (0)