diff mbox series

[kvm-unit-tests,06/12] nSVM: Stop forcing EFER.NX=1 for all tests

Message ID 20210622210047.3691840-7-seanjc@google.com (mailing list archive)
State New, archived
Headers show
Series nSVM: NPT improvements and cleanups | expand

Commit Message

Sean Christopherson June 22, 2021, 9 p.m. UTC 
Don't force EFER.NX=1 for SVM tests now that the one NPT test that needs
EFER.NX=1 does its own housekeeping.

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 x86/svm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/x86/svm.c b/x86/svm.c
index 6e5872d..0959189 100644
--- a/x86/svm.c
+++ b/x86/svm.c
@@ -295,7 +295,7 @@  static void set_additional_vcpu_msr(void *msr_efer)
 	void *hsave = alloc_page();
 
 	wrmsr(MSR_VM_HSAVE_PA, virt_to_phys(hsave));
-	wrmsr(MSR_EFER, (ulong)msr_efer | EFER_SVME | EFER_NX);
+	wrmsr(MSR_EFER, (ulong)msr_efer | EFER_SVME);
 }
 
 static void setup_svm(void)
@@ -306,7 +306,6 @@  static void setup_svm(void)
 
 	wrmsr(MSR_VM_HSAVE_PA, virt_to_phys(hsave));
 	wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_SVME);
-	wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_NX);
 
 	io_bitmap = (void *) ALIGN((ulong)io_bitmap_area, PAGE_SIZE);