Changeset 51981 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 11, 2014 6:16:19 AM (11 years ago)

Author:

vboxsync

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

94908

Message:

VMM/GIM, VMM/HM: Add support for Hyper-V hypervisor capabilities reporting through CPUID. Updated saved states as well, will break old states.

File:

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

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

@@ -88 +88 @@
     if (!pVM->gim.s.u32Version)
     {
+        /* Basic features. */
         pHv->uBaseFeat = 0
                        //| GIM_HV_BASE_FEAT_VP_RUNTIME_MSR
@@ -104 +105 @@
                        ;
 
+        /* Miscellaneous features. */
         pHv->uMiscFeat = GIM_HV_MISC_FEAT_TIMER_FREQ;
 
+        /* Hypervisor recommendations to the guest. */
         pHv->uHyperHints = GIM_HV_HINT_MSR_FOR_SYS_RESET;
+
+        /* Hypervisor capabilities; features used by the hypervisor. */
+        pHv->uHyperCaps  = HMIsNestedPagingActive(pVM)   ? GIM_HV_HOST_FEAT_NESTED_PAGING : 0;
+        pHv->uHyperCaps |= HMAreMsrBitmapsAvailable(pVM) ? GIM_HV_HOST_FEAT_MSR_BITMAP : 0;
     }
 
@@ -161 +168 @@
     RT_ZERO(HyperLeaf);
     HyperLeaf.uLeaf        = UINT32_C(0x40000000);
-    HyperLeaf.uEax         = UINT32_C(0x40000005); /* Minimum value for Hyper-V */
+    HyperLeaf.uEax         = UINT32_C(0x40000006); /* Minimum value for Hyper-V is 0x40000005. */
     HyperLeaf.uEbx         = 0x7263694D;           /* 'Micr' */
     HyperLeaf.uEcx         = 0x666F736F;           /* 'osof' */
@@ -203 +210 @@
     AssertLogRelRCReturn(rc, rc);
 
+    HyperLeaf.uLeaf        = UINT32_C(0x40000006);
+    HyperLeaf.uEax         = pHv->uHyperCaps;
+    HyperLeaf.uEbx         = 0;
+    HyperLeaf.uEcx         = 0;
+    HyperLeaf.uEdx         = 0;
+    rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+    AssertLogRelRCReturn(rc, rc);
+
     /*
      * Insert all MSR ranges of Hyper-V.
@@ -321 +336 @@
     rc = SSMR3PutU32(pSSM, pcHv->uMiscFeat);                AssertRCReturn(rc, rc);
     rc = SSMR3PutU32(pSSM, pcHv->uHyperHints);              AssertRCReturn(rc, rc);
+    rc = SSMR3PutU32(pSSM, pcHv->uHyperCaps);               AssertRCReturn(rc, rc);
 
     /*
@@ -384 +400 @@
     rc = SSMR3GetU32(pSSM, &pHv->uMiscFeat);                AssertRCReturn(rc, rc);
     rc = SSMR3GetU32(pSSM, &pHv->uHyperHints);              AssertRCReturn(rc, rc);
+    rc = SSMR3GetU32(pSSM, &pHv->uHyperCaps);               AssertRCReturn(rc, rc);
 
     /*