57 lines
2.5 KiB
Diff
57 lines
2.5 KiB
Diff
|
From 92df45517567838512512f093f418067c857e8dc Mon Sep 17 00:00:00 2001
|
||
|
|
From: fangyi <eric.fangyi@huawei.com>
|
||
|
|
Date: Wed, 22 Nov 2023 09:58:20 +0800
|
||
|
|
Subject: [PATCH] Revert "vhost-vdpa: add support for config interrupt"
|
||
|
|
|
||
|
|
This reverts commit 634f7c89fbd78f57d00d5d6b39c0ade9df1fe27f.
|
||
|
|
|
||
|
|
Fixes: 634f7c89fb ("vhost-vdpa: add support for config interrupt")
|
||
|
|
Cc: "Cindy Lu" <lulu@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
||
|
|
---
|
||
|
|
hw/virtio/trace-events | 1 -
|
||
|
|
hw/virtio/vhost-vdpa.c | 7 -------
|
||
|
|
2 files changed, 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
|
||
|
|
index 39c36ff7a6..650e521e35 100644
|
||
|
|
--- a/hw/virtio/trace-events
|
||
|
|
+++ b/hw/virtio/trace-events
|
||
|
|
@@ -53,7 +53,6 @@ vhost_vdpa_get_features(void *dev, uint64_t features) "dev: %p features: 0x%"PRI
|
||
|
|
vhost_vdpa_set_owner(void *dev) "dev: %p"
|
||
|
|
vhost_vdpa_vq_get_addr(void *dev, void *vq, uint64_t desc_user_addr, uint64_t avail_user_addr, uint64_t used_user_addr) "dev: %p vq: %p desc_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64
|
||
|
|
vhost_vdpa_get_iova_range(void *dev, uint64_t first, uint64_t last) "dev: %p first: 0x%"PRIx64" last: 0x%"PRIx64
|
||
|
|
-vhost_vdpa_set_config_call(void *dev, int fd)"dev: %p fd: %d"
|
||
|
|
|
||
|
|
# virtio.c
|
||
|
|
virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned out_num) "elem %p size %zd in_num %u out_num %u"
|
||
|
|
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
|
||
|
|
index d8fba0b714..25a2f570a2 100644
|
||
|
|
--- a/hw/virtio/vhost-vdpa.c
|
||
|
|
+++ b/hw/virtio/vhost-vdpa.c
|
||
|
|
@@ -737,12 +737,6 @@ static int vhost_vdpa_set_vring_call(struct vhost_dev *dev,
|
||
|
|
trace_vhost_vdpa_set_vring_call(dev, file->index, file->fd);
|
||
|
|
return vhost_vdpa_call(dev, VHOST_SET_VRING_CALL, file);
|
||
|
|
}
|
||
|
|
-static int vhost_vdpa_set_config_call(struct vhost_dev *dev,
|
||
|
|
- int fd)
|
||
|
|
-{
|
||
|
|
- trace_vhost_vdpa_set_config_call(dev, fd);
|
||
|
|
- return vhost_vdpa_call(dev, VHOST_VDPA_SET_CONFIG_CALL, &fd);
|
||
|
|
-}
|
||
|
|
|
||
|
|
static int vhost_vdpa_get_features(struct vhost_dev *dev,
|
||
|
|
uint64_t *features)
|
||
|
|
@@ -823,7 +817,6 @@ const VhostOps vdpa_ops = {
|
||
|
|
.vhost_get_device_id = vhost_vdpa_get_device_id,
|
||
|
|
.vhost_vq_get_addr = vhost_vdpa_vq_get_addr,
|
||
|
|
.vhost_force_iommu = vhost_vdpa_force_iommu,
|
||
|
|
- .vhost_set_config_call = vhost_vdpa_set_config_call,
|
||
|
|
.vhost_set_used_memslots = vhost_vdpa_set_used_memslots,
|
||
|
|
.vhost_get_used_memslots = vhost_vdpa_get_used_memslots,
|
||
|
|
};
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|