Changeset 61736 in vbox

Timestamp:

Jun 17, 2016 8:00:50 AM (9 years ago)

Author:

vboxsync

Message:

VMM/APIC: VBOXSTRICTRC nits, inline the MMIO read.

File:

• trunk/src/VBox/VMM/VMMAll/APICAll.cpp (modified) (5 diffs)

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

@@ -1573 +1573 @@
  * @param   puValue         Where to store the register value.
  */
-static int apicReadRegister(PAPICDEV pApicDev, PVMCPU pVCpu, uint16_t offReg, uint32_t *puValue)
+DECLINLINE(VBOXSTRICTRC) apicReadRegister(PAPICDEV pApicDev, PVMCPU pVCpu, uint16_t offReg, uint32_t *puValue)
 {
     VMCPU_ASSERT_EMT(pVCpu);
     Assert(offReg <= XAPIC_OFF_MAX_VALID);
 
-    PXAPICPAGE pXApicPage = VMCPU_TO_XAPICPAGE(pVCpu);
-    uint32_t   uValue = 0;
-    int        rc = VINF_SUCCESS;
+    PXAPICPAGE   pXApicPage = VMCPU_TO_XAPICPAGE(pVCpu);
+    uint32_t     uValue = 0;
+    VBOXSTRICTRC rc = VINF_SUCCESS;
     switch (offReg)
     {
@@ -1629 +1629 @@
         {
             Assert(!XAPIC_IN_X2APIC_MODE(pVCpu));
-            rc = VBOXSTRICTRC_VAL(apicGetTimerCcr(pVCpu, VINF_IOM_R3_MMIO_READ, &uValue));
+            rc = apicGetTimerCcr(pVCpu, VINF_IOM_R3_MMIO_READ, &uValue);
             break;
         }
@@ -1647 +1647 @@
         {
             Assert(!XAPIC_IN_X2APIC_MODE(pVCpu));
-            rc = PDMDevHlpDBGFStop(pApicDev->CTX_SUFF(pDevIns), RT_SRC_POS, "VCPU[%u]: offReg=%#RX16\n", pVCpu->idCpu, offReg);
+            rc = PDMDevHlpDBGFStop(pApicDev->CTX_SUFF(pDevIns), RT_SRC_POS, "VCPU[%u]: offReg=%#RX16\n", pVCpu->idCpu,
+                                          offReg);
             apicSetError(pVCpu, XAPIC_ESR_ILLEGAL_REG_ADDRESS);
             break;
@@ -1667 +1668 @@
  * @param   uValue          The register value.
  */
-static VBOXSTRICTRC apicWriteRegister(PAPICDEV pApicDev, PVMCPU pVCpu, uint16_t offReg, uint32_t uValue)
+DECLINLINE(VBOXSTRICTRC) apicWriteRegister(PAPICDEV pApicDev, PVMCPU pVCpu, uint16_t offReg, uint32_t uValue)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -2535 +2536 @@
     STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF(StatMmioRead));
 
-    int rc = apicReadRegister(pApicDev, pVCpu, offReg, &uValue);
+    int rc = VBOXSTRICTRC_VAL(apicReadRegister(pApicDev, pVCpu, offReg, &uValue));
     *(uint32_t *)pv = uValue;