Changeset 64045 in vbox

Timestamp:

Sep 27, 2016 1:35:34 PM (8 years ago)

Author:

vboxsync

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

110970

Message:

VMM/GIM/HyperV: Don't initialize timers when the feature isn't exposed.

File:

• trunk/src/VBox/VMM/VMMR3/GIMHv.cpp (modified) (3 diffs)

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

@@ -481 +481 @@
      * Setup up the per-VCPU synthetic timers.
      */
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
-        PVMCPU       pVCpu     = &pVM->aCpus[idCpu];
-        PGIMHVCPU    pHvCpu    = &pVCpu->gim.s.u.HvCpu;
-
-        for (uint8_t idxStimer = 0; idxStimer < RT_ELEMENTS(pHvCpu->aStimers); idxStimer++)
-        {
-            PGIMHVSTIMER pHvStimer = &pHvCpu->aStimers[idxStimer];
-
-            /* Associate the synthetic timer with its corresponding VCPU. */
-            pHvStimer->idCpu     = pVCpu->idCpu;
-            pHvStimer->idxStimer = idxStimer;
-
-            /* Create the timer and associate the context pointers. */
-            RTStrPrintf(&pHvStimer->szTimerDesc[0], sizeof(pHvStimer->szTimerDesc), "Hyper-V[%u] Timer%u", pVCpu->idCpu,
-                        idxStimer);
-            rc = TMR3TimerCreateInternal(pVM, TMCLOCK_VIRTUAL_SYNC, gimR3HvTimerCallback, pHvStimer /* pvUser */,
-                                         pHvStimer->szTimerDesc, &pHvStimer->pTimerR3);
-            AssertLogRelRCReturn(rc, rc);
-            pHvStimer->pTimerR0 = TMTimerR0Ptr(pHvStimer->pTimerR3);
-            pHvStimer->pTimerRC = TMTimerRCPtr(pHvStimer->pTimerR3);
+    if (   (pHv->uBaseFeat & GIM_HV_BASE_FEAT_STIMER_MSRS)
+        || (pHv->uBaseFeat & GIM_HV_BASE_FEAT_BASIC_SYNIC_MSRS))
+    {
+        for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+        {
+            PVMCPU       pVCpu     = &pVM->aCpus[idCpu];
+            PGIMHVCPU    pHvCpu    = &pVCpu->gim.s.u.HvCpu;
+
+            for (uint8_t idxStimer = 0; idxStimer < RT_ELEMENTS(pHvCpu->aStimers); idxStimer++)
+            {
+                PGIMHVSTIMER pHvStimer = &pHvCpu->aStimers[idxStimer];
+
+                /* Associate the synthetic timer with its corresponding VCPU. */
+                pHvStimer->idCpu     = pVCpu->idCpu;
+                pHvStimer->idxStimer = idxStimer;
+
+                /* Create the timer and associate the context pointers. */
+                RTStrPrintf(&pHvStimer->szTimerDesc[0], sizeof(pHvStimer->szTimerDesc), "Hyper-V[%u] Timer%u", pVCpu->idCpu,
+                            idxStimer);
+                rc = TMR3TimerCreateInternal(pVM, TMCLOCK_VIRTUAL_SYNC, gimR3HvTimerCallback, pHvStimer /* pvUser */,
+                                             pHvStimer->szTimerDesc, &pHvStimer->pTimerR3);
+                AssertLogRelRCReturn(rc, rc);
+                pHvStimer->pTimerR0 = TMTimerR0Ptr(pHvStimer->pTimerR3);
+                pHvStimer->pTimerRC = TMTimerRCPtr(pHvStimer->pTimerR3);
+            }
         }
     }
@@ -583 +587 @@
     gimR3HvTermDebugSupport(pVM);
 
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
-        PGIMHVCPU pHvCpu = &pVM->aCpus[idCpu].gim.s.u.HvCpu;
-        for (uint8_t idxStimer = 0; idxStimer < RT_ELEMENTS(pHvCpu->aStimers); idxStimer++)
-        {
-            PGIMHVSTIMER pHvStimer = &pHvCpu->aStimers[idxStimer];
-            TMR3TimerDestroy(pHvStimer->pTimerR3);
+    PCGIMHV pHv = &pVM->gim.s.u.Hv;
+    if (   (pHv->uBaseFeat & GIM_HV_BASE_FEAT_STIMER_MSRS)
+        || (pHv->uBaseFeat & GIM_HV_BASE_FEAT_BASIC_SYNIC_MSRS))
+    {
+        for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+        {
+            PGIMHVCPU pHvCpu = &pVM->aCpus[idCpu].gim.s.u.HvCpu;
+            for (uint8_t idxStimer = 0; idxStimer < RT_ELEMENTS(pHvCpu->aStimers); idxStimer++)
+            {
+                PGIMHVSTIMER pHvStimer = &pHvCpu->aStimers[idxStimer];
+                TMR3TimerDestroy(pHvStimer->pTimerR3);
+            }
         }
     }
@@ -608 +617 @@
 {
     RT_NOREF1(offDelta);
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
-        PGIMHVCPU pHvCpu = &pVM->aCpus[idCpu].gim.s.u.HvCpu;
-        for (uint8_t idxStimer = 0; idxStimer < RT_ELEMENTS(pHvCpu->aStimers); idxStimer++)
-        {
-            PGIMHVSTIMER pHvStimer = &pHvCpu->aStimers[idxStimer];
-            pHvStimer->pTimerRC = TMTimerRCPtr(pHvStimer->pTimerR3);
+
+    PCGIMHV pHv = &pVM->gim.s.u.Hv;
+    if (   (pHv->uBaseFeat & GIM_HV_BASE_FEAT_STIMER_MSRS)
+        || (pHv->uBaseFeat & GIM_HV_BASE_FEAT_BASIC_SYNIC_MSRS))
+    {
+        for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+        {
+            PGIMHVCPU pHvCpu = &pVM->aCpus[idCpu].gim.s.u.HvCpu;
+            for (uint8_t idxStimer = 0; idxStimer < RT_ELEMENTS(pHvCpu->aStimers); idxStimer++)
+            {
+                PGIMHVSTIMER pHvStimer = &pHvCpu->aStimers[idxStimer];
+                pHvStimer->pTimerRC = TMTimerRCPtr(pHvStimer->pTimerR3);
+            }
         }
     }