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

Timestamp:

Jul 5, 2016 8:05:30 AM (9 years ago)

Author:

vboxsync

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

108479

Message:

VMM/APIC: Fix unsupported delivery mode combinations with IPIs.

File:

• trunk/src/VBox/VMM/VMMAll/APICAll.cpp (modified) (1 diff)

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

@@ -972 +972 @@
     /*
      * INIT Level De-assert is not support on Pentium 4 and Xeon processors.
+     * Apparently, this also applies to NMI, SMI, lowest-priority and fixed delivery modes,
+     * see @bugref{8245#c116}.
+     *
      * See AMD spec. 16.5 "Interprocessor Interrupts (IPI)" for a table of valid ICR combinations.
      */
-    if (RT_UNLIKELY(   enmDeliveryMode == XAPICDELIVERYMODE_INIT_LEVEL_DEASSERT
-                    && enmInitLevel    == XAPICINITLEVEL_DEASSERT
-                    && enmTriggerMode  == XAPICTRIGGERMODE_LEVEL))
-    {
-        Log2(("APIC%u: INIT level de-assert unsupported, ignoring!\n", pVCpu->idCpu));
+    if (   enmTriggerMode  == XAPICTRIGGERMODE_LEVEL
+        && enmInitLevel    == XAPICINITLEVEL_DEASSERT
+        && (   enmDeliveryMode == XAPICDELIVERYMODE_FIXED
+            || enmDeliveryMode == XAPICDELIVERYMODE_LOWEST_PRIO
+            || enmDeliveryMode == XAPICDELIVERYMODE_SMI
+            || enmDeliveryMode == XAPICDELIVERYMODE_NMI
+            || enmDeliveryMode == XAPICDELIVERYMODE_INIT))
+    {
+        Log2(("APIC%u: %s level de-assert unsupported, ignoring!\n", apicGetDeliveryModeName(enmDeliveryMode), pVCpu->idCpu));
         return VINF_SUCCESS;
     }