Commit 9393cb13 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Use kvm_has_cap(), not kvm_check_cap(), where possible 



Replace calls to kvm_check_cap() that treat its return as a boolean with
calls to kvm_has_cap().  Several instances of kvm_check_cap() were missed
when kvm_has_cap() was introduced.

Reported-by: default avatarAndrew Jones <drjones@redhat.com>
Fixes: 3ea9b809 ("KVM: selftests: Add kvm_has_cap() to provide syntactic sugar")
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20220613161942.1586791-5-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 96f113c4

tools/testing/selftests/kvm/aarch64/psci_test.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static void host_test_system_suspend(void) 


int main(void)

{

	TEST_REQUIRE(kvm_check_cap(KVM_CAP_ARM_SYSTEM_SUSPEND));

	TEST_REQUIRE(kvm_has_cap(KVM_CAP_ARM_SYSTEM_SUSPEND));



	host_test_cpu_on();

	host_test_system_suspend();

tools/testing/selftests/kvm/lib/x86_64/processor.c

+2 −2
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ struct kvm_x86_state *vcpu_save_state(struct kvm_vcpu *vcpu) 
	vcpu_regs_get(vcpu, &state->regs);

	vcpu_save_xsave_state(vcpu, state);



	if (kvm_check_cap(KVM_CAP_XCRS))

	if (kvm_has_cap(KVM_CAP_XCRS))

		vcpu_xcrs_get(vcpu, &state->xcrs);



	vcpu_sregs_get(vcpu, &state->sregs);
@@ -1022,7 +1022,7 @@ void vcpu_load_state(struct kvm_vcpu *vcpu, struct kvm_x86_state *state) 
	vcpu_sregs_set(vcpu, &state->sregs);

	vcpu_msrs_set(vcpu, &state->msrs);



	if (kvm_check_cap(KVM_CAP_XCRS))

	if (kvm_has_cap(KVM_CAP_XCRS))

		vcpu_xcrs_set(vcpu, &state->xcrs);



	vcpu_xsave_set(vcpu,  state->xsave);

tools/testing/selftests/kvm/s390x/sync_regs_test.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ int main(int argc, char *argv[]) 
	struct kvm_vm *vm;

	int idx;



	TEST_REQUIRE(kvm_check_cap(KVM_CAP_SYNC_REGS));

	TEST_REQUIRE(kvm_has_cap(KVM_CAP_SYNC_REGS));



	/* Tell stdout not to buffer its content */

	setbuf(stdout, NULL);

tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ int main(int argc, char *argv[]) 
	/* Tell stdout not to buffer its content */

	setbuf(stdout, NULL);



	TEST_REQUIRE(kvm_check_cap(KVM_CAP_PMU_EVENT_FILTER));

	TEST_REQUIRE(kvm_has_cap(KVM_CAP_PMU_EVENT_FILTER));



	TEST_REQUIRE(use_intel_pmu() || use_amd_pmu());

	guest_code = use_intel_pmu() ? intel_guest_code : amd_guest_code;

tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c

+3 −3
Original line number Diff line number Diff line
@@ -411,16 +411,16 @@ int main(int argc, char *argv[]) 


	have_sev_es = !!(cpuid->eax & X86_FEATURE_SEV_ES);



	if (kvm_check_cap(KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM)) {

	if (kvm_has_cap(KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM)) {

		test_sev_migrate_from(/* es= */ false);

		if (have_sev_es)

			test_sev_migrate_from(/* es= */ true);

		test_sev_migrate_locking();

		test_sev_migrate_parameters();

		if (kvm_check_cap(KVM_CAP_VM_COPY_ENC_CONTEXT_FROM))

		if (kvm_has_cap(KVM_CAP_VM_COPY_ENC_CONTEXT_FROM))

			test_sev_move_copy();

	}

	if (kvm_check_cap(KVM_CAP_VM_COPY_ENC_CONTEXT_FROM)) {

	if (kvm_has_cap(KVM_CAP_VM_COPY_ENC_CONTEXT_FROM)) {

		test_sev_mirror(/* es= */ false);

		if (have_sev_es)

			test_sev_mirror(/* es= */ true);