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

Timestamp:

Apr 9, 2018 2:50:53 PM (7 years ago)

Author:

vboxsync

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

121877

Message:

PCI: Added a tiny bit of paranoia to address splitup.

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPCI.cpp (modified) (2 diffs)
• DevPciIch9.cpp (modified) (3 diffs)

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

@@ -127 +127 @@
     iDevice = (pGlobals->uConfigReg >> 8) & 0xff;
     config_addr = (pGlobals->uConfigReg & 0xfc) | (addr & 3);
+    RT_UNTRUSTED_VALIDATED_FENCE(); /* paranoia */
     if (iBus != 0)
     {
@@ -174 +175 @@
     iDevice = (pGlobals->uConfigReg >> 8) & 0xff;
     config_addr = (pGlobals->uConfigReg & 0xfc) | (addr & 3);
+    RT_UNTRUSTED_VALIDATED_FENCE();
     if (iBus != 0)
     {

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

@@ -111 +111 @@
     pPciAddr->iDeviceFunc   = (GCPhysAddr >> 12) & ((1<<(5+3))   - 1); // 5 bits - device, 3 bits - function
     pPciAddr->iRegister     = (GCPhysAddr >>  0) & ((1<<(6+4+2)) - 1); // 6 bits - register, 4 bits - extended register, 2 bits -Byte Enable
+    RT_UNTRUSTED_VALIDATED_FENCE(); /* paranoia */
 }
 
@@ -118 +119 @@
     pPciAddr->iDeviceFunc  = (pPciRoot->uConfigReg >> 8) & 0xff;
     pPciAddr->iRegister    = (pPciRoot->uConfigReg & 0xfc) | (addr & 3);
+    RT_UNTRUSTED_VALIDATED_FENCE(); /* paranoia */
 }
 
@@ -689 +691 @@
  * @remarks Caller enters the device critical section.
  */
-PDMBOTHCBDECL(int) ich9pciMcfgMMIORead (PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
+PDMBOTHCBDECL(int) ich9pciMcfgMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
     PDEVPCIROOT pPciRoot = PDMINS_2_DATA(pDevIns, PDEVPCIROOT);