Changeset 80660 in vbox

Timestamp:

Sep 9, 2019 7:47:17 AM (5 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested VMX: bugref:9180 Ensure MSR_IA32_BASIC bit 48 (the VMX physical address width bit) is set/cleared properly to match whether the CPU is capable of 64-bit or not (also is a requirement for kvm-intel module to load in the guest).

File:

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

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

@@ -4740 +4740 @@
             pVM->cpum.s.GuestFeatures.fLongMode = 1;
             pVM->cpum.s.GuestFeatures.cVmxMaxPhysAddrWidth = pVM->cpum.s.GuestFeatures.cMaxPhysAddrWidth;
+            if (pVM->cpum.s.GuestFeatures.fVmx)
+                for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+                {
+                    PVMCPU pVCpu = pVM->apCpusR3[idCpu];
+                    pVCpu->cpum.s.Guest.hwvirt.vmx.Msrs.u64Basic &= ~VMX_BASIC_PHYSADDR_WIDTH_32BIT;
+                }
             LogRel(("CPUM: SetGuestCpuIdFeature: Enabled LONG MODE\n"));
             break;
@@ -5060 +5066 @@
             pVM->cpum.s.GuestFeatures.fLongMode = 0;
             pVM->cpum.s.GuestFeatures.cVmxMaxPhysAddrWidth = 32;
+            if (pVM->cpum.s.GuestFeatures.fVmx)
+                for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+                {
+                    PVMCPU pVCpu = pVM->apCpusR3[idCpu];
+                    pVCpu->cpum.s.Guest.hwvirt.vmx.Msrs.u64Basic |= VMX_BASIC_PHYSADDR_WIDTH_32BIT;
+                }
             break;