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

Timestamp:

Dec 3, 2019 10:45:02 AM (5 years ago)

Author:

vboxsync

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

135162

Message:

DevHPET: Must name timers differently now or STAM asserts. bugref:9218

File:

• trunk/src/VBox/Devices/PC/DevHPET.cpp (modified) (2 diffs)

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

@@ -1434 +1434 @@
 
     /* Init the HPET timers (init all regardless of how many we expose). */
+    static const char * const s_apszTimerNames[] =
+    { "HPET Timer 0", "HPET Timer 1", "HPET Timer 2", "HPET Timer 3" };
+    AssertCompile(RT_ELEMENTS(pThis->aTimers) == RT_ELEMENTS(s_apszTimerNames));
     for (unsigned i = 0; i < RT_ELEMENTS(pThis->aTimers); i++)
     {
@@ -1439 +1442 @@
 
         rc = PDMDevHlpTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, hpetR3Timer, pHpetTimer,
-                                  TMTIMER_FLAGS_NO_CRIT_SECT, "HPET Timer", &pThis->aTimers[i].hTimer);
+                                  TMTIMER_FLAGS_NO_CRIT_SECT, s_apszTimerNames[i], &pThis->aTimers[i].hTimer);
         AssertRCReturn(rc, rc);
         /** @todo r=bird: This is TOTALLY MESSED UP!  Why do we need