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

Timestamp:

Apr 9, 2018 2:14:17 PM (7 years ago)

Author:

vboxsync

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

121872

Message:

Msi: Some R3 prefixes and some clenaup.

File:

• trunk/src/VBox/Devices/Bus/MsixCommon.cpp (modified) (5 diffs)

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

@@ -102 +102 @@
 }
 
-DECLINLINE(bool)      msixIsPending(PPDMPCIDEV pDev, uint32_t iVector)
+#ifdef IN_RING3
+
+DECLINLINE(bool)      msixR3IsPending(PPDMPCIDEV pDev, uint32_t iVector)
 {
     return (*msixPendingByte(pDev, iVector) & (1 << (iVector & 0x7))) != 0;
 }
 
-static void msixCheckPendingVector(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPDMPCIDEV pDev, uint32_t iVector)
-{
-    if (msixIsPending(pDev, iVector) && !msixIsVectorMasked(pDev, iVector))
+static void msixR3CheckPendingVector(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPDMPCIDEV pDev, uint32_t iVector)
+{
+    if (msixR3IsPending(pDev, iVector) && !msixIsVectorMasked(pDev, iVector))
         MsixNotify(pDevIns, pPciHlp, pDev, iVector, 1 /* iLevel */, 0 /*uTagSrc*/);
 }
 
-#ifdef IN_RING3
 
 PDMBOTHCBDECL(int) msixR3MMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
@@ -152 +153 @@
     *(uint32_t *)msixGetPageOffset(pPciDev, off) = *(uint32_t *)pv;
 
-    msixCheckPendingVector(pDevIns, (PCPDMPCIHLP)pPciDev->Int.s.pPciBusPtrR3, pPciDev, off / VBOX_MSIX_ENTRY_SIZE);
+    msixR3CheckPendingVector(pDevIns, (PCPDMPCIHLP)pPciDev->Int.s.pPciBusPtrR3, pPciDev, off / VBOX_MSIX_ENTRY_SIZE);
     return VINF_SUCCESS;
 }
@@ -279 +280 @@
 }
 
-DECLINLINE(bool) msixBitJustCleared(uint32_t uOldValue,
-                                    uint32_t uNewValue,
-                                    uint32_t uMask)
-{
-    return (!!(uOldValue & uMask) && !(uNewValue & uMask));
-}
-
-static void msixCheckPendingVectors(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPDMPCIDEV pDev)
+#ifdef IN_RING3
+
+DECLINLINE(bool) msixR3BitJustCleared(uint32_t uOldValue, uint32_t uNewValue, uint32_t uMask)
+{
+    return !!(uOldValue & uMask) && !(uNewValue & uMask);
+}
+
+
+static void msixR3CheckPendingVectors(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPDMPCIDEV pDev)
 {
     for (uint32_t i = 0; i < msixTableSize(pDev); i++)
-        msixCheckPendingVector(pDevIns, pPciHlp, pDev, i);
+        msixR3CheckPendingVector(pDevIns, pPciHlp, pDev, i);
 }
 
@@ -321 +323 @@
                 u8NewVal = (u8Val & UINT8_C(~0x3f)) | (pDev->abConfig[uAddr] & UINT8_C(0x3f));
                 /* If just enabled globally - check pending vectors */
-                fJustEnabled |= msixBitJustCleared(pDev->abConfig[uAddr], u8NewVal, VBOX_PCI_MSIX_FLAGS_ENABLE >> 8);
-                fJustEnabled |= msixBitJustCleared(pDev->abConfig[uAddr], u8NewVal, VBOX_PCI_MSIX_FLAGS_FUNCMASK >> 8);
+                fJustEnabled |= msixR3BitJustCleared(pDev->abConfig[uAddr], u8NewVal, VBOX_PCI_MSIX_FLAGS_ENABLE >> 8);
+                fJustEnabled |= msixR3BitJustCleared(pDev->abConfig[uAddr], u8NewVal, VBOX_PCI_MSIX_FLAGS_FUNCMASK >> 8);
                 pDev->abConfig[uAddr] = u8NewVal;
                 break;
@@ -335 +337 @@
 
     if (fJustEnabled)
-        msixCheckPendingVectors(pDevIns, pPciHlp, pDev);
-}
-
+        msixR3CheckPendingVectors(pDevIns, pPciHlp, pDev);
+}
+
+#endif /* IN_RING3 */