vbox的更動 90436 路徑 trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

時間撮記:

2021-7-30 下午04:03:48 (4 年 以前)

作者:

vboxsync

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

146040

訊息:

VMM,Dev*: Handle PDMCritSectEnter failures in relation to the PDM critsect. bugref:6695

檔案:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (修改) (6 筆差異)

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

@@ -282 +282 @@
         u32 &= ~3;
 
-        PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_WRITE);
+        PCI_LOCK_RET(pDevIns, VINF_IOM_R3_IOPORT_WRITE);
         pThis->uConfigReg = u32;
         PCI_UNLOCK(pDevIns);
@@ -306 +306 @@
         PDEVPCIROOT pThis = PDMINS_2_DATA(pDevIns, PDEVPCIROOT);
 
-        PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_READ);
+        PCI_LOCK_RET(pDevIns, VINF_IOM_R3_IOPORT_READ);
         *pu32 = pThis->uConfigReg;
         PCI_UNLOCK(pDevIns);
@@ -388 +388 @@
     if (!(offPort % cb))
     {
-        PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_WRITE);
+        PCI_LOCK_RET(pDevIns, VINF_IOM_R3_IOPORT_WRITE);
 
         if (pThis->uConfigReg & (1 << 31))
@@ -486 +486 @@
         *pu32 = 0xffffffff;
 
-        PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_READ);
+        PCI_LOCK_RET(pDevIns, VINF_IOM_R3_IOPORT_READ);
 
         /* Configuration space mapping enabled? */
@@ -678 +678 @@
 
     /* Perform configuration space write */
-    PCI_LOCK(pDevIns, VINF_IOM_R3_MMIO_WRITE);
+    PCI_LOCK_RET(pDevIns, VINF_IOM_R3_MMIO_WRITE);
     VBOXSTRICTRC rcStrict = ich9pciConfigWrite(pDevIns, pPciRoot, &aDest, u32, cb, VINF_IOM_R3_MMIO_WRITE);
     PCI_UNLOCK(pDevIns);
@@ -702 +702 @@
     /* Perform configuration space read */
     uint32_t     u32Value = 0;
-    PCI_LOCK(pDevIns, VINF_IOM_R3_MMIO_READ);
+    PCI_LOCK_RET(pDevIns, VINF_IOM_R3_MMIO_READ);
     VBOXSTRICTRC rcStrict = ich9pciConfigRead(pPciRoot, &aDest, cb, &u32Value, VINF_IOM_R3_MMIO_READ);
     PCI_UNLOCK(pDevIns);