Skip to contentSkip to conversation

svm: Updated cr4 in test_efer to fix report msg

PATCH Applied Lara Lazier 2 participants 2 messages Jun 21, 2021 – Jun 22, 2021 KVM

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 svm: Updated cr4 in test_efer to fix report msg

Updated cr4 so that cr4 and vmcb->save.cr4 are the same and the report statement prints out the correct cr4.

v1->v2: moved the assignment to vmcb->save.cr4 back to the previous test as described in the comment.

---
 x86/svm_tests.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
x86/svm_tests.c +5 -1
index 8387bea..824c856 100644
@@ -2251,8 +2251,12 @@ static void test_efer(void)
 
 	/*
 	 * EFER.LME and CR0.PG are both set and CR0.PE is zero.
+	 * CR4.PAE needs to be set as we otherwise cannot
+	 * determine if CR4.PAE=0 or CR0.PE=0 triggered the
+	 * SVM_EXIT_ERR.
 	 */
-	vmcb->save.cr4 = cr4_saved | X86_CR4_PAE;
+	cr4 = cr4_saved | X86_CR4_PAE;
+	vmcb->save.cr4 = cr4;
 	cr0 &= ~X86_CR0_PE;
 	vmcb->save.cr0 = cr0;
 	report(svm_vmrun() == SVM_EXIT_ERR, "EFER.LME=1 (%lx), "
Signature · 1 line
2.25.1
maintainer Applied
#1 lore raw
Quoted 5 lines · Lara Lazier

Updated cr4 so that cr4 and vmcb->save.cr4 are the same and the report statement prints out the correct cr4.

v1->v2: moved the assignment to vmcb->save.cr4 back to the previous test as described in the comment.

Applied, thanks!

[1/1] svm: Updated cr4 in test_efer to fix report msg

      commit: fc050452b8c37729c2348e7c63075cc2a9ae3738

Best regards,

Signature · 1 line
Paolo Bonzini <[email protected]>