Changeset 60730 in vbox

Timestamp:

Apr 28, 2016 9:43:22 AM (8 years ago)

Author:

vboxsync

Message:

VMMR0: The APIC FF can get set asynchronously with the new APIC code, don't assert on it.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (1 diff)

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

@@ -2687 +2687 @@
                  * always via hmR0SvmLoadGuestState() -> hmR0SvmLoadGuestApicState().
                  */
-                Assert(!VMCPU_FF_IS_PENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC)));
             }
             else
-            {
-                Assert(!VMCPU_FF_IS_PENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)));
                 STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchGuestIrq);
-            }
         }
         else

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

@@ -7458 +7458 @@
             else if (rc == VERR_APIC_INTR_MASKED_BY_TPR)
             {
-                Assert(!VMCPU_FF_IS_PENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC)));
                 if (pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_USE_TPR_SHADOW)
                     hmR0VmxApicSetTprThreshold(pVCpu, u8Interrupt >> 4);
             }
             else
-            {
-                Assert(!VMCPU_FF_IS_PENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)));
                 STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchGuestIrq);
-            }
         }
         else