diff options
| author | Jason Wang | 2015-11-06 09:02:49 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-11-12 14:49:33 +0100 |
| commit | 393f04d3ab40d03aa2fde0017ff7f02fc34cbd4e (patch) | |
| tree | 54a2fe90ba17330bba4ffcde2a2a9c4ad7cbbcd3 | |
| parent | virtio-pci: introduce pio notification capability for modern device (diff) | |
| download | qemu-393f04d3ab40d03aa2fde0017ff7f02fc34cbd4e.tar.gz qemu-393f04d3ab40d03aa2fde0017ff7f02fc34cbd4e.tar.xz qemu-393f04d3ab40d03aa2fde0017ff7f02fc34cbd4e.zip | |
virtio-pci: unbreak queue_enable read
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>
| -rw-r--r-- | hw/virtio/virtio-pci.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index e4449daeb9..52a9e338a2 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[] = { |