1 files changed, 10 insertions, 9 deletions

diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index 15e79285380d..78d11aed1e17 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -1169,11 +1169,12 @@ static int vgic_its_cmd_handle_invall(struct kvm *kvm, struct vgic_its *its,
 static int vgic_its_cmd_handle_movall(struct kvm *kvm, struct vgic_its *its,
                                       u64 *its_cmd)
 {
-        struct vgic_dist *dist = &kvm->arch.vgic;
         u32 target1_addr = its_cmd_get_target_addr(its_cmd);
         u32 target2_addr = its_cmd_mask_field(its_cmd, 3, 16, 32);
         struct kvm_vcpu *vcpu1, *vcpu2;
         struct vgic_irq *irq;
+        u32 *intids;
+        int irq_count, i;
 
         if (target1_addr >= atomic_read(&kvm->online_vcpus) ||
             target2_addr >= atomic_read(&kvm->online_vcpus))
@@ -1185,19 +1186,19 @@ static int vgic_its_cmd_handle_movall(struct kvm *kvm, struct vgic_its *its,
         vcpu1 = kvm_get_vcpu(kvm, target1_addr);
         vcpu2 = kvm_get_vcpu(kvm, target2_addr);
 
-        spin_lock(&dist->lpi_list_lock);
+        irq_count = vgic_copy_lpi_list(vcpu1, &intids);
+        if (irq_count < 0)
+                return irq_count;
 
-        list_for_each_entry(irq, &dist->lpi_list_head, lpi_list) {
-                spin_lock(&irq->irq_lock);
+        for (i = 0; i < irq_count; i++) {
+                irq = vgic_get_irq(kvm, NULL, intids[i]);
 
-                if (irq->target_vcpu == vcpu1)
-                        irq->target_vcpu = vcpu2;
+                update_affinity(irq, vcpu2);
 
-                spin_unlock(&irq->irq_lock);
+                vgic_put_irq(kvm, irq);
         }
 
-        spin_unlock(&dist->lpi_list_lock);
-
+        kfree(intids);
         return 0;
 }