Commit c8a11a93 authored by Paolo Bonzini's avatar Paolo Bonzini

Merge tag 'kvmarm-fixes-6.7-1' of...

Merge tag 'kvmarm-fixes-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/arm64 fixes for 6.7, take #1

 - Avoid mapping vLPIs that have already been mapped
parents 33cc938e 8e4ece68
...@@ -436,6 +436,10 @@ int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int virq, ...@@ -436,6 +436,10 @@ int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int virq,
if (ret) if (ret)
goto out; goto out;
/* Silently exit if the vLPI is already mapped */
if (irq->hw)
goto out;
/* /*
* Emit the mapping request. If it fails, the ITS probably * Emit the mapping request. If it fails, the ITS probably
* isn't v4 compatible, so let's silently bail out. Holding * isn't v4 compatible, so let's silently bail out. Holding
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment