qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org
Cc: cornelia.huck@de.ibm.com, Jason Wang <jasowang@redhat.com>,
	mst@redhat.com
Subject: [Qemu-devel] [PATCH V2 8/8] virtio-pci: unbreak queue_enable read
Date: Wed,  2 Sep 2015 11:25:25 +0800	[thread overview]
Message-ID: <1441164325-14417-9-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1441164325-14417-1-git-send-email-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>
---
 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 bf61acf..7aab6d1 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1372,6 +1372,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;
@@ -1816,9 +1817,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[] = {
-- 
2.1.4

  parent reply	other threads:[~2015-09-02  3:25 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-02  3:25 [Qemu-devel] [PATCH V2 0/8] virtio 1.0 pci optimizations and fixes Jason Wang
2015-09-02  3:25 ` [Qemu-devel] [PATCH V2 1/8] q35: Move options common to all classes to pc_q35_machine_options() Jason Wang
2015-09-02  3:25 ` [Qemu-devel] [PATCH V2 2/8] q35: Move options common to all classes to pc_i440fx_machine_options() Jason Wang
2015-09-02  3:25 ` [Qemu-devel] [PATCH V2 3/8] pc: Introduce pc-*-2.5 machine classes Jason Wang
2015-09-02  3:25 ` [Qemu-devel] [PATCH V2 4/8] virtio-pci: fix 1.0 virtqueue migration Jason Wang
2015-09-02 11:06   ` Cornelia Huck
2015-09-07  7:39     ` Jason Wang
2015-09-07  8:21       ` Cornelia Huck
2015-09-08  7:27         ` Jason Wang
2015-09-10  9:11           ` Michael S. Tsirkin
2015-09-02  3:25 ` [Qemu-devel] [PATCH V2 5/8] memory: don't try to adjust endianness for zero length eventfd Jason Wang
2015-09-02 15:59   ` Greg Kurz
2015-09-02  3:25 ` [Qemu-devel] [PATCH V2 6/8] virtio-pci: use wildcard mmio eventfd for 1.0 notification cap Jason Wang
2015-09-02  7:59   ` Michael S. Tsirkin
2015-09-02  3:25 ` [Qemu-devel] [PATCH V2 7/8] virtio-pci: introduce pio notification capability for modern device Jason Wang
2015-09-02  3:25 ` Jason Wang [this message]
2015-09-10  9:18 ` [Qemu-devel] [PATCH V2 0/8] virtio 1.0 pci optimizations and fixes Michael S. Tsirkin
2015-09-24 13:14 ` 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=1441164325-14417-9-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=cornelia.huck@de.ibm.com \
    --cc=mst@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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).