b7616307b7
Include SLE feature requests, misc upstream stable bug fixes, and repair Jira feature references OBS-URL: https://build.opensuse.org/request/show/762845 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=521
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From: Denis Plotnikov <dplotnikov@virtuozzo.com>
|
|
Date: Tue, 24 Dec 2019 11:14:46 +0300
|
|
Subject: virtio-mmio: update queue size on guest write
|
|
|
|
Git-commit: 1049f4c62c4070618cc5defc9963c6a17ae7a5ae
|
|
|
|
Some guests read back queue size after writing it.
|
|
Always update the on size write otherwise they might be confused.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com>
|
|
Message-Id: <20191224081446.17003-1-dplotnikov@virtuozzo.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/virtio/virtio-mmio.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
|
|
index 94d934c44b6ca63a4d5c72258e90..1e40a74869dad64fd172e1279b25 100644
|
|
--- a/hw/virtio/virtio-mmio.c
|
|
+++ b/hw/virtio/virtio-mmio.c
|
|
@@ -295,8 +295,9 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value,
|
|
break;
|
|
case VIRTIO_MMIO_QUEUE_NUM:
|
|
trace_virtio_mmio_queue_write(value, VIRTQUEUE_MAX_SIZE);
|
|
+ virtio_queue_set_num(vdev, vdev->queue_sel, value);
|
|
+
|
|
if (proxy->legacy) {
|
|
- virtio_queue_set_num(vdev, vdev->queue_sel, value);
|
|
virtio_queue_update_rings(vdev, vdev->queue_sel);
|
|
} else {
|
|
proxy->vqs[vdev->queue_sel].num = value;
|