Changeset 80644 in vbox

Timestamp:

Sep 6, 2019 8:13:58 PM (5 years ago)

Author:

vboxsync

Message:

IOM: New I/O port registration code. [release build fix] bugref:9218

File:

• trunk/src/VBox/VMM/VMMR0/IOMR0.cpp (modified) (2 diffs)

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

@@ -125 +125 @@
     pGVM->iomr0.s.paIoPortRegs[hIoPorts].cPorts             = cPorts;
     uint16_t const idxStats = pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].idxStats;
+#ifdef VBOX_WITH_STATISTICS
     pGVM->iomr0.s.paIoPortRegs[hIoPorts].idxStats           = (uint32_t)idxStats + cPorts <= pGVM->iomr0.s.cIoPortStatsAllocation
                                                             ? idxStats : UINT16_MAX;
+#else
+    pGVM->iomr0.s.paIoPortRegs[hIoPorts].idxStats           = UINT16_MAX;
+#endif
     return VINF_SUCCESS;
 }
@@ -258 +262 @@
     AssertReturn(cReqMinEntries <= _64K, VERR_IOM_TOO_MANY_IOPORT_REGISTRATIONS);
     uint32_t cNewEntries = (uint32_t)cReqMinEntries;
+#ifdef VBOX_WITH_STATISTICS
     uint32_t const cOldEntries = pGVM->iomr0.s.cIoPortStatsAllocation;
     ASMCompilerBarrier();
+#else
+    uint32_t const cOldEntries = 0;
+#endif
     AssertReturn(cNewEntries > cOldEntries, VERR_IOM_IOPORT_IPE_1);
     AssertReturn(pGVM->iom.s.cIoPortStatsAllocation == cOldEntries, VERR_IOM_IOPORT_IPE_1);