62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From 98ae454efe48b2a465dfe9bc3c412b6375f1fbfc Mon Sep 17 00:00:00 2001
|
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Date: Mon, 9 Dec 2019 11:46:13 -0500
|
|
Subject: [PATCH 1/9] virtio: add ability to delete vq through a pointer
|
|
|
|
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>
|
|
Signed-off-by: AlexChen <alex.chen@huawei.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 79c2dcf..3d027d3 100644
|
|
--- a/hw/virtio/virtio.c
|
|
+++ b/hw/virtio/virtio.c
|
|
@@ -1636,16 +1636,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 f9f6237..ca2fbae 100644
|
|
--- a/include/hw/virtio/virtio.h
|
|
+++ b/include/hw/virtio/virtio.h
|
|
@@ -187,6 +187,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
|
|
|