summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWei Wang <wei.w.wang@intel.com>2022-01-18 02:48:17 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2022-01-19 18:09:25 +0100
commit1a1d1dbce6d5477e2bb08ce1ef0d77caa838cc8e (patch)
treead20215853b9c47375743626fb4baa4a24bb8678 /tools
parentKVM: x86/cpuid: Clear XFD for component i if the base feature is missing (diff)
downloadlinux-1a1d1dbce6d5477e2bb08ce1ef0d77caa838cc8e.tar.xz
linux-1a1d1dbce6d5477e2bb08ce1ef0d77caa838cc8e.zip
kvm: selftests: conditionally build vm_xsave_req_perm()
vm_xsave_req_perm() is currently defined and used by x86_64 only. Make it compiled into vm_create_with_vcpus() only when on x86_64 machines. Otherwise, it would cause linkage errors, e.g. on s390x. Fixes: 415a3c33e8 ("kvm: selftests: Add support for KVM_CAP_XSAVE2") Reported-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com> Signed-off-by: Wei Wang <wei.w.wang@intel.com> Tested-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com> Message-Id: <20220118014817.30910-1-wei.w.wang@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/kvm/lib/kvm_util.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 4a645dc77f34..c22a17aac6b0 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -393,10 +393,12 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,
struct kvm_vm *vm;
int i;
+#ifdef __x86_64__
/*
* Permission needs to be requested before KVM_SET_CPUID2.
*/
vm_xsave_req_perm();
+#endif
/* Force slot0 memory size not small than DEFAULT_GUEST_PHY_PAGES */
if (slot0_mem_pages < DEFAULT_GUEST_PHY_PAGES)