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

Timestamp:

Apr 13, 2016 1:30:39 PM (9 years ago)

Author:

vboxsync

Message:

VMM/APIC: Don't allow modify reserved MB1 bits in DFR.

File:

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

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

@@ -1082 +1082 @@
     Assert(!XAPIC_IN_X2APIC_MODE(pVCpu));
 
+    uDfr &= XAPIC_DFR;
+    uDfr |= XAPIC_DFR_RSVD_MB1;
+
     Log4(("APIC%u: apicSetDfr: uDfr=%#RX32\n", pVCpu->idCpu, uDfr));
 
     PXAPICPAGE pXApicPage = VMCPU_TO_XAPICPAGE(pVCpu);
-    apicWriteRaw32(pXApicPage, XAPIC_OFF_DFR, uDfr & XAPIC_DFR);
+    apicWriteRaw32(pXApicPage, XAPIC_OFF_DFR, uDfr);
     return VINF_SUCCESS;
 }
@@ -1221 +1224 @@
 static VBOXSTRICTRC apicSetLvtEntry(PVMCPU pVCpu, uint16_t offLvt, uint32_t uLvt)
 {
+    VMCPU_ASSERT_EMT(pVCpu);
+
 #if XAPIC_HARDWARE_VERSION == XAPIC_HARDWARE_VERSION_P4
-    VMCPU_ASSERT_EMT(pVCpu);
     AssertMsg(   offLvt == XAPIC_OFF_LVT_TIMER
               || offLvt == XAPIC_OFF_LVT_THERMAL