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

KVM: selftests: Convert hyperv_svm_test away from VCPU_ID 



Convert hyperv_svm_test to use vm_create_with_one_vcpu() and pass around a
'struct kvm_vcpu' object instead of using a global VCPU_ID.  Note, this is
a "functional" change in the sense that the test now creates a vCPU with
vcpu_id==0 instead of vcpu_id==1.  The non-zero VCPU_ID was 100% arbitrary
and added little to no validation coverage.  If testing non-zero vCPU IDs
is desirable for generic tests, that can be done in the future by tweaking
the VM creation helpers.

Opportunistically use vcpu_run() instead of _vcpu_run(), the test expects
KVM_RUN to succeed.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5e7cb715

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

+7 −7
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include "svm_util.h"

#include "hyperv.h"



#define VCPU_ID		1

#define L2_GUEST_STACK_SIZE 256



struct hv_enlightenments {
@@ -122,6 +121,7 @@ int main(int argc, char *argv[]) 
{

	vm_vaddr_t nested_gva = 0;



	struct kvm_vcpu *vcpu;

	struct kvm_vm *vm;

	struct kvm_run *run;

	struct ucall uc;
@@ -132,20 +132,20 @@ int main(int argc, char *argv[]) 
		exit(KSFT_SKIP);

	}

	/* Create VM */

	vm = vm_create_default(VCPU_ID, 0, guest_code);

	vcpu_set_hv_cpuid(vm, VCPU_ID);

	run = vcpu_state(vm, VCPU_ID);

	vm = vm_create_with_one_vcpu(&vcpu, guest_code);

	vcpu_set_hv_cpuid(vm, vcpu->id);

	run = vcpu->run;

	vcpu_alloc_svm(vm, &nested_gva);

	vcpu_args_set(vm, VCPU_ID, 1, nested_gva);

	vcpu_args_set(vm, vcpu->id, 1, nested_gva);



	for (stage = 1;; stage++) {

		_vcpu_run(vm, VCPU_ID);

		vcpu_run(vm, vcpu->id);

		TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,

			    "Stage %d: unexpected exit reason: %u (%s),\n",

			    stage, run->exit_reason,

			    exit_reason_str(run->exit_reason));



		switch (get_ucall(vm, VCPU_ID, &uc)) {

		switch (get_ucall(vm, vcpu->id, &uc)) {

		case UCALL_ABORT:

			TEST_FAIL("%s at %s:%ld", (const char *)uc.args[0],

				  __FILE__, uc.args[1]);