From 0f56ff85e38a3925ba8c63af9fcf6a0708f0d10f Mon Sep 17 00:00:00 2001

From: Julia Suvorova <jusual@redhat.com>

Date: Tue, 4 Feb 2020 18:20:05 +0000

Subject: [PATCH 4/6] virtio: add ability to delete vq through a pointer

RH-Author: Julia Suvorova <jusual@redhat.com>

Message-id: <20200204182007.183537-3-jusual@redhat.com>

Patchwork-id: 93705

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 2/4] virtio: add ability to delete vq through a pointer

Bugzilla: 1708480

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>

From: "Michael S. Tsirkin" <mst@redhat.com>

Devices tend to maintain vq pointers, allow deleting them trough a vq pointer.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: David Hildenbrand <david@redhat.com>

Reviewed-by: David Hildenbrand <david@redhat.com>

(cherry picked from commit 722f8c51d8af223751dfb1d02de40043e8ba067e)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/virtio/virtio.c         | 13 +++++++++----

 include/hw/virtio/virtio.h |  2 ++

 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c

index 6356bf3..624f6e2 100644

--- a/hw/virtio/virtio.c

+++ b/hw/virtio/virtio.c

@@ -1601,16 +1601,21 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,

     return &vdev->vq[i];

 }

+void virtio_delete_queue(VirtQueue *vq)

+{

+    vq->vring.num = 0;

+    vq->vring.num_default = 0;

+    vq->handle_output = NULL;

+    vq->handle_aio_output = NULL;

+}

+

 void virtio_del_queue(VirtIODevice *vdev, int n)

 {

     if (n < 0 || n >= VIRTIO_QUEUE_MAX) {

         abort();

     }

-    vdev->vq[n].vring.num = 0;

-    vdev->vq[n].vring.num_default = 0;

-    vdev->vq[n].handle_output = NULL;

-    vdev->vq[n].handle_aio_output = NULL;

+    virtio_delete_queue(&vdev->vq[n]);

 }

 static void virtio_set_isr(VirtIODevice *vdev, int value)

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h

index 9c1fa07..90471a1 100644

--- a/include/hw/virtio/virtio.h

+++ b/include/hw/virtio/virtio.h

@@ -163,6 +163,8 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,

 void virtio_del_queue(VirtIODevice *vdev, int n);

+void virtio_delete_queue(VirtQueue *vq);

+

 void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,

                     unsigned int len);

 void virtqueue_flush(VirtQueue *vq, unsigned int count);

-- 

1.8.3.1