summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
diff options
context:
space:
mode:
authorVishal Annapurve <vannapurve@google.com>2023-01-11 00:44:44 +0000
committerSean Christopherson <seanjc@google.com>2023-01-24 10:06:32 -0800
commite6df2ae3f57c6bfab29e767796ce8d4796a84ebb (patch)
tree6bf97a5310c00974b37378736d2527399fd4dd32 /tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
parente99b0d4cc2b679c5892d0994610b44e7b584d98b (diff)
KVM: selftests: x86: Cache host CPU vendor (AMD vs. Intel)
Cache the host CPU vendor for userspace and share it with guest code. All the current callers of this_cpu* actually care about host cpu so they are updated to check host_cpu_is*. Suggested-by: Sean Christopherson <seanjc@google.com> Reviewed-by: David Matlack <dmatlack@google.com> Signed-off-by: Vishal Annapurve <vannapurve@google.com> Link: https://lore.kernel.org/r/20230111004445.416840-3-vannapurve@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c')
-rw-r--r--tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c b/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
index 5489c9836ec8..0f728f05ea82 100644
--- a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
+++ b/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
@@ -48,10 +48,10 @@ static void guest_main(void)
const uint8_t *other_hypercall_insn;
uint64_t ret;
- if (this_cpu_is_intel()) {
+ if (host_cpu_is_intel) {
native_hypercall_insn = vmx_vmcall;
other_hypercall_insn = svm_vmmcall;
- } else if (this_cpu_is_amd()) {
+ } else if (host_cpu_is_amd) {
native_hypercall_insn = svm_vmmcall;
other_hypercall_insn = vmx_vmcall;
} else {