Changeset 82578 in vbox

Timestamp:

Dec 13, 2019 11:24:45 AM (5 years ago)

Author:

vboxsync

Message:

CPUMR3CpuId: Some related stuff. tickref:19146

File:

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

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

@@ -27 +27 @@
 #include <VBox/vmm/ssm.h>
 #include "CPUMInternal.h"
-#include <VBox/vmm/vm.h>
+#include <VBox/vmm/vmcc.h>
 #include <VBox/vmm/mm.h>
 #include <VBox/sup.h>
@@ -4982 +4982 @@
                         AssertLogRelRC(rc);
                     }
+
+                    /* Advertise IBRS_ALL if present at this point... */
+                    if (pVM->cpum.s.HostFeatures.fArchCap & MSR_IA32_ARCH_CAP_F_IBRS_ALL)
+                        VMCC_FOR_EACH_VMCPU_STMT(pVM, pVCpu->cpum.s.GuestMsrs.msr.ArchCaps |= MSR_IA32_ARCH_CAP_F_IBRS_ALL);
                 }
 
@@ -5157 +5161 @@
             if (pLeaf)
                 pLeaf->uEdx &= ~(X86_CPUID_STEXT_FEATURE_EDX_IBRS_IBPB | X86_CPUID_STEXT_FEATURE_EDX_STIBP);
-            pVM->cpum.s.GuestFeatures.fSpeculationControl = 0;
+            VMCC_FOR_EACH_VMCPU_STMT(pVM, pVCpu->cpum.s.GuestMsrs.msr.ArchCaps &= ~MSR_IA32_ARCH_CAP_F_IBRS_ALL);
             Log(("CPUM: ClearGuestCpuIdFeature: Disabled speculation control!\n"));
             break;