Commit 76f972c2 authored by Mark Brown's avatar Mark Brown Committed by Paolo Bonzini

KVM: selftests: Fix build on architectures other than x86_64

The recent addition of support for testing with the x86 specific quirk
KVM_X86_QUIRK_SLOT_ZAP_ALL disabled in the generic memslot tests broke the
build of the KVM selftests for all other architectures:

In file included from include/kvm_util.h:8,
                 from include/memstress.h:13,
                 from memslot_modification_stress_test.c:21:
memslot_modification_stress_test.c: In function ‘main’:
memslot_modification_stress_test.c:176:38: error: ‘KVM_X86_QUIRK_SLOT_ZAP_ALL’ undeclared (first use in this function)
  176 |                                      KVM_X86_QUIRK_SLOT_ZAP_ALL);
      |                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~

Add __x86_64__ guard defines to avoid building the relevant code on other
architectures.

Fixes: 61de4c34 ("KVM: selftests: Test memslot move in memslot_perf_test with quirk disabled")
Fixes: 218f6415 ("KVM: selftests: Allow slot modification stress test with quirk disabled")
Reported-by: default avatarAishwarya TCV <aishwarya.tcv@arm.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Message-ID: <20240930-kvm-build-breakage-v1-1-866fad3cc164@kernel.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent efbc6bd0
...@@ -169,12 +169,14 @@ int main(int argc, char *argv[]) ...@@ -169,12 +169,14 @@ int main(int argc, char *argv[])
case 'i': case 'i':
p.nr_iterations = atoi_positive("Number of iterations", optarg); p.nr_iterations = atoi_positive("Number of iterations", optarg);
break; break;
#ifdef __x86_64__
case 'q': case 'q':
p.disable_slot_zap_quirk = true; p.disable_slot_zap_quirk = true;
TEST_REQUIRE(kvm_check_cap(KVM_CAP_DISABLE_QUIRKS2) & TEST_REQUIRE(kvm_check_cap(KVM_CAP_DISABLE_QUIRKS2) &
KVM_X86_QUIRK_SLOT_ZAP_ALL); KVM_X86_QUIRK_SLOT_ZAP_ALL);
break; break;
#endif
case 'h': case 'h':
default: default:
help(argv[0]); help(argv[0]);
......
...@@ -113,7 +113,9 @@ static_assert(ATOMIC_BOOL_LOCK_FREE == 2, "atomic bool is not lockless"); ...@@ -113,7 +113,9 @@ static_assert(ATOMIC_BOOL_LOCK_FREE == 2, "atomic bool is not lockless");
static sem_t vcpu_ready; static sem_t vcpu_ready;
static bool map_unmap_verify; static bool map_unmap_verify;
#ifdef __x86_64__
static bool disable_slot_zap_quirk; static bool disable_slot_zap_quirk;
#endif
static bool verbose; static bool verbose;
#define pr_info_v(...) \ #define pr_info_v(...) \
...@@ -579,8 +581,10 @@ static bool test_memslot_move_prepare(struct vm_data *data, ...@@ -579,8 +581,10 @@ static bool test_memslot_move_prepare(struct vm_data *data,
uint32_t guest_page_size = data->vm->page_size; uint32_t guest_page_size = data->vm->page_size;
uint64_t movesrcgpa, movetestgpa; uint64_t movesrcgpa, movetestgpa;
#ifdef __x86_64__
if (disable_slot_zap_quirk) if (disable_slot_zap_quirk)
vm_enable_cap(data->vm, KVM_CAP_DISABLE_QUIRKS2, KVM_X86_QUIRK_SLOT_ZAP_ALL); vm_enable_cap(data->vm, KVM_CAP_DISABLE_QUIRKS2, KVM_X86_QUIRK_SLOT_ZAP_ALL);
#endif
movesrcgpa = vm_slot2gpa(data, data->nslots - 1); movesrcgpa = vm_slot2gpa(data, data->nslots - 1);
...@@ -971,11 +975,13 @@ static bool parse_args(int argc, char *argv[], ...@@ -971,11 +975,13 @@ static bool parse_args(int argc, char *argv[],
case 'd': case 'd':
map_unmap_verify = true; map_unmap_verify = true;
break; break;
#ifdef __x86_64__
case 'q': case 'q':
disable_slot_zap_quirk = true; disable_slot_zap_quirk = true;
TEST_REQUIRE(kvm_check_cap(KVM_CAP_DISABLE_QUIRKS2) & TEST_REQUIRE(kvm_check_cap(KVM_CAP_DISABLE_QUIRKS2) &
KVM_X86_QUIRK_SLOT_ZAP_ALL); KVM_X86_QUIRK_SLOT_ZAP_ALL);
break; break;
#endif
case 's': case 's':
targs->nslots = atoi_paranoid(optarg); targs->nslots = atoi_paranoid(optarg);
if (targs->nslots <= 1 && targs->nslots != -1) { if (targs->nslots <= 1 && targs->nslots != -1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment