diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-25 09:49:30 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-25 09:49:30 -0500 |
| commit | ece32a75f003464cad59c26305b4462305273d70 (patch) | |
| tree | eeeec1b34efe28edf6b1860fc74d3b3e95f7a785 /tools/testing/selftests/kvm/lib/aarch64/vgic.c | |
| parent | 1a71581012ddf1f465040ef3d9f700341fa3cf04 (diff) | |
| parent | 456f89e0928ab938122a40e9f094a6524cc158b4 (diff) | |
Merge tag 'kvmarm-fixes-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 5.17, take #4
- Correctly synchronise PMR and co on PSCI CPU_SUSPEND
- Skip tests that depend on GICv3 when the HW isn't available
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); |