Changeset 10202

Timestamp:

07/04/08 09:25:27 (2 months ago)

Author:

vboxsync

Message:

removed VBOX_WITH_PDM_LOCK

Files:

• trunk/Config.kmk (modified) (1 diff)
• trunk/include/VBox/pdmdev.h (modified) (24 diffs)
• trunk/src/VBox/Devices/Bus/DevPCI.cpp (modified) (2 diffs)
• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (6 diffs)
• trunk/src/VBox/Devices/PC/DevPIC.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/PDM.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/PDMDevice.cpp (modified) (25 diffs)
• trunk/src/VBox/VMM/PDMInternal.h (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMAll/PDMAll.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp (modified) (16 diffs)
• trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (16 diffs)
• trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -771 +771 @@
-endif
-## @todo eliminate these guys.
-ifdef VBOX_WITH_PDM_LOCK
- DEFS += VBOX_WITH_PDM_LOCK
-endif
-ifdef VBOX_WITH_INTERNAL_NETWORKING
-DEFS += VBOX_WITH_INTERNAL_NETWORKING

trunk/include/VBox/pdmdev.h

@@ -532 +532 @@
-    DECLGCCALLBACKMEMBER(void,  pfnIoApicSetIrq,(PPDMDEVINS pDevIns, int iIrq, int iLevel));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -549 +548 @@
-     */
-    DECLGCCALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-
+
-    /** Just a safety precaution. */
-    uint32_t                    u32TheEnd;
@@ -590 +589 @@
-    DECLR0CALLBACKMEMBER(void,  pfnIoApicSetIrq,(PPDMDEVINS pDevIns, int iIrq, int iLevel));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -607 +605 @@
-     */
-    DECLR0CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-#endif
-
-    /** Just a safety precaution. */
@@ -682 +679 @@
-    DECLR3CALLBACKMEMBER(PCPDMPCIHLPR0, pfnGetR0Helpers,(PPDMDEVINS pDevIns));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -699 +695 @@
-     */
-    DECLR3CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-#endif
-
-    /** Just a safety precaution. */
@@ -776 +771 @@
-    DECLGCCALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -793 +787 @@
-     */
-    DECLGCCALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-
+
-    /** Just a safety precaution. */
-    uint32_t                u32TheEnd;
@@ -829 +823 @@
-    DECLR0CALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -846 +839 @@
-     */
-    DECLR0CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-#endif
-
-    /** Just a safety precaution. */
@@ -882 +874 @@
-    DECLR3CALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -899 +890 @@
-     */
-    DECLR3CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-#endif
-
-    /**
@@ -1070 +1060 @@
-    DECLGCCALLBACKMEMBER(void, pfnChangeFeature,(PPDMDEVINS pDevIns, bool fEnabled));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -1087 +1076 @@
-     */
-    DECLGCCALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-
+
-    /** Just a safety precaution. */
-    uint32_t                u32TheEnd;
@@ -1130 +1119 @@
-    DECLR0CALLBACKMEMBER(void, pfnChangeFeature,(PPDMDEVINS pDevIns, bool fEnabled));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -1147 +1135 @@
-     */
-    DECLR0CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-#endif
-
-    /** Just a safety precaution. */
@@ -1190 +1177 @@
-    DECLR3CALLBACKMEMBER(void, pfnChangeFeature,(PPDMDEVINS pDevIns, bool fEnabled));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -1207 +1193 @@
-     */
-    DECLR3CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-#endif
-
-    /**
@@ -1298 +1283 @@
-                                                  uint8_t iVector, uint8_t u8Polarity, uint8_t u8TriggerMode));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -1315 +1299 @@
-     */
-    DECLGCCALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-#endif
-
-    /** Just a safety precaution. */
@@ -1354 +1337 @@
-                                                  uint8_t iVector, uint8_t u8Polarity, uint8_t u8TriggerMode));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -1371 +1353 @@
-     */
-    DECLR0CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-#endif
-
-    /** Just a safety precaution. */
@@ -1409 +1390 @@
-                                                  uint8_t iVector, uint8_t u8Polarity, uint8_t u8TriggerMode));
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /**
-     * Acquires the PDM lock.
@@ -1426 +1406 @@
-     */
-    DECLR3CALLBACKMEMBER(void,  pfnUnlock,(PPDMDEVINS pDevIns));
-#endif
-
-    /**

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

@@ -66 +66 @@
-/** @def PCI_UNLOCK
- * Releases the PDM lock. This is a NOP if locking is disabled. */
-
-
+
-    do { \
-        int rc2 = PDMINS2DATA(pDevIns, PCIBus *)->CTXALLSUFF(pPciHlp)->pfnLock((pDevIns), rc); \
@@ -73 +72 @@
-            return rc2; \
-    } while (0)
- 
+
-    PDMINS2DATA(pDevIns, PCIBus *)->CTXALLSUFF(pPciHlp)->pfnUnlock(pDevIns)
-#else /* !VBOX_WITH_PDM_LOCK */
-# define PCI_LOCK(pThis, rc)   do { } while (0)
-# define PCI_UNLOCK(pThis)     do { } while (0)
-#endif /* !VBOX_WITH_PDM_LOCK */
-
-

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -62 +62 @@
-/** @def IOAPIC_UNLOCK
- * Releases the PDM lock. This is a NOP if locking is disabled. */
-
-
+
-    do { \
-        int rc2 = (pThis)->CTXALLSUFF(pApicHlp)->pfnLock((pThis)->CTXSUFF(pDevIns), rc); \
@@ -69 +68 @@
-            return rc2; \
-    } while (0)
- 
+
-    (pThis)->CTXALLSUFF(pApicHlp)->pfnUnlock((pThis)->CTXSUFF(pDevIns))
- 
+
-    do { \
-        int rc2 = (pThis)->CTXALLSUFF(pIoApicHlp)->pfnLock((pThis)->CTXSUFF(pDevIns), rc); \
@@ -77 +76 @@
-            return rc2; \
-    } while (0)
-
-
-
-
-
-
-
+
-
-
@@ -828 +821 @@
-{
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
-# ifdef VBOX_WITH_PDM_LOCK
-    s->pApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
-# endif
-#endif /* VBOX */
-
@@ -1610 +1601 @@
-{
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
-#ifdef VBOX_WITH_PDM_LOCK
-    s->pApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
-#endif
-    apic_reset(s);
-    /* Clear any pending APIC interrupt action flag. */
@@ -1956 +1945 @@
-{
-    IOAPICState *s = PDMINS2DATA(pDevIns, IOAPICState *);
-#ifdef VBOX_WITH_PDM_LOCK
-    s->pIoApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
-#endif
-    ioapic_reset(s);
-    IOAPIC_UNLOCK(s);

trunk/src/VBox/Devices/PC/DevPIC.cpp

@@ -38 +38 @@
-/** @def PIC_UNLOCK
- * Releases the PDM lock. This is a NOP if locking is disabled. */
-
-
+
-    do { \
-        int rc2 = (pThis)->CTXALLSUFF(pPicHlp)->pfnLock((pThis)->CTXSUFF(pDevIns), rc); \
@@ -45 +44 @@
-            return rc2; \
-    } while (0)
- 
+
-    (pThis)->CTXALLSUFF(pPicHlp)->pfnUnlock((pThis)->CTXSUFF(pDevIns))
-#else /* !VBOX_WITH_PDM_LOCK */
-# define PIC_LOCK(pThis, rc)   do { } while (0)
-# define PIC_UNLOCK(pThis)     do { } while (0)
-#endif /* !VBOX_WITH_PDM_LOCK */
-
-
@@ -890 +885 @@
-    unsigned    i;
-    LogFlow(("picReset:\n"));
-#ifdef VBOX_WITH_PDM_LOCK
-    pData->pPicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
-#endif
-
-    for (i = 0; i < ELEMENTS(pData->aPics); i++)

trunk/src/VBox/VMM/PDM.cpp

@@ -194 +194 @@
-    if (VBOX_SUCCESS(rc))
-    {
-#ifdef VBOX_WITH_PDM_LOCK
-        rc = PDMR3CritSectInit(pVM, &pVM->pdm.s.CritSect, "PDM");
-        if (VBOX_SUCCESS(rc))
-#endif
-            rc = pdmR3LdrInitU(pVM->pUVM);
-        if (VBOX_SUCCESS(rc))
@@ -453 +451 @@
-    pdmR3LdrTermU(pVM->pUVM);
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /*
-     * Destroy the PDM lock.
-     */
-    PDMR3CritSectDelete(&pVM->pdm.s.CritSect);
-#endif
-
-    LogFlow(("PDMR3Term: returns %Vrc\n", VINF_SUCCESS));
@@ -1189 +1185 @@
-PDMR3DECL(int) PDMR3LockCall(PVM pVM)
-{
-#ifdef VBOX_WITH_PDM_LOCK
-    return PDMR3CritSectEnterEx(&pVM->pdm.s.CritSect, true /* fHostCall */);
-
-
-
-
-
+
+

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -220 +220 @@
-static DECLCALLBACK(void) pdmR3PicHlp_SetInterruptFF(PPDMDEVINS pDevIns);
-static DECLCALLBACK(void) pdmR3PicHlp_ClearInterruptFF(PPDMDEVINS pDevIns);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmR3PicHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmR3PicHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-static DECLCALLBACK(PCPDMPICHLPGC) pdmR3PicHlp_GetGCHelpers(PPDMDEVINS pDevIns);
-static DECLCALLBACK(PCPDMPICHLPR0) pdmR3PicHlp_GetR0Helpers(PPDMDEVINS pDevIns);
@@ -235 +233 @@
-static DECLCALLBACK(void) pdmR3ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns);
-static DECLCALLBACK(void) pdmR3ApicHlp_ChangeFeature(PPDMDEVINS pDevIns, bool fEnabled);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmR3ApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmR3ApicHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-static DECLCALLBACK(PCPDMAPICHLPGC) pdmR3ApicHlp_GetGCHelpers(PPDMDEVINS pDevIns);
-static DECLCALLBACK(PCPDMAPICHLPR0) pdmR3ApicHlp_GetR0Helpers(PPDMDEVINS pDevIns);
@@ -249 +245 @@
-static DECLCALLBACK(void) pdmR3IoApicHlp_ApicBusDeliver(PPDMDEVINS pDevIns, uint8_t u8Dest, uint8_t u8DestMode, uint8_t u8DeliveryMode,
-                                                        uint8_t iVector, uint8_t u8Polarity, uint8_t u8TriggerMode);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmR3IoApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmR3IoApicHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-static DECLCALLBACK(PCPDMIOAPICHLPGC) pdmR3IoApicHlp_GetGCHelpers(PPDMDEVINS pDevIns);
-static DECLCALLBACK(PCPDMIOAPICHLPR0) pdmR3IoApicHlp_GetR0Helpers(PPDMDEVINS pDevIns);
@@ -264 +258 @@
-static DECLCALLBACK(void) pdmR3PciHlp_IoApicSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel);
-static DECLCALLBACK(bool) pdmR3PciHlp_IsMMIO2Base(PPDMDEVINS pDevIns, PPDMDEVINS pOwner, RTGCPHYS GCPhys);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmR3PciHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmR3PciHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-static DECLCALLBACK(PCPDMPCIHLPGC) pdmR3PciHlp_GetGCHelpers(PPDMDEVINS pDevIns);
-static DECLCALLBACK(PCPDMPCIHLPR0) pdmR3PciHlp_GetR0Helpers(PPDMDEVINS pDevIns);
@@ -494 +486 @@
-    pdmR3PicHlp_SetInterruptFF,
-    pdmR3PicHlp_ClearInterruptFF,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR3PicHlp_Lock,
-    pdmR3PicHlp_Unlock,
-#endif
-    pdmR3PicHlp_GetGCHelpers,
-    pdmR3PicHlp_GetR0Helpers,
@@ -513 +503 @@
-    pdmR3ApicHlp_ClearInterruptFF,
-    pdmR3ApicHlp_ChangeFeature,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR3ApicHlp_Lock,
-    pdmR3ApicHlp_Unlock,
-#endif
-    pdmR3ApicHlp_GetGCHelpers,
-    pdmR3ApicHlp_GetR0Helpers,
@@ -530 +518 @@
-    PDM_IOAPICHLPR3_VERSION,
-    pdmR3IoApicHlp_ApicBusDeliver,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR3IoApicHlp_Lock,
-    pdmR3IoApicHlp_Unlock,
-#endif
-    pdmR3IoApicHlp_GetGCHelpers,
-    pdmR3IoApicHlp_GetR0Helpers,
@@ -551 +537 @@
-    pdmR3PciHlp_GetGCHelpers,
-    pdmR3PciHlp_GetR0Helpers,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR3PciHlp_Lock,
-    pdmR3PciHlp_Unlock,
-#endif
-    PDM_PCIHLPR3_VERSION, /* the end */
-};
@@ -1809 +1793 @@
-        PPDMPCIBUS pBus = pDevIns->Internal.s.pPciBusHC; /** @todo the bus should be associated with the PCI device not the PDM device. */
-        Assert(pBus);
-#ifdef VBOX_WITH_PDM_LOCK
-        PVM pVM = pDevIns->Internal.s.pVMHC;
-        pdmLock(pVM);
-        pBus->pfnSetIrqR3(pBus->pDevInsR3, pPciDev, iIrq, iLevel);
-        pdmUnlock(pVM);
-
-#else /* !VBOX_WITH_PDM_LOCK */
-        /*
-         * For the convenience of the device we put no thread restriction on this interface.
-         * That means we'll have to check which thread we're in and choose our path.
-         */
-        if (VM_IS_EMT(pDevIns->Internal.s.pVMHC) || VMMR3LockIsOwner(pDevIns->Internal.s.pVMHC))
-            pBus->pfnSetIrqR3(pBus->pDevInsR3, pPciDev, iIrq, iLevel);
-        else
-        {
-            Log(("pdmR3DevHlp_PCISetIrq: caller='%s'/%d: Requesting call in EMT...\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
-            PVMREQ pReq;
-            int rc = VMR3ReqCallVoid(pDevIns->Internal.s.pVMHC, &pReq, RT_INDEFINITE_WAIT,
-                                     (PFNRT)pBus->pfnSetIrqR3, 4, pBus->pDevInsR3, pPciDev, iIrq, iLevel);
-            while (rc == VERR_TIMEOUT)
-                rc = VMR3ReqWait(pReq, RT_INDEFINITE_WAIT);
-            AssertReleaseRC(rc);
-            VMR3ReqFree(pReq);
-        }
-#endif /* !VBOX_WITH_PDM_LOCK */
-    }
-    else
@@ -1845 +1808 @@
-static DECLCALLBACK(void) pdmR3DevHlp_PCISetIrqNoWait(PPDMDEVINS pDevIns, int iIrq, int iLevel)
-{
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR3DevHlp_PCISetIrq(pDevIns, iIrq, iLevel);
-#else /* !VBOX_WITH_PDM_LOCK */
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3DevHlp_PCISetIrqNoWait: caller='%s'/%d: iIrq=%d iLevel=%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, iIrq, iLevel));
-
-    /*
-     * Validate input.
-     */
-    /** @todo iIrq and iLevel checks. */
-
-    /*
-     * Must have a PCI device registered!
-     */
-    PPCIDEVICE pPciDev = pDevIns->Internal.s.pPciDeviceHC;
-    if (pPciDev)
-    {
-        PPDMPCIBUS pBus = pDevIns->Internal.s.pPciBusHC;
-        Assert(pBus);
-
-        /*
-         * For the convenience of the device we put no thread restriction on this interface.
-         * That means we'll have to check which thread we're in and choose our path.
-         */
-        if (VM_IS_EMT(pDevIns->Internal.s.pVMHC) || VMMR3LockIsOwner(pDevIns->Internal.s.pVMHC))
-            pBus->pfnSetIrqR3(pBus->pDevInsR3, pPciDev, iIrq, iLevel);
-        else
-        {
-            Log(("pdmR3DevHlp_PCISetIrqNoWait: caller='%s'/%d: Queueing call in EMT...\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
-            int rc = VMR3ReqCallEx(pDevIns->Internal.s.pVMHC, NULL, RT_INDEFINITE_WAIT, VMREQFLAGS_NO_WAIT | VMREQFLAGS_VOID,
-                                     (PFNRT)pBus->pfnSetIrqR3, 4, pBus->pDevInsR3, pPciDev, iIrq, iLevel);
-            AssertReleaseRC(rc);
-        }
-    }
-    else
-        AssertReleaseMsgFailed(("No PCI device registered!\n"));
-
-    LogFlow(("pdmR3DevHlp_PCISetIrqNoWait: caller='%s'/%d: returns void\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
-#endif /* !VBOX_WITH_PDM_LOCK */
-}
-
@@ -1899 +1824 @@
-
-    PVM pVM = pDevIns->Internal.s.pVMHC;
-#ifdef VBOX_WITH_PDM_LOCK
-    PDMIsaSetIrq(pVM, iIrq, iLevel);    /* (The API takes the lock.) */
-#else /* !VBOX_WITH_PDM_LOCK */
-    if (VM_IS_EMT(pDevIns->Internal.s.pVMHC) || VMMR3LockIsOwner(pDevIns->Internal.s.pVMHC))
-        PDMIsaSetIrq(pVM, iIrq, iLevel);
-    else
-    {
-        Log(("pdmR3DevHlp_ISASetIrq: caller='%s'/%d: Requesting call in EMT...\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
-        PVMREQ pReq;
-        int rc = VMR3ReqCallVoid(pDevIns->Internal.s.pVMHC, &pReq, RT_INDEFINITE_WAIT,
-                                 (PFNRT)PDMIsaSetIrq, 3, pVM, iIrq, iLevel);
-        while (rc == VERR_TIMEOUT)
-            rc = VMR3ReqWait(pReq, RT_INDEFINITE_WAIT);
-        AssertReleaseRC(rc);
-        VMR3ReqFree(pReq);
-    }
-#endif /* !VBOX_WITH_PDM_LOCK */
-
-    LogFlow(("pdmR3DevHlp_ISASetIrq: caller='%s'/%d: returns void\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
@@ -1924 +1833 @@
-static DECLCALLBACK(void) pdmR3DevHlp_ISASetIrqNoWait(PPDMDEVINS pDevIns, int iIrq, int iLevel)
-{
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR3DevHlp_ISASetIrq(pDevIns, iIrq, iLevel);
-#else /* !VBOX_WITH_PDM_LOCK */
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3DevHlp_ISASetIrqNoWait: caller='%s'/%d: iIrq=%d iLevel=%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, iIrq, iLevel));
-
-    /*
-     * Validate input.
-     */
-    /** @todo iIrq and iLevel checks. */
-
-    PVM pVM = pDevIns->Internal.s.pVMHC;
-    /*
-     * For the convenience of the device we put no thread restriction on this interface.
-     * That means we'll have to check which thread we're in and choose our path.
-     */
-    if (VM_IS_EMT(pDevIns->Internal.s.pVMHC) || VMMR3LockIsOwner(pDevIns->Internal.s.pVMHC))
-        PDMIsaSetIrq(pVM, iIrq, iLevel);
-    else
-    {
-        Log(("pdmR3DevHlp_ISASetIrqNoWait: caller='%s'/%d: Queueing call in EMT...\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
-        int rc = VMR3ReqCallEx(pDevIns->Internal.s.pVMHC, NULL, 0, VMREQFLAGS_NO_WAIT | VMREQFLAGS_VOID,
-                               (PFNRT)PDMIsaSetIrq, 3, pVM, iIrq, iLevel);
-        AssertReleaseRC(rc);
-    }
-
-    LogFlow(("pdmR3DevHlp_ISASetIrqNoWait: caller='%s'/%d: returns void\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
-#endif /* !VBOX_WITH_PDM_LOCK */
-}
-
@@ -4104 +3986 @@
-    VM_FF_SET(pVM, VM_FF_INTERRUPT_PIC);
-    REMR3NotifyInterruptSet(pVM);
-#ifdef VBOX_WITH_PDM_LOCK
-    VMR3NotifyFF(pVM, true);
-#endif
-}
-
@@ -4121 +4001 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMPICHLPR3::pfnLock */
-static DECLCALLBACK(int) pdmR3PicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -4136 +4015 @@
-    pdmUnlock(pDevIns->Internal.s.pVMHC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-
@@ -4178 +4056 @@
-    VM_FF_SET(pVM, VM_FF_INTERRUPT_APIC);
-    REMR3NotifyInterruptSet(pVM);
-#ifdef VBOX_WITH_PDM_LOCK
-    VMR3NotifyFF(pVM, true);
-#endif
-}
-
@@ -4207 +4083 @@
-}
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMAPICHLPR3::pfnLock */
-static DECLCALLBACK(int) pdmR3ApicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -4222 +4097 @@
-    pdmUnlock(pDevIns->Internal.s.pVMHC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-
@@ -4261 +4135 @@
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    PVM pVM = pDevIns->Internal.s.pVMHC;
-#ifndef VBOX_WITH_PDM_LOCK
-    VM_ASSERT_EMT(pVM);
-#endif
-    LogFlow(("pdmR3IoApicHlp_ApicBusDeliver: caller='%s'/%d: u8Dest=%RX8 u8DestMode=%RX8 u8DeliveryMode=%RX8 iVector=%RX8 u8Polarity=%RX8 u8TriggerMode=%RX8\n",
-             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, u8Dest, u8DestMode, u8DeliveryMode, iVector, u8Polarity, u8TriggerMode));
@@ -4271 +4142 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMIOAPICHLPR3::pfnLock */
-static DECLCALLBACK(int) pdmR3IoApicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -4286 +4156 @@
-    pdmUnlock(pDevIns->Internal.s.pVMHC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-
@@ -4323 +4192 @@
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-#ifndef VBOX_WITH_PDM_LOCK
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-#endif
-    Log4(("pdmR3PciHlp_IsaSetIrq: iIrq=%d iLevel=%d\n", iIrq, iLevel));
-    PDMIsaSetIrq(pDevIns->Internal.s.pVMHC, iIrq, iLevel);
@@ -4335 +4201 @@
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-#ifndef VBOX_WITH_PDM_LOCK
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-#endif
-    Log4(("pdmR3PciHlp_IsaSetIrq: iIrq=%d iLevel=%d\n", iIrq, iLevel));
-    PDMIoApicSetIrq(pDevIns->Internal.s.pVMHC, iIrq, iLevel);
@@ -4354 +4217 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMPCIHLPR3::pfnLock */
-static DECLCALLBACK(int) pdmR3PciHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -4369 +4231 @@
-    pdmUnlock(pDevIns->Internal.s.pVMHC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-

trunk/src/VBox/VMM/PDMInternal.h

@@ -850 +850 @@
-    /** @} */
-
-#ifdef VBOX_WITH_PDM_LOCK
-    /** The PDM lock.
-     * This is used to protect everything that deals with interrupts, i.e.
-     * the PIC, APIC, IOAPIC and PCI devices pluss some PDM functions. */
-    PDMCRITSECT                     CritSect;
-#endif
-
-
-    /** Number of times a critical section leave requesed needed to be queued for ring-3 execution. */
@@ -940 +937 @@
-#endif /* IN_RING3 */
-
-#ifdef VBOX_WITH_PDM_LOCK
-void        pdmLock(PVM pVM);
-int         pdmLockEx(PVM pVM, int rc);
-void        pdmUnlock(PVM pVM);
-#else
-# define pdmLock(pVM)       do {} while (0)
-# define pdmLockEx(pVM, rc) (VINF_SUCCESS)
-# define pdmUnlock(pVM)     do {} while (0)
-#endif
-
-/** @} */

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

@@ -83 +83 @@
-    }
-
-
-
-
-
+
+
-    pdmUnlock(pVM);
-    return VERR_NO_DATA;
@@ -232 +230 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/**
- * Locks PDM.
@@ -249 +246 @@
-# ifdef IN_GC
-        rc = VMMGCCallHost(pVM, VMMCALLHOST_PDM_LOCK, 0);
-
+ 
-        rc = VMMR0CallHost(pVM, VMMCALLHOST_PDM_LOCK, 0);
-
+ 
-    }
-#endif
@@ -281 +278 @@
-    PDMCritSectLeave(&pVM->pdm.s.CritSect);
-}
-
-
+

trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp

@@ -91 +91 @@
-static DECLCALLBACK(void) pdmGCPicHlp_SetInterruptFF(PPDMDEVINS pDevIns);
-static DECLCALLBACK(void) pdmGCPicHlp_ClearInterruptFF(PPDMDEVINS pDevIns);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmGCPicHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmGCPicHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-/** @} */
-
@@ -104 +102 @@
-static DECLCALLBACK(void) pdmGCApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns);
-static DECLCALLBACK(void) pdmGCApicHlp_ChangeFeature(PPDMDEVINS pDevIns, bool fEnabled);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmGCApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmGCApicHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-/** @} */
-
@@ -116 +112 @@
-static DECLCALLBACK(void) pdmGCIoApicHlp_ApicBusDeliver(PPDMDEVINS pDevIns, uint8_t u8Dest, uint8_t u8DestMode, uint8_t u8DeliveryMode,
-                                                        uint8_t iVector, uint8_t u8Polarity, uint8_t u8TriggerMode);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmGCIoApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmGCIoApicHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-/** @} */
-
@@ -128 +122 @@
-static DECLCALLBACK(void) pdmGCPciHlp_IsaSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel);
-static DECLCALLBACK(void) pdmGCPciHlp_IoApicSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmGCPciHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmGCPciHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-/** @} */
-
@@ -167 +159 @@
-    pdmGCPicHlp_SetInterruptFF,
-    pdmGCPicHlp_ClearInterruptFF,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmGCPicHlp_Lock,
-    pdmGCPicHlp_Unlock,
-#endif
-    PDM_PICHLPGC_VERSION
-};
@@ -184 +174 @@
-    pdmGCApicHlp_ClearInterruptFF,
-    pdmGCApicHlp_ChangeFeature,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmGCApicHlp_Lock,
-    pdmGCApicHlp_Unlock,
-#endif
-    PDM_APICHLPGC_VERSION
-};
@@ -199 +187 @@
-    PDM_IOAPICHLPGC_VERSION,
-    pdmGCIoApicHlp_ApicBusDeliver,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmGCIoApicHlp_Lock,
-    pdmGCIoApicHlp_Unlock,
-#endif
-    PDM_IOAPICHLPGC_VERSION
-};
@@ -215 +201 @@
-    pdmGCPciHlp_IsaSetIrq,
-    pdmGCPciHlp_IoApicSetIrq,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmGCPciHlp_Lock,
-    pdmGCPciHlp_Unlock,
-#endif
-    PDM_PCIHLPGC_VERSION, /* the end */
-};
@@ -388 +372 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMPICHLPGC::pfnLock */
-static DECLCALLBACK(int) pdmGCPicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -403 +386 @@
-    pdmUnlock(pDevIns->Internal.s.pVMGC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-
@@ -440 +422 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMAPICHLPGC::pfnLock */
-static DECLCALLBACK(int) pdmGCApicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -455 +436 @@
-    pdmUnlock(pDevIns->Internal.s.pVMGC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-
@@ -473 +453 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMIOAPICHLPGC::pfnLock */
-static DECLCALLBACK(int) pdmGCIoApicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -488 +467 @@
-    pdmUnlock(pDevIns->Internal.s.pVMGC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-
@@ -511 +489 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMPCIHLPGC::pfnLock */
-static DECLCALLBACK(int) pdmGCPciHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -526 +503 @@
-    pdmUnlock(pDevIns->Internal.s.pVMGC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-

trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

@@ -91 +91 @@
-static DECLCALLBACK(void) pdmR0PicHlp_SetInterruptFF(PPDMDEVINS pDevIns);
-static DECLCALLBACK(void) pdmR0PicHlp_ClearInterruptFF(PPDMDEVINS pDevIns);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmR0PicHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmR0PicHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-/** @} */
-
@@ -104 +102 @@
-static DECLCALLBACK(void) pdmR0ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns);
-static DECLCALLBACK(void) pdmR0ApicHlp_ChangeFeature(PPDMDEVINS pDevIns, bool fEnabled);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmR0ApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmR0ApicHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-/** @} */
-
@@ -116 +112 @@
-static DECLCALLBACK(void) pdmR0IoApicHlp_ApicBusDeliver(PPDMDEVINS pDevIns, uint8_t u8Dest, uint8_t u8DestMode, uint8_t u8DeliveryMode,
-                                                        uint8_t iVector, uint8_t u8Polarity, uint8_t u8TriggerMode);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmR0IoApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmR0IoApicHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-/** @} */
-
@@ -128 +122 @@
-static DECLCALLBACK(void) pdmR0PciHlp_IsaSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel);
-static DECLCALLBACK(void) pdmR0PciHlp_IoApicSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel);
-#ifdef VBOX_WITH_PDM_LOCK
-static DECLCALLBACK(int) pdmR0PciHlp_Lock(PPDMDEVINS pDevIns, int rc);
-static DECLCALLBACK(void) pdmR0PciHlp_Unlock(PPDMDEVINS pDevIns);
-#endif
-/** @} */
-
@@ -167 +159 @@
-    pdmR0PicHlp_SetInterruptFF,
-    pdmR0PicHlp_ClearInterruptFF,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR0PicHlp_Lock,
-    pdmR0PicHlp_Unlock,
-#endif
-    PDM_PICHLPR0_VERSION
-};
@@ -184 +174 @@
-    pdmR0ApicHlp_ClearInterruptFF,
-    pdmR0ApicHlp_ChangeFeature,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR0ApicHlp_Lock,
-    pdmR0ApicHlp_Unlock,
-#endif
-    PDM_APICHLPR0_VERSION
-};
@@ -199 +187 @@
-    PDM_IOAPICHLPR0_VERSION,
-    pdmR0IoApicHlp_ApicBusDeliver,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR0IoApicHlp_Lock,
-    pdmR0IoApicHlp_Unlock,
-#endif
-    PDM_IOAPICHLPR0_VERSION
-};
@@ -215 +201 @@
-    pdmR0PciHlp_IsaSetIrq,
-    pdmR0PciHlp_IoApicSetIrq,
-#ifdef VBOX_WITH_PDM_LOCK
-    pdmR0PciHlp_Lock,
-    pdmR0PciHlp_Unlock,
-#endif
-    PDM_PCIHLPR0_VERSION, /* the end */
-};
@@ -392 +376 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMPICHLPR0::pfnLock */
-static DECLCALLBACK(int) pdmR0PicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -407 +390 @@
-    pdmUnlock(pDevIns->Internal.s.pVMHC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-
@@ -444 +426 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMAPICHLPR0::pfnLock */
-static DECLCALLBACK(int) pdmR0ApicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -459 +440 @@
-    pdmUnlock(pDevIns->Internal.s.pVMHC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-
@@ -478 +458 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMIOAPICHLPR0::pfnLock */
-static DECLCALLBACK(int) pdmR0IoApicHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -493 +472 @@
-    pdmUnlock(pDevIns->Internal.s.pVMHC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-
@@ -517 +495 @@
-
-
-#ifdef VBOX_WITH_PDM_LOCK
-/** @copydoc PDMPCIHLPR0::pfnLock */
-static DECLCALLBACK(int) pdmR0PciHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -532 +509 @@
-    pdmUnlock(pDevIns->Internal.s.pVMHC);
-}
-#endif /* VBOX_WITH_PDM_LOCK */
-
-

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -306 +306 @@
-    GEN_CHECK_OFF(PDM, aDrvInsPollers);
-    GEN_CHECK_OFF(PDM, pTimerPollers);
-#ifdef VBOX_WITH_PDM_LOCK
-    GEN_CHECK_OFF(PDM, CritSect);
-#endif
-    GEN_CHECK_OFF(PDM, StatQueuedCritSectLeaves);
-    GEN_CHECK_SIZE(PDMDEVINSINT);