From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MNQ6S-00083K-7Y for qemu-devel@nongnu.org; Sun, 05 Jul 2009 07:41:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MNQ6N-00081H-Fj for qemu-devel@nongnu.org; Sun, 05 Jul 2009 07:41:51 -0400 Received: from [199.232.76.173] (port=50326 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MNQ6N-00081B-A2 for qemu-devel@nongnu.org; Sun, 05 Jul 2009 07:41:47 -0400 Received: from mx2.redhat.com ([66.187.237.31]:43988) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MNQ6M-00079D-U4 for qemu-devel@nongnu.org; Sun, 05 Jul 2009 07:41:47 -0400 Date: Sun, 5 Jul 2009 14:41:05 +0300 From: "Michael S. Tsirkin" Message-ID: <20090705114105.GF4798@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCHv4 5/5] qemu/virtio: mark msi vectors used on load List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, avi@redhat.com, kvm@vger.kernel.org, aliguori@us.ibm.com, kwolf@redhat.com, glommer@redhat.com, blauwirbel@gmail.com Usage of msi vectors is 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 --- hw/virtio-pci.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index f7da503..ddc3abb 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -131,6 +131,10 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f) msix_load(&proxy->pci_dev, f); if (msix_present(&proxy->pci_dev)) qemu_get_be16s(f, &proxy->vdev->config_vector); + else + proxy->vdev->config_vector = VIRTIO_NO_VECTOR; + if (proxy->vdev->config_vector != VIRTIO_NO_VECTOR) + return msix_vector_use(&proxy->pci_dev, proxy->vdev->config_vector); return 0; } @@ -138,10 +142,13 @@ static int virtio_pci_load_queue(void * opaque, int n, QEMUFile *f) { VirtIOPCIProxy *proxy = opaque; uint16_t vector; - if (!msix_present(&proxy->pci_dev)) - return 0; - qemu_get_be16s(f, &vector); + if (msix_present(&proxy->pci_dev)) + qemu_get_be16s(f, &vector); + else + vector = VIRTIO_NO_VECTOR; virtio_queue_set_vector(proxy->vdev, n, vector); + if (vector != VIRTIO_NO_VECTOR) + return msix_vector_use(&proxy->pci_dev, vector); return 0; } -- 1.6.2.2