Changeset 37475 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 15, 2011 4:42:55 PM (14 years ago)

Author:

vboxsync

Message:

DevAPIC: Locking reworking in progress.

File:

• trunk/src/VBox/VMM/VMMAll/PDMAll.cpp (modified) (2 diffs)

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

@@ -315 +315 @@
     if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
     {
-        Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnWriteMSR));
-        pdmLock(pVM);
-        pVM->pdm.s.Apic.CTX_SUFF(pfnWriteMSR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), iCpu, u32Reg, u64Value);
-        pdmUnlock(pVM);
-        return VINF_SUCCESS;
+        AssertPtr(pVM->pdm.s.Apic.CTX_SUFF(pfnWriteMSR));
+        return pVM->pdm.s.Apic.CTX_SUFF(pfnWriteMSR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), iCpu, u32Reg, u64Value);
     }
     return VERR_PDM_NO_APIC_INSTANCE;
@@ -338 +335 @@
     if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
     {
-        Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnReadMSR));
-        pdmLock(pVM);
-        pVM->pdm.s.Apic.CTX_SUFF(pfnReadMSR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), iCpu, u32Reg, pu64Value);
-        pdmUnlock(pVM);
-        return VINF_SUCCESS;
+        AssertPtr(pVM->pdm.s.Apic.CTX_SUFF(pfnReadMSR));
+        pdmLock(pVM);
+        int rc = pVM->pdm.s.Apic.CTX_SUFF(pfnReadMSR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), iCpu, u32Reg, pu64Value);
+        pdmUnlock(pVM);
+        return rc;
     }
     return VERR_PDM_NO_APIC_INSTANCE;