KVM: selftests: Make test skipping consistent (08d3e277) · Commits · 戴 / test

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -211,8 +211,8 @@ int main(void)
		struct kvm_vm *vm;

		if (!kvm_check_cap(KVM_CAP_ENFORCE_PV_FEATURE_CPUID)) {
		pr_info("will skip kvm paravirt restriction tests.\n");
		return 0;
		print_skip("KVM_CAP_ENFORCE_PV_FEATURE_CPUID not supported");
		exit(KSFT_SKIP);
		}

		vm = vm_create_default(VCPU_ID, 0, guest_main);

+5 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,11 @@ int main(int argc, char *argv[])
		run = vcpu_state(vm, VCPU_ID);

		rc = kvm_check_cap(KVM_CAP_X86_USER_SPACE_MSR);
		TEST_ASSERT(rc, "KVM_CAP_X86_USER_SPACE_MSR is available");
		if (!rc) {
		print_skip("KVM_CAP_X86_USER_SPACE_MSR not supported");
		exit(KSFT_SKIP);
		}

		vm_enable_cap(vm, &cap);

		rc = kvm_check_cap(KVM_CAP_X86_MSR_FILTER);

+7 −7

Original line number	Diff line number	Diff line
		@@ -169,6 +169,11 @@ int main(int argc, char *argv[])
		*/
		nested_vmx_check_supported();

		if (!kvm_check_cap(KVM_CAP_NESTED_STATE)) {
		print_skip("KVM_CAP_NESTED_STATE not supported");
		exit(KSFT_SKIP);
		}

		/* Create VM */
		vm = vm_create_default(VCPU_ID, 0, guest_code);
		vcpu_set_cpuid(vm, VCPU_ID, kvm_get_supported_cpuid());
		@@ -176,13 +181,8 @@ int main(int argc, char *argv[])

		vcpu_regs_get(vm, VCPU_ID, &regs1);

		if (kvm_check_cap(KVM_CAP_NESTED_STATE)) {
		vcpu_alloc_vmx(vm, &vmx_pages_gva);
		vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);
		} else {
		pr_info("will skip vmx preemption timer checks\n");
		goto done;
		}

		for (stage = 1;; stage++) {
		_vcpu_run(vm, VCPU_ID);