儲存庫 vbox 的更動 65405

時間撮記:

2017-1-23 下午03:46:16 (8 年 以前)

作者:

vboxsync

訊息:

VMM: KVM workaround: don't read MSR_IA32_SMM_MONITOR_CTL if dual-monitor treatment of system-management interrupts and system-management code is not supported

檔案:

• trunk/src/VBox/VMM/VMMR0/HMR0.cpp (修改) (1 筆差異)

trunk/src/VBox/VMM/VMMR0/HMR0.cpp

@@ -389 +389 @@
              */
             g_HmR0.vmx.u64HostCr4           = ASMGetCR4();
-            g_HmR0.vmx.u64HostSmmMonitorCtl = ASMRdMsr(MSR_IA32_SMM_MONITOR_CTL);
             g_HmR0.vmx.u64HostEfer          = ASMRdMsr(MSR_K6_EFER);
             g_HmR0.vmx.Msrs.u64BasicInfo    = ASMRdMsr(MSR_IA32_VMX_BASIC_INFO);
+            /* KVM workaround: Intel SDM section 34.15.5 describes that MSR_IA32_SMM_MONITOR_CTL
+             * depends on bit 49 MSR_IA32_VMX_BASIC_INFO while table 35-2 says that this MSR
+             * is available if either VMX or SMX is supported. */
+            if (MSR_IA32_VMX_BASIC_INFO_VMCS_DUAL_MON(g_HmR0.vmx.Msrs.u64BasicInfo))
+                g_HmR0.vmx.u64HostSmmMonitorCtl = ASMRdMsr(MSR_IA32_SMM_MONITOR_CTL);
             g_HmR0.vmx.Msrs.VmxPinCtls.u    = ASMRdMsr(MSR_IA32_VMX_PINBASED_CTLS);
             g_HmR0.vmx.Msrs.VmxProcCtls.u   = ASMRdMsr(MSR_IA32_VMX_PROCBASED_CTLS);