From: "Michael S. Tsirkin" <mst@redhat.com> 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 Subject: [PATCHv5 5/5] qemu/virtio: mark msi vectors used on load Date: Sun, 5 Jul 2009 16:02:34 +0300 [thread overview] Message-ID: <20090705130234.GF5417@redhat.com> (raw) In-Reply-To: <cover.1246798625.git.mst@redhat.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 <mst@redhat.com> --- hw/virtio-pci.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index f7da503..19ba5b8 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -126,11 +126,18 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f) VirtIOPCIProxy *proxy = opaque; int ret; ret = pci_device_load(&proxy->pci_dev, f); - if (ret) + 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); + } 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 +145,15 @@ 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
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> 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 Subject: [Qemu-devel] [PATCHv5 5/5] qemu/virtio: mark msi vectors used on load Date: Sun, 5 Jul 2009 16:02:34 +0300 [thread overview] Message-ID: <20090705130234.GF5417@redhat.com> (raw) In-Reply-To: <cover.1246798625.git.mst@redhat.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 <mst@redhat.com> --- hw/virtio-pci.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index f7da503..19ba5b8 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -126,11 +126,18 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f) VirtIOPCIProxy *proxy = opaque; int ret; ret = pci_device_load(&proxy->pci_dev, f); - if (ret) + 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); + } 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 +145,15 @@ 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
next prev parent reply other threads:[~2009-07-05 13:03 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1246798625.git.mst@redhat.com> 2009-07-05 12:58 ` [PATCHv5 1/5] qemu/msi: fix segfault in msix_save Michael S. Tsirkin 2009-07-05 12:58 ` [Qemu-devel] " Michael S. Tsirkin 2009-07-09 19:08 ` Luiz Capitulino 2009-07-09 19:08 ` Luiz Capitulino 2009-07-09 19:12 ` Anthony Liguori 2009-07-09 19:12 ` Anthony Liguori 2009-07-05 12:58 ` [PATCHv5 2/5] qemu/virtio: remove control vector save Michael S. Tsirkin 2009-07-05 12:58 ` [Qemu-devel] " Michael S. Tsirkin 2009-07-05 12:58 ` [PATCHv5 3/5] qemu/msi: clean used vectors state on load Michael S. Tsirkin 2009-07-05 12:58 ` [Qemu-devel] " Michael S. Tsirkin 2009-07-05 12:58 ` [PATCHv5 4/5] qemu/msi: missing braces Michael S. Tsirkin 2009-07-05 12:58 ` [Qemu-devel] " Michael S. Tsirkin 2009-07-05 13:02 ` Michael S. Tsirkin [this message] 2009-07-05 13:02 ` [Qemu-devel] [PATCHv5 5/5] qemu/virtio: mark msi vectors used on load Michael S. Tsirkin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090705130234.GF5417@redhat.com \ --to=mst@redhat.com \ --cc=aliguori@us.ibm.com \ --cc=avi@redhat.com \ --cc=blauwirbel@gmail.com \ --cc=glommer@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=kwolf@redhat.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.