Skip to contentSkip to conversation

virtio-mmio: update queue size on guest write

PATCH In review Denis Plotnikov 2 participants 2 messages Dec 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 virtio-mmio: update queue size on guest write

Some guests read back queue size after writing it. Always update the on size write otherwise they might be confused.

---
 hw/virtio/virtio-mmio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/virtio/virtio-mmio.c +2 -1
index 94d934c44b..1e40a74869 100644
@@ -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;
Signature · 1 line
2.17.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Denis Plotnikov

Some guests read back queue size after writing it. Always update the on size write otherwise they might be confused.

---
 hw/virtio/virtio-mmio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

When I reviewed the Michael's patch for pci transport, I planned to do the same but I postponed for several reason.

Thanks for doing that!

Quoted 20 lines
hw/virtio/virtio-mmio.c +2 -1
index 94d934c44b..1e40a74869 100644
@@ -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;
Signature · 1 line
2.17.0