diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-11-17 13:20:01 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-11-17 13:20:01 +0100 |
| commit | fc3790fa0768a789d9163608b4414e2d595be5fe (patch) | |
| tree | 6ea03485239d8ceee413f774c6e6cc1f5d20c3ca /virt/kvm/arm/vgic/vgic-init.c | |
| parent | cf9b0772f2e410645fece13b749bd56505b998b8 (diff) | |
| parent | 95b110ab9a093b5baf3a72e51f71279368d618e2 (diff) | |
| download | linux-fc3790fa0768a789d9163608b4414e2d595be5fe.tar.gz linux-fc3790fa0768a789d9163608b4414e2d595be5fe.tar.bz2 linux-fc3790fa0768a789d9163608b4414e2d595be5fe.zip | |
Merge tag 'kvm-arm-gicv4-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
GICv4 Support for KVM/ARM for v4.15
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-init.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-init.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c index 5801261f3add..62310122ee78 100644 --- a/virt/kvm/arm/vgic/vgic-init.c +++ b/virt/kvm/arm/vgic/vgic-init.c @@ -285,6 +285,10 @@ int vgic_init(struct kvm *kvm) if (ret) goto out; + ret = vgic_v4_init(kvm); + if (ret) + goto out; + kvm_for_each_vcpu(i, vcpu, kvm) kvm_vgic_vcpu_enable(vcpu); @@ -320,6 +324,9 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) kfree(dist->spis); dist->nr_spis = 0; + + if (vgic_supports_direct_msis(kvm)) + vgic_v4_teardown(kvm); } void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) |