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

KVM: selftests: Use vcpu_access_device_attr() in arm64 code 



Use vcpu_access_device_attr() in arm's arch_timer test instead of
manually retrieving the vCPU's fd.  This will allow dropping vcpu_get_fd()
in a future patch.

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

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

+4 −6
Original line number Diff line number Diff line
@@ -349,11 +349,9 @@ static void test_run(struct kvm_vm *vm) 
static void test_init_timer_irq(struct kvm_vm *vm)

{

	/* Timer initid should be same for all the vCPUs, so query only vCPU-0 */

	int vcpu0_fd = vcpu_get_fd(vm, 0);



	kvm_device_access(vcpu0_fd, KVM_ARM_VCPU_TIMER_CTRL,

	vcpu_access_device_attr(vm, 0, KVM_ARM_VCPU_TIMER_CTRL,

				KVM_ARM_VCPU_TIMER_IRQ_PTIMER, &ptimer_irq, false);

	kvm_device_access(vcpu0_fd, KVM_ARM_VCPU_TIMER_CTRL,

	vcpu_access_device_attr(vm, 0, KVM_ARM_VCPU_TIMER_CTRL,

				KVM_ARM_VCPU_TIMER_IRQ_VTIMER, &vtimer_irq, false);



	sync_global_to_guest(vm, ptimer_irq);