qemu/virtio: enable msi vectors on load

Commit Message

Michael S. Tsirkin July 2, 2009, 5:51 p.m. UTC

On load, enable msi vectors used by the virtio device.

Signed-off-by: Michael S. Tsirkin <[e-mail]>
---
 hw/virtio-pci.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index f7da503..4bbdca4 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -129,8 +129,11 @@  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)) {
+        msix_vector_unuse(&proxy->pci_dev, proxy->vdev->config_vector);
         qemu_get_be16s(f, &proxy->vdev->config_vector);
+        return msix_vector_use(&proxy->pci_dev, proxy->vdev->config_vector);
+    }
     return 0;
 }
 
@@ -140,9 +143,10 @@  static int virtio_pci_load_queue(void * opaque, int n, QEMUFile *f)
     uint16_t vector;
     if (!msix_present(&proxy->pci_dev))
         return 0;
+    msix_vector_unuse(&proxy->pci_dev, virtio_queue_vector(proxy->vdev, n));
     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)