diff options
| author | Paolo Bonzini | 2016-08-04 13:59:56 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2016-08-04 13:59:56 +0200 |
| commit | 6f49b2f3414622d3e41135a65dac98968956662b (patch) | |
| tree | efd4c358a40b9e6adb9dd35de3407bbf17bd2935 /virt/kvm/arm/vgic/vgic-init.c | |
| parent | x86: vdso: use __pvclock_read_cycles (diff) | |
| parent | arm64: KVM: Set cpsr before spsr on fault injection (diff) | |
| download | kernel-qcow2-linux-6f49b2f3414622d3e41135a65dac98968956662b.tar.gz kernel-qcow2-linux-6f49b2f3414622d3e41135a65dac98968956662b.tar.xz kernel-qcow2-linux-6f49b2f3414622d3e41135a65dac98968956662b.zip | |
Merge tag 'kvm-arm-for-4.8-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Changes for v4.8 - Take 2
Includes GSI routing support to go along with the new VGIC and a small fix that
has been cooking in -next for a while.
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-init.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c index 1e30ce08700d..fb4b0a79a950 100644 --- a/virt/kvm/arm/vgic/vgic-init.c +++ b/virt/kvm/arm/vgic/vgic-init.c @@ -264,6 +264,10 @@ int vgic_init(struct kvm *kvm) kvm_for_each_vcpu(i, vcpu, kvm) kvm_vgic_vcpu_init(vcpu); + ret = kvm_vgic_setup_default_irq_routing(kvm); + if (ret) + goto out; + dist->initialized = true; out: return ret; |