[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 01/27] virtio: add ability to delete vq through a pointer
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 01/27] virtio: add ability to delete vq through a pointer |
Date: |
Mon, 23 Dec 2019 11:41:03 -0500 |
Devices tend to maintain vq pointers, allow deleting them trough a vq pointer.
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
---
include/hw/virtio/virtio.h | 2 ++
hw/virtio/virtio.c | 15 ++++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index c32a815303..e18756d50d 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);
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 04716b5f6c..31dd140990 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -2330,17 +2330,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)
--
MST
- [PULL v2 00/27] virtio, pci, pc: fixes, features, Michael S. Tsirkin, 2019/12/23
- [PULL v2 01/27] virtio: add ability to delete vq through a pointer,
Michael S. Tsirkin <=
- [PULL v2 02/27] virtio: make virtio_delete_queue idempotent, Michael S. Tsirkin, 2019/12/23
- [PULL v2 03/27] virtio-balloon: fix memory leak while attach virtio-balloon device, Michael S. Tsirkin, 2019/12/23
- [PULL v2 04/27] virtio-serial-bus: fix memory leak while attach virtio-serial-bus, Michael S. Tsirkin, 2019/12/23
- [PULL v2 05/27] virtio-input: convert to new virtio_delete_queue, Michael S. Tsirkin, 2019/12/23
- [PULL v2 06/27] intel_iommu: fix bug to read DMAR_RTADDR_REG, Michael S. Tsirkin, 2019/12/23
- [PULL v2 07/27] virtio: update queue size on guest write, Michael S. Tsirkin, 2019/12/23
- [PULL v2 09/27] Implement backend program convention command for vhost-user-blk, Michael S. Tsirkin, 2019/12/23
- [PULL v2 08/27] virtio-pci: disable vring processing when bus-mastering is disabled, Michael S. Tsirkin, 2019/12/23
- [PULL v2 10/27] virtio: don't enable notifications during polling, Michael S. Tsirkin, 2019/12/23
- [PULL v2 11/27] numa: Extend CLI to provide initiator information for numa nodes, Michael S. Tsirkin, 2019/12/23