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

Timestamp:

Sep 15, 2010 10:53:55 AM (14 years ago)

Author:

vboxsync

Message:

DevAPIC: build fix.

File:

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

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

@@ -1503 +1503 @@
  * @param   pThis               The device state.
  */
-DECLINLINE(void) acpiDoFrequencyHinting(APICState *pThis)
+DECLINLINE(void) apciDoFrequencyHinting(APICState *pThis)
 {
     if (   pThis->uHintedInitialCount != pThis->initial_count
@@ -1550 +1550 @@
         pThis->next_time = pThis->initial_count_load_time + cTicksNext;
         pThis->fTimerArmed = true;
-        acpiDoFrequencyHinting(pThis);
+        apciDoFrequencyHinting(pThis);
         STAM_COUNTER_INC(&pThis->StatTimerSetInitialCountArm);
     }
@@ -1650 +1650 @@
                     pThis->next_time = NextTS;
                     pThis->fTimerArmed = true;
-                    acpiDoFrequencyHinting(pThis);
+                    apciDoFrequencyHinting(pThis);
                     break;
                 }
@@ -1685 +1685 @@
             TMTimerSet(pThis->CTX_SUFF(pTimer), pThis->next_time);
             pThis->fTimerArmed = true;
-            acpiDoFrequencyHinting(pThis);
+            apciDoFrequencyHinting(pThis);
         } else {
             /* single shot. */
@@ -2074 +2074 @@
     s->fTimerArmed = TMTimerIsActive(s->CTX_SUFF(pTimer));
     if (s->fTimerArmed)
-    {
-        PDMCritSectEnter(pThis->CTX_SUFF(pCritSect), VERR_SEM_BUSY);
-        acpiDoFrequencyHinting(s);
-        PDMCritSectLeave(pThis->CTX_SUFF(pCritSect));
-    }
+        apciDoFrequencyHinting(s);
 #endif
 
@@ -2711 +2707 @@
 
     /* load all APICs data */ /** @todo: is it correct? */
+    APIC_LOCK(pThis, VERR_INTERNAL_ERROR_3);
     foreach_apic(pThis, 0xffffffff,
                  if (apic_load(pSSM, apic, uVersion)) {
                       AssertFailed();
+                      APIC_UNLOCK(pThis);
                       return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
                  }
                  );
+    APIC_UNLOCK(pThis);
     return VINF_SUCCESS;
 }