| Message ID | 20220118014817.30910-1-wei.w.wang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kvm: selftests: conditionally build vm_xsave_req_perm() | expand |
On 1/18/22 02:48, Wei Wang wrote: > 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>
On 1/18/22 02:48, Wei Wang wrote: > 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> > --- > tools/testing/selftests/kvm/lib/kvm_util.c | 2 ++ > 1 file changed, 2 insertions(+) > > 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) Queued, thanks. Paolo
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)
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> --- tools/testing/selftests/kvm/lib/kvm_util.c | 2 ++ 1 file changed, 2 insertions(+)