summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/kvm/lib/aarch64/vgic.c
diff options
context:
space:
mode:
authorSean Christopherson <seanjc@google.com>2022-02-17 23:21:33 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2022-06-11 18:46:22 +0300
commit279eacbefad5d163a20f8fcde2fd9362bc24f7c7 (patch)
tree84e74b7563361b0ad79a364f62e903762fedfccf /tools/testing/selftests/kvm/lib/aarch64/vgic.c
parent98f94ce42ac672b2abdcf38cfc0e60fd52e04995 (diff)
downloadlinux-279eacbefad5d163a20f8fcde2fd9362bc24f7c7.tar.xz
KVM: selftests: Multiplex return code and fd in __kvm_create_device()
Multiplex the return value and fd (on success) in __kvm_create_device() to mimic common library helpers that return file descriptors, e.g. open(). Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tools/testing/selftests/kvm/lib/aarch64/vgic.c')
-rw-r--r--tools/testing/selftests/kvm/lib/aarch64/vgic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/testing/selftests/kvm/lib/aarch64/vgic.c b/tools/testing/selftests/kvm/lib/aarch64/vgic.c
index 74b4bcaffcfa..7925b4c5dad0 100644
--- a/tools/testing/selftests/kvm/lib/aarch64/vgic.c
+++ b/tools/testing/selftests/kvm/lib/aarch64/vgic.c
@@ -51,8 +51,9 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs,
nr_vcpus, nr_vcpus_created);
/* Distributor setup */
- if (__kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, &gic_fd))
- return -1;
+ gic_fd = __kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3);
+ if (gic_fd < 0)
+ return gic_fd;
kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS,
0, &nr_irqs, true);