[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/10] Revert "vhost-vdpa: add support for config interrupt"
From: |
Michael S. Tsirkin |
Subject: |
[PULL 06/10] Revert "vhost-vdpa: add support for config interrupt" |
Date: |
Mon, 10 Jan 2022 02:16:18 -0500 |
This reverts commit 634f7c89fbd78f57d00d5d6b39c0ade9df1fe27f.
---
hw/virtio/vhost-vdpa.c | 7 -------
hw/virtio/trace-events | 1 -
2 files changed, 8 deletions(-)
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index ac0cb575fb..04ea43704f 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -734,12 +734,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)
@@ -810,5 +804,4 @@ 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,
};
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index 595ce015ff..f7ad6be5fb 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"
--
MST
- [PULL 00/10] virtio: revert config interrupt changes, Michael S. Tsirkin, 2022/01/10
- [PULL 01/10] Revert "virtio-pci: add support for configure interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL 02/10] Revert "virtio-mmio: add support for configure interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL 03/10] Revert "virtio-net: add support for configure interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL 04/10] Revert "vhost: add support for configure interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL 05/10] Revert "virtio: add support for configure interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL 06/10] Revert "vhost-vdpa: add support for config interrupt",
Michael S. Tsirkin <=
- [PULL 07/10] Revert "vhost: introduce new VhostOps vhost_set_config_call", Michael S. Tsirkin, 2022/01/10
- [PULL 08/10] Revert "virtio-pci: decouple the single vector from the interrupt process", Michael S. Tsirkin, 2022/01/10
- [PULL 09/10] Revert "virtio-pci: decouple notifier from interrupt process", Michael S. Tsirkin, 2022/01/10
- [PULL 10/10] Revert "virtio: introduce macro IRTIO_CONFIG_IRQ_IDX", Michael S. Tsirkin, 2022/01/10
- Re: [PULL 00/10] virtio: revert config interrupt changes, Peter Maydell, 2022/01/10