[PATCHv3 3/3] qemu/virtio: mark msi vectors used on load

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Which msi vectors are used controlled by the guest and so needs to be
restored on load. Do this for msi vectors used by the virtio device.

Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
---
 hw/msix.c       |    1 +
 hw/virtio-pci.c |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/msix.c b/hw/msix.c
index 98c62a5..46925d9 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -301,6 +301,7 @@ void msix_load(PCIDevice *dev, QEMUFile *f)
     if (!dev->cap_present & QEMU_PCI_CAP_MSIX)
         return;
 
+    msix_free_irq_entries(dev);
     qemu_get_buffer(f, dev->msix_table_page, n * MSIX_ENTRY_SIZE);
     qemu_get_buffer(f, dev->msix_table_page + MSIX_PAGE_PENDING, (n + 7) / 8);
 }
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index f7da503..66c779e 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -129,8 +129,10 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f)
     if (ret)
         return ret;
     msix_load(&proxy->pci_dev, f);
-    if (msix_present(&proxy->pci_dev))
+    if (msix_present(&proxy->pci_dev)) {
         qemu_get_be16s(f, &proxy->vdev->config_vector);
+        return msix_vector_use(&proxy->pci_dev, proxy->vdev->config_vector);
+    }
     return 0;
 }
 
@@ -142,7 +144,7 @@ static int virtio_pci_load_queue(void * opaque, int n, QEMUFile *f)
         return 0;
     qemu_get_be16s(f, &vector);
     virtio_queue_set_vector(proxy->vdev, n, vector);
-    return 0;
+    return msix_vector_use(&proxy->pci_dev, vector);
 }
 
 static void virtio_pci_reset(void *opaque)
-- 
1.6.2.2
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux