mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush

Browse Source 
Since QEMU will be able to inject new elements on CVQ to restore the
state, we need not to depend on a VirtQueueElement to know if a new
element has been used by the device or not. Instead of check that, check
if there are new elements only using used idx on vhost_svq_flush.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Eugenio Pérez 2022-08-23 20:30:29 +02:00 committed by Jason Wang
parent 9e193cec5d
commit d368c0b052
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/virtio/vhost-shadow-virtqueue.c
View File

@ -499,17 +499,20 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq,
size_t vhost_svq_poll(VhostShadowVirtqueue *svq) size_t vhost_svq_poll(VhostShadowVirtqueue *svq)
{ {
int64_t start_us = g_get_monotonic_time(); int64_t start_us = g_get_monotonic_time();
do {
uint32_t len; uint32_t len;
VirtQueueElement *elem = vhost_svq_get_buf(svq, &len);
if (elem) { do {
return len; if (vhost_svq_more_used(svq)) {
break;
} }
if (unlikely(g_get_monotonic_time() - start_us > 10e6)) { if (unlikely(g_get_monotonic_time() - start_us > 10e6)) {
return 0; return 0;
} }
} while (true); } while (true);
vhost_svq_get_buf(svq, &len);
return len;
} }
/** /**