Changeset 20039 in vbox for trunk/src/VBox/Devices

Timestamp:

May 26, 2009 1:33:46 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

47772

Message:

DevAPIC.cpp: Made apic_timer select the right instance. Fixed the assertion in TMAll.cpp.

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (1 diff)

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

@@ -1318 +1318 @@
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
     APICState *s = getLapic(dev);
+    if (s->pTimerR3 != pTimer)
+    {
+        for (uint32_t iCpu = 0; iCpu < dev->cCpus; iCpu++)
+        {
+            s = getLapicById(dev, iCpu);
+            if (s->pTimerR3 == pTimer)
+                break;
+        }
+        Assert(s->pTimerR3 == pTimer);
+    }
 
     APIC_LOCK_VOID(dev, VERR_INTERNAL_ERROR);