Commit e387f99e authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Anthony Liguori
Browse files

virtio-pci: fix irqfd cleanup argument order 



Order of arguments of kvm_virtio_pci_irqfd_release
got mixed up in all calls.
As a result users see assertions during cleanup.

Reported-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Tested-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Tested-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 782beb52

hw/virtio-pci.c

+3 −3
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ undo: 
            continue;

        }

        if (proxy->vdev->guest_notifier_mask) {

            kvm_virtio_pci_irqfd_release(proxy, vector, queue_no);

            kvm_virtio_pci_irqfd_release(proxy, queue_no, vector);

        }

        kvm_virtio_pci_vq_vector_release(proxy, vector);

    }
@@ -602,7 +602,7 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs) 
         * Otherwise, it was cleaned when masked in the frontend.

         */

        if (proxy->vdev->guest_notifier_mask) {

            kvm_virtio_pci_irqfd_release(proxy, vector, queue_no);

            kvm_virtio_pci_irqfd_release(proxy, queue_no, vector);

        }

        kvm_virtio_pci_vq_vector_release(proxy, vector);

    }
@@ -651,7 +651,7 @@ static void kvm_virtio_pci_vq_vector_mask(VirtIOPCIProxy *proxy, 
    if (proxy->vdev->guest_notifier_mask) {

        proxy->vdev->guest_notifier_mask(proxy->vdev, queue_no, true);

    } else {

        kvm_virtio_pci_irqfd_release(proxy, vector, queue_no);

        kvm_virtio_pci_irqfd_release(proxy, queue_no, vector);

    }

}