81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
|
From b395ad369278d0923a590975fabbb99ec7716c6b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Julia Suvorova <jusual@redhat.com>
|
||
|
|
Date: Wed, 19 Feb 2020 21:34:28 +0000
|
||
|
|
Subject: [PATCH 4/7] virtio: add ability to delete vq through a pointer
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Julia Suvorova <jusual@redhat.com>
|
||
|
|
Message-id: <20200219213431.11913-2-jusual@redhat.com>
|
||
|
|
Patchwork-id: 93980
|
||
|
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 1/4] virtio: add ability to delete vq through a pointer
|
||
|
|
Bugzilla: 1791590
|
||
|
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@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 | 15 ++++++++++-----
|
||
|
|
include/hw/virtio/virtio.h | 2 ++
|
||
|
|
2 files changed, 12 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
||
|
|
index 3211135..d63a369 100644
|
||
|
|
--- a/hw/virtio/virtio.c
|
||
|
|
+++ b/hw/virtio/virtio.c
|
||
|
|
@@ -2335,17 +2335,22 @@ 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;
|
||
|
|
+ g_free(vq->used_elems);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
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;
|
||
|
|
- g_free(vdev->vq[n].used_elems);
|
||
|
|
+ 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 6a20442..91167f6 100644
|
||
|
|
--- a/include/hw/virtio/virtio.h
|
||
|
|
+++ b/include/hw/virtio/virtio.h
|
||
|
|
@@ -183,6 +183,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
|
||
|
|
|