Changeset 70451 in vbox

Timestamp:

Jan 3, 2018 4:06:17 PM (7 years ago)

Author:

vboxsync

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

120057

Message:

VMM/HMSVMR0: Nested Hw.virt: Fix regression with the guest GIF when introducing the VGIF feature on Ryzen CPUs (ifdef mismatch).

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (4 diffs)

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

@@ -813 +813 @@
     bool const fUseLbrVirt           = fLbrVirt; /** @todo CFGM, IEM implementation etc. */
 
+#ifdef VBOX_WITH_NESTED_HWVIRT
     bool const fVirtVmsaveVmload     = RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_VIRT_VMSAVE_VMLOAD);
     bool const fUseVirtVmsaveVmload  = fVirtVmsaveVmload && pVM->hm.s.svm.fVirtVmsaveVmload && pVM->hm.s.fNestedPaging;
@@ -818 +819 @@
     bool const fVGif                 = RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_VGIF);
     bool const fUseVGif              = fVGif && pVM->hm.s.svm.fVGif;
+#endif
 
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
@@ -888 +890 @@
             Assert(pVmcb->ctrl.LbrVirt.n.u1LbrVirt == 0);
 
+#ifdef VBOX_WITH_NESTED_HWVIRT
         /* Virtualized VMSAVE/VMLOAD. */
         pVmcb->ctrl.LbrVirt.n.u1VirtVmsaveVmload = fUseVirtVmsaveVmload;
@@ -903 +906 @@
                                          |  SVM_CTRL_INTERCEPT_STGI;
         }
+#endif
 
         /* Initially all VMCB clean bits MBZ indicating that everything should be loaded from the VMCB in memory. */