41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
|
|
From c4acd87e379d6b6c3a9b8e381c91af255d96aeaa Mon Sep 17 00:00:00 2001
|
||
|
|
From: guping <guping_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Sat, 30 Mar 2024 14:59:51 +0000
|
||
|
|
Subject: [PATCH] libqos/virtio.c: Correct 'flags' reading in qvirtqueue_kick
|
||
|
|
cherry-pick from 66e411885a23c96ff73742d06b793fec3ceaebb7
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
In qvirtqueue_kick(), the 'flags' were previously being incorrectly read from
|
||
|
|
vq->avail instead of the correct vq->used location. This update ensures 'flags'
|
||
|
|
are read from the correct location as per the virtio standard.
|
||
|
|
|
||
|
|
Signed-off-by: default avatarZheyu Ma <zheyuma97@gmail.com>
|
||
|
|
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Reviewed-by: Stefan Hajnoczi's avatarStefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Message-ID: <20240320090442.267525-1-zheyuma97@gmail.com>
|
||
|
|
Signed-off-by: Thomas Huth's avatarThomas Huth <thuth@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: guping <guping_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
tests/qtest/libqos/virtio.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tests/qtest/libqos/virtio.c b/tests/qtest/libqos/virtio.c
|
||
|
|
index 6fe7bf9555..08e5bcdca1 100644
|
||
|
|
--- a/tests/qtest/libqos/virtio.c
|
||
|
|
+++ b/tests/qtest/libqos/virtio.c
|
||
|
|
@@ -377,7 +377,7 @@ void qvirtqueue_kick(QTestState *qts, QVirtioDevice *d, QVirtQueue *vq,
|
||
|
|
qvirtio_writew(d, qts, vq->avail + 2, idx + 1);
|
||
|
|
|
||
|
|
/* Must read after idx is updated */
|
||
|
|
- flags = qvirtio_readw(d, qts, vq->avail);
|
||
|
|
+ flags = qvirtio_readw(d, qts, vq->used);
|
||
|
|
avail_event = qvirtio_readw(d, qts, vq->used + 4 +
|
||
|
|
sizeof(struct vring_used_elem) * vq->size);
|
||
|
|
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|