Commit 10d35e58 authored Jun 10, 2020 by Jason Wang Committed by Michael S. Tsirkin Jun 12, 2020

virtio-pci: fix queue_enable write



Spec said: The driver uses this to selectively prevent the device from
executing requests from this virtqueue. 1 - enabled; 0 - disabled.

Though write 0 to queue_enable is forbidden by the spec, we should not
assume that the value is 1.

Fix this by ignore the write value other than 1.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20200610054351.15811-1-jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent 12fcf49c

hw/virtio/virtio-pci.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -1273,6 +1273,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
		virtio_queue_set_vector(vdev, vdev->queue_sel, val);
		break;
		case VIRTIO_PCI_COMMON_Q_ENABLE:
		if (val == 1) {
		virtio_queue_set_num(vdev, vdev->queue_sel,
		proxy->vqs[vdev->queue_sel].num);
		virtio_queue_set_rings(vdev, vdev->queue_sel,
		@@ -1283,6 +1284,9 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
		((uint64_t)proxy->vqs[vdev->queue_sel].used[1]) << 32 \|
		proxy->vqs[vdev->queue_sel].used[0]);
		proxy->vqs[vdev->queue_sel].enabled = 1;
		} else {
		virtio_error(vdev, "wrong value for queue_enable %"PRIx64, val);
		}
		break;
		case VIRTIO_PCI_COMMON_Q_DESCLO:
		proxy->vqs[vdev->queue_sel].desc[0] = val;