Changeset 32775 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Sep 27, 2010 1:11:27 PM (14 years ago)

Author:

vboxsync

Message:

apicDoFrequencyHinting: don't div/0.

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -1503 +1503 @@
  * @param   pThis               The device state.
  */
-DECLINLINE(void) apciDoFrequencyHinting(APICState *pThis)
+DECLINLINE(void) apicDoFrequencyHinting(APICState *pThis)
 {
     if (   pThis->uHintedInitialCount != pThis->initial_count
         || pThis->uHintedCountShift   != (uint32_t)pThis->count_shift)
     {
-        pThis->uHintedInitialCount = pThis->initial_count;
-        pThis->uHintedCountShift   = pThis->count_shift;
+        pThis->uHintedInitialCount  = pThis->initial_count;
+        pThis->uHintedCountShift    = pThis->count_shift;
 
         uint64_t cTickPerPeriod = (uint64_t)pThis->initial_count << pThis->count_shift;
-        uint32_t uHz            = TMTimerGetFreq(pThis->CTX_SUFF(pTimer)) / cTickPerPeriod;
+        uint32_t uHz = cTickPerPeriod > 0
+                     ? TMTimerGetFreq(pThis->CTX_SUFF(pTimer)) / cTickPerPeriod
+                     : 100 /*whatever*/;
         TMTimerSetFrequencyHint(pThis->CTX_SUFF(pTimer), uHz);
         Log(("apic: %u Hz\n", uHz));
@@ -1550 +1552 @@
         pThis->next_time = pThis->initial_count_load_time + cTicksNext;
         pThis->fTimerArmed = true;
-        apciDoFrequencyHinting(pThis);
+        apicDoFrequencyHinting(pThis);
         STAM_COUNTER_INC(&pThis->StatTimerSetInitialCountArm);
     }
@@ -1650 +1652 @@
                     pThis->next_time = NextTS;
                     pThis->fTimerArmed = true;
-                    apciDoFrequencyHinting(pThis);
+                    apicDoFrequencyHinting(pThis);
                     break;
                 }
@@ -1685 +1687 @@
             TMTimerSet(pThis->CTX_SUFF(pTimer), pThis->next_time);
             pThis->fTimerArmed = true;
-            apciDoFrequencyHinting(pThis);
+            apicDoFrequencyHinting(pThis);
         } else {
             /* single shot. */
@@ -2074 +2076 @@
     s->fTimerArmed = TMTimerIsActive(s->CTX_SUFF(pTimer));
     if (s->fTimerArmed)
-        apciDoFrequencyHinting(s);
+        apicDoFrequencyHinting(s);
 #endif