diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-03-04 18:39:29 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-03-04 18:39:29 -0500 |
| commit | 0564eeb71bbb0e1a566fb701f90155bef9e7a224 (patch) | |
| tree | 2935323651d0f8ab2acb5f96f6ee6c722a9cad5a /tools/testing/selftests/kvm/lib/aarch64/vgic.c | |
| parent | b652de1e3dfb3b49e539e88a684a68e333e1bd7c (diff) | |
| parent | 8d25b7beca7ed6ca34f53f0f8abd009e2be15d94 (diff) | |
| download | linux-stable-0564eeb71bbb0e1a566fb701f90155bef9e7a224.tar.gz linux-stable-0564eeb71bbb0e1a566fb701f90155bef9e7a224.tar.bz2 linux-stable-0564eeb71bbb0e1a566fb701f90155bef9e7a224.zip | |
Merge branch 'kvm-bugfixes' into HEAD
Merge bugfixes from 5.17 before merging more tricky work.
Diffstat (limited to 'tools/testing/selftests/kvm/lib/aarch64/vgic.c')
| -rw-r--r-- | tools/testing/selftests/kvm/lib/aarch64/vgic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/selftests/kvm/lib/aarch64/vgic.c b/tools/testing/selftests/kvm/lib/aarch64/vgic.c index b3a0fca0d780..f5cd0c536d85 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/vgic.c +++ b/tools/testing/selftests/kvm/lib/aarch64/vgic.c @@ -52,7 +52,9 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs, nr_vcpus, nr_vcpus_created); /* Distributor setup */ - gic_fd = kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); + if (_kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, + false, &gic_fd) != 0) + return -1; kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0, &nr_irqs, true); |