vbox的更動 60858 路徑 trunk/src/VBox/VMM/VMMR3/APIC.cpp

時間撮記:

2016-5-6 上午11:36:11 (9 年 以前)

作者:

vboxsync

訊息:

APIC: Saved state compatibility fix.

檔案:

• trunk/src/VBox/VMM/VMMR3/APIC.cpp (修改) (1 筆差異)

trunk/src/VBox/VMM/VMMR3/APIC.cpp

@@ -904 +904 @@
     SSMR3GetU32(pSSM, &pXApicPage->timer_dcr.all.u32DivideValue);
     SSMR3GetU32(pSSM, &u32TimerShift);
+    /* Old implementation may have left the timer shift uninitialized until
+     * the timer configuration register was written. Fix that up.
+     */
+    if (!u32TimerShift)
+        u32TimerShift = 1;
     uint8_t const uTimerShift = apicGetTimerShift(pXApicPage);
     AssertMsgReturn(u32TimerShift == uTimerShift, ("Timer shift invalid! Saved-state contains %u, expected %u\n", u32TimerShift,