[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH for 8.0 03/13] vhost: merge avail list and next avail descrip
From: |
Eugenio Pérez |
Subject: |
[RFC PATCH for 8.0 03/13] vhost: merge avail list and next avail descriptors detach |
Date: |
Mon, 5 Dec 2022 18:04:26 +0100 |
We need to perform the same actions for the two.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index 1bda8ca4bf..e50bfba6dc 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -692,18 +692,18 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)
/* Send all pending used descriptors to guest */
vhost_svq_flush(svq, false);
- while (!QTAILQ_EMPTY(&svq->desc_state_avail)) {
+ while (!QTAILQ_EMPTY(&svq->desc_state_avail)
+ || svq->next_guest_avail_elem) {
SVQDescState *s = QTAILQ_FIRST(&svq->desc_state_avail);
g_autofree VirtQueueElement *elem = NULL;
- elem = g_steal_pointer(&s->elem);
- virtqueue_detach_element(svq->vq, elem, 0);
- QTAILQ_REMOVE(&svq->desc_state_avail, s, entry);
- }
-
- next_avail_elem = g_steal_pointer(&svq->next_guest_avail_elem);
- if (next_avail_elem) {
- virtqueue_detach_element(svq->vq, next_avail_elem, 0);
+ elem = g_steal_pointer(s ? &s->elem : &svq->next_guest_avail_elem);
+ if (elem) {
+ virtqueue_detach_element(svq->vq, elem, 0);
+ }
+ if (s) {
+ QTAILQ_REMOVE(&svq->desc_state_avail, s, entry);
+ }
}
svq->vq = NULL;
g_free(svq->desc_next);
--
2.31.1
- [RFC PATCH for 8.0 00/13] vDPA-net inflight descriptors migration with SVQ, Eugenio Pérez, 2022/12/05
- [RFC PATCH for 8.0 01/13] vhost: add available descriptor list in SVQ, Eugenio Pérez, 2022/12/05
- [RFC PATCH for 8.0 02/13] vhost: iterate only available descriptors at SVQ stop, Eugenio Pérez, 2022/12/05
- [RFC PATCH for 8.0 03/13] vhost: merge avail list and next avail descriptors detach,
Eugenio Pérez <=
- [RFC PATCH for 8.0 04/13] vhost: add vhost_svq_save_inflight, Eugenio Pérez, 2022/12/05
- [RFC PATCH for 8.0 07/13] virtio: refactor qemu_put_virtqueue_element, Eugenio Pérez, 2022/12/05
- [RFC PATCH for 8.0 05/13] virtio: Specify uint32_t as VirtQueueElementOld members type, Eugenio Pérez, 2022/12/05
- [RFC PATCH for 8.0 06/13] virtio: refactor qemu_get_virtqueue_element, Eugenio Pérez, 2022/12/05
- [RFC PATCH for 8.0 10/13] virtio-net: Migrate vhost inflight descriptors, Eugenio Pérez, 2022/12/05
- [RFC PATCH for 8.0 12/13] vhost: expose vhost_svq_add_element, Eugenio Pérez, 2022/12/05