Changeset 63945 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 22, 2016 12:01:10 PM (8 years ago)

Author:

vboxsync

Message:

VMM/APIC, VMM/GIM/HyperV: Fix MSR range insertion/removale ordering issue between APIC and GIM introduced in r110830.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• APIC.cpp (modified) (1 diff)
• GIMHv.cpp (modified) (3 diffs)

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

@@ -1738 +1738 @@
         rc = CPUMR3MsrRangesInsert(pVM, &g_MsrRange_x2Apic_Invalid);
         AssertLogRelRCReturn(rc, rc);
-        LogRel(("APIC: Removed x2APIC MSR range\n"));
     }
 

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

@@ -255 +255 @@
                        //| GIM_HV_BASE_FEAT_VP_RUNTIME_MSR
                        | GIM_HV_BASE_FEAT_PART_TIME_REF_COUNT_MSR
-                       //| GIM_HV_BASE_FEAT_BASIC_SYNIC_MSRS
-                       //| GIM_HV_BASE_FEAT_STIMER_MSRS
+                       //| GIM_HV_BASE_FEAT_BASIC_SYNIC_MSRS          // Required for synethetic timers
+                       //| GIM_HV_BASE_FEAT_STIMER_MSRS               // Required for synethetic timers
                        | GIM_HV_BASE_FEAT_APIC_ACCESS_MSRS
                        | GIM_HV_BASE_FEAT_HYPERCALL_MSRS
@@ -506 +506 @@
 
     /*
-     * Inform APIC whether Hyper-V compatibility mode is enabled or not.
-     */
-    if (pHv->uHyperHints & GIM_HV_HINT_X2APIC_MSRS)
-        APICR3HvSetCompatMode(pVM, true);
-
-    /*
      * Register statistics.
      */
@@ -564 +558 @@
     int rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
     AssertLogRelRCReturn(rc, rc);
+
+    /*
+     * Inform APIC whether Hyper-V compatibility mode is enabled or not.
+     * Do this here rather than on gimR3HvInit() as it gets called after APIC
+     * has finished inserting/removing the x2APIC MSR range.
+     */
+    if (pHv->uHyperHints & GIM_HV_HINT_X2APIC_MSRS)
+        APICR3HvSetCompatMode(pVM, true);
 
     return rc;