[PATCH 2/2] kvm: fix kvm_irqchip_release_virq loop after swap-remove

[Bin Guo <guobin@linux.alibaba.com>]

In kvm_irqchip_release_virq(), when an entry matching the target GSI is
found, the code removes it by swapping in the last entry:

    s->irq_routes->nr--;
    *e = s->irq_routes->entries[s->irq_routes->nr];

However, the loop then increments `i` unconditionally, which means the
newly-swapped entry at position `i` is never re-checked. If that entry
also has `gsi == virq`, it will be skipped and left in the routing
table.

Fix this by decrementing `i` after the swap, so the same index is
re-examined in the next iteration.

Signed-off-by: Bin Guo <guobin@linux.alibaba.com>
---
 accel/kvm/kvm-all.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 70bc2c86a2..3c5b62c97e 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2278,6 +2278,7 @@ void kvm_irqchip_release_virq(KVMState *s, int virq)
         if (e->gsi == virq) {
             s->irq_routes->nr--;
             *e = s->irq_routes->entries[s->irq_routes->nr];
+            i--;
         }
     }
     clear_gsi(s, virq);
-- 
2.50.1 (Apple Git-155)