[PATCH v2 2/4] net/virtio-user: fix control queue destruction

[Maxime Coquelin]

This patch uses the freshly renamed iterator to destroy
queues at stop time. Doing this, we fix the missing
control queue destruction.

Fixes: 90966e8e5b67 ("net/virtio-user: send shadow virtqueue info to the 
backend")
Cc: sta...@dpdk.org

Acked-by: David Marchand <david.march...@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coque...@redhat.com>
---
 .../net/virtio/virtio_user/virtio_user_dev.c  | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c 
b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index c3d44880f5..0776c54deb 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -33,6 +33,22 @@ const char * const virtio_user_backend_strings[] = {
        [VIRTIO_USER_BACKEND_VHOST_VDPA] = "VHOST_VDPA",
 };
 
+static int
+virtio_user_destroy_queue(struct virtio_user_dev *dev, uint32_t queue_sel)
+{
+       struct vhost_vring_state state;
+       int ret;
+
+       state.index = queue_sel;
+       ret = dev->ops->get_vring_base(dev, &state);
+       if (ret < 0) {
+               PMD_DRV_LOG(ERR, "(%s) Failed to destroy queue %u", dev->path, 
queue_sel);
+               return -1;
+       }
+
+       return 0;
+}
+
 static int
 virtio_user_create_queue(struct virtio_user_dev *dev, uint32_t queue_sel)
 {
@@ -237,7 +253,6 @@ virtio_user_start_device(struct virtio_user_dev *dev)
 
 int virtio_user_stop_device(struct virtio_user_dev *dev)
 {
-       struct vhost_vring_state state;
        uint32_t i;
        int ret;
 
@@ -258,14 +273,8 @@ int virtio_user_stop_device(struct virtio_user_dev *dev)
        }
 
        /* Stop the backend. */
-       for (i = 0; i < dev->max_queue_pairs * 2; ++i) {
-               state.index = i;
-               ret = dev->ops->get_vring_base(dev, &state);
-               if (ret < 0) {
-                       PMD_DRV_LOG(ERR, "(%s) get_vring_base failed, 
index=%u", dev->path, i);
-                       goto err;
-               }
-       }
+       if (virtio_user_foreach_queue(dev, virtio_user_destroy_queue) < 0)
+               goto err;
 
        dev->started = false;
 
-- 
2.44.0