All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL 06/11] virtio-pci: unbreak queue_enable read
Date: Thu, 12 Nov 2015 17:09:24 +0200	[thread overview]
Message-ID: <1447340097-18216-7-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1447340097-18216-1-git-send-email-mst@redhat.com>

From: Jason Wang <jasowang@redhat.com>

Guest always get zero when reading queue_enable. This violates
spec. Fixing this by setting the queue_enable to true during any guest
writing and setting it to zero during reset.

Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/virtio/virtio-pci.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index e4449da..52a9e33 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1384,6 +1384,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
                        proxy->vqs[vdev->queue_sel].avail[0],
                        ((uint64_t)proxy->vqs[vdev->queue_sel].used[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].used[0]);
+        proxy->vqs[vdev->queue_sel].enabled = 1;
         break;
     case VIRTIO_PCI_COMMON_Q_DESCLO:
         proxy->vqs[vdev->queue_sel].desc[0] = val;
@@ -1831,9 +1832,15 @@ static void virtio_pci_reset(DeviceState *qdev)
 {
     VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);
     VirtioBusState *bus = VIRTIO_BUS(&proxy->bus);
+    int i;
+
     virtio_pci_stop_ioeventfd(proxy);
     virtio_bus_reset(bus);
     msix_unuse_all_vectors(&proxy->pci_dev);
+
+    for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
+        proxy->vqs[i].enabled = 0;
+    }
 }
 
 static Property virtio_pci_properties[] = {
-- 
MST

  parent reply	other threads:[~2015-11-12 15:09 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-12 15:09 [Qemu-devel] [PULL 00/11] virtio, vhost: fixes for 2.5 Michael S. Tsirkin
2015-11-12 15:09 ` [Qemu-devel] [PULL 01/11] virtio-pci: fix 1.0 virtqueue migration Michael S. Tsirkin
2015-11-12 15:09 ` [Qemu-devel] [PULL 02/11] memory: don't try to adjust endianness for zero length eventfd Michael S. Tsirkin
2015-11-12 15:09 ` [PULL 03/11] KVM: add support for any length io eventfd Michael S. Tsirkin
2015-11-12 15:09   ` [Qemu-devel] " Michael S. Tsirkin
2015-11-12 15:09 ` [Qemu-devel] [PULL 04/11] virtio-pci: use zero length mmio eventfd for 1.0 notification cap when possible Michael S. Tsirkin
2015-11-12 15:09 ` [Qemu-devel] [PULL 05/11] virtio-pci: introduce pio notification capability for modern device Michael S. Tsirkin
2015-11-12 15:09 ` Michael S. Tsirkin [this message]
2015-11-12 15:09 ` [Qemu-devel] [PULL 07/11] vhost-user: modify SET_LOG_BASE to pass mmap size and offset Michael S. Tsirkin
2015-11-12 15:09 ` [Qemu-devel] [PULL 08/11] vhost: rename RESET_DEVICE backto RESET_OWNER Michael S. Tsirkin
2015-11-12 15:09 ` [Qemu-devel] [PULL 09/11] vhost: send SET_VRING_ENABLE at start/stop Michael S. Tsirkin
2015-11-12 15:09 ` [Qemu-devel] [PULL 10/11] hw/virtio: Add PCIe capability to virtio devices Michael S. Tsirkin
2015-11-12 15:09 ` [Qemu-devel] [PULL 11/11] virtio-9p: add savem handlers Michael S. Tsirkin
2015-11-12 16:06 ` [Qemu-devel] [PULL 00/11] virtio, vhost: fixes for 2.5 Peter Maydell

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=1447340097-18216-7-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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: link
Be 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.