aboutsummaryrefslogtreecommitdiff
path: root/hw/virtio
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2018-01-19 10:39:23 +0000
committerMichael S. Tsirkin <mst@redhat.com>2018-02-08 21:06:41 +0200
commit938eeb640c0a006a3a53ea6f8b409cad56b80a55 (patch)
treed0d505bd0c5df96d95da16bfade90a1c67c64a51 /hw/virtio
parent06709c120ca3bae9fa243783b89005c08b71a440 (diff)
vhost: Merge and delete unused callbacks
Now that the olf vhost_set_memory code is gone, the _nop and _add callbacks are identical and can be merged. The _del callback is no longer needed. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/virtio')
-rw-r--r--hw/virtio/vhost.c33
1 files changed, 5 insertions, 28 deletions
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index c7814d1d63..326f168022 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -560,8 +560,9 @@ static void vhost_region_add_section(struct vhost_dev *dev,
}
}
-static void vhost_region_add(MemoryListener *listener,
- MemoryRegionSection *section)
+/* Used for both add and nop callbacks */
+static void vhost_region_addnop(MemoryListener *listener,
+ MemoryRegionSection *section)
{
struct vhost_dev *dev = container_of(listener, struct vhost_dev,
memory_listener);
@@ -572,29 +573,6 @@ static void vhost_region_add(MemoryListener *listener,
vhost_region_add_section(dev, section);
}
-/* Called on regions that have not changed */
-static void vhost_region_nop(MemoryListener *listener,
- MemoryRegionSection *section)
-{
- struct vhost_dev *dev = container_of(listener, struct vhost_dev,
- memory_listener);
-
- if (!vhost_section(section)) {
- return;
- }
-
- vhost_region_add_section(dev, section);
-}
-
-static void vhost_region_del(MemoryListener *listener,
- MemoryRegionSection *section)
-{
- if (!vhost_section(section)) {
- return;
- }
-
-}
-
static void vhost_iommu_unmap_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
{
struct vhost_iommu *iommu = container_of(n, struct vhost_iommu, n);
@@ -1163,9 +1141,8 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
hdev->memory_listener = (MemoryListener) {
.begin = vhost_begin,
.commit = vhost_commit,
- .region_add = vhost_region_add,
- .region_del = vhost_region_del,
- .region_nop = vhost_region_nop,
+ .region_add = vhost_region_addnop,
+ .region_nop = vhost_region_addnop,
.log_start = vhost_log_start,
.log_stop = vhost_log_stop,
.log_sync = vhost_log_sync,