]> git.ipfire.org Git - thirdparty/qemu.git/commit
vfio/pci: Call vfio_prepare_kvm_msi_virq_batch() in MSI retry path
authorShameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Tue, 13 Jun 2023 14:09:43 +0000 (15:09 +0100)
committerMichael Tokarev <mjt@tls.msk.ru>
Fri, 30 Jun 2023 16:02:13 +0000 (19:02 +0300)
commit383fb8c05c4a5db4b7afda11c1752a80b1e74be1
treed3eaa3ebe558dfd7a2738ed966c731ca23f4e865
parent58b3e4ff5f7eb0aa9c6148c5eeea2454a00c1eac
vfio/pci: Call vfio_prepare_kvm_msi_virq_batch() in MSI retry path

When vfio_enable_vectors() returns with less than requested nr_vectors
we retry with what kernel reported back. But the retry path doesn't
call vfio_prepare_kvm_msi_virq_batch() and this results in,

qemu-system-aarch64: vfio: Error: Failed to enable 4 MSI vectors, retry with 1
qemu-system-aarch64: ../hw/vfio/pci.c:602: vfio_commit_kvm_msi_virq_batch: Assertion `vdev->defer_kvm_irq_routing' failed

Fixes: dc580d51f7dd ("vfio: defer to commit kvm irq routing when enable msi/msix")
Reviewed-by: Longpeng <longpeng2@huawei.com>
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
(cherry picked from commit c17408892319712c12357e5d1c6b305499c58c2a)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
hw/vfio/pci.c