[kvm-unit-tests PATCH] x86: Don't test 64-bit-only MSRs in 32-bit build

[kvm-unit-tests PATCH] x86: Don't test 64-bit-only MSRs in 32-bit build

[Sean Christopherson]

Skip the 64-bit-only MSRs on 32-bit to avoid triple faults due to #GPs
on the MSR access.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
 x86/msr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x86/msr.c b/x86/msr.c
index ffc24b1..beb321f 100644
--- a/x86/msr.c
+++ b/x86/msr.c
@@ -48,7 +48,6 @@ struct msr_info msr_info[] =
     { .index = 0xc0000080, .name = "MSR_EFER",
       .val_pairs = {{ .valid = 1, .value = 0xD00, .expected = 0xD00}}
     },
-#endif
     { .index = 0xc0000082, .name = "MSR_LSTAR",
       .val_pairs = {{ .valid = 1, .value = addr_64, .expected = addr_64}}
     },
@@ -58,6 +57,7 @@ struct msr_info msr_info[] =
     { .index = 0xc0000084, .name = "MSR_SYSCALL_MASK",
       .val_pairs = {{ .valid = 1, .value = 0xffffffff, .expected = 0xffffffff}}
     },
+#endif
 
 //    MSR_IA32_DEBUGCTLMSR needs svm feature LBRV
 //    MSR_VM_HSAVE_PA only AMD host
-- 
2.22.0