Changeset 64086 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 28, 2016 3:42:09 PM (8 years ago)

Author:

vboxsync

Message:

VMM/APIC: Pass rcBusy to acpiSetEoi() so we return the appropriate error code when calling from an MMIO or MSR
handler as the lines between this gets blurred when using Hyper-V APIC MSR accesses while in xAPIC mode.

File:

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

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

@@ -1231 +1231 @@
  * @param   pVCpu                   The cross context virtual CPU structure.
  * @param   uEoi                    The EOI value.
+ * @param   rcBusy                  The busy return code when the write cannot
+ *                                  be completed successfully in this context.
  * @param   fForceX2ApicBehaviour   Pretend the APIC is in x2APIC mode during
  *                                  this write.
  */
-static VBOXSTRICTRC apicSetEoi(PVMCPU pVCpu, uint32_t uEoi, bool fForceX2ApicBehaviour)
+static VBOXSTRICTRC apicSetEoi(PVMCPU pVCpu, uint32_t uEoi, int rcBusy, bool fForceX2ApicBehaviour)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -1266 +1268 @@
             { /* likely */ }
             else
-                return fX2ApicMode ? VINF_CPUM_R3_MSR_WRITE : VINF_IOM_R3_MMIO_WRITE;
+                return rcBusy;
 
             /*
@@ -1779 +1781 @@
         case XAPIC_OFF_EOI:
         {
-            rcStrict = apicSetEoi(pVCpu, uValue, false /* fForceX2ApicBehaviour */);
+            rcStrict = apicSetEoi(pVCpu, uValue, VINF_IOM_R3_MMIO_WRITE, false /* fForceX2ApicBehaviour */);
             break;
         }
@@ -2069 +2071 @@
             case MSR_IA32_X2APIC_EOI:
             {
-                rcStrict = apicSetEoi(pVCpu, u32Value, false /* fForceX2ApicBehaviour */);
+                rcStrict = apicSetEoi(pVCpu, u32Value, VINF_CPUM_R3_MSR_WRITE, false /* fForceX2ApicBehaviour */);
                 break;
             }
@@ -3107 +3109 @@
     Assert(pVCpu);
     VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu);
-    return apicSetEoi(pVCpu, uEoi, true /* fForceX2ApicBehaviour */);
-}
-
+    return apicSetEoi(pVCpu, uEoi, VINF_CPUM_R3_MSR_WRITE, true /* fForceX2ApicBehaviour */);
+}
+