Commit 938eeb64 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Michael S. Tsirkin
Browse files

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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 06709c12

hw/virtio/vhost.c

+5 −28
Original line number Diff line number Diff line
@@ -560,7 +560,8 @@ static void vhost_region_add_section(struct vhost_dev *dev, 
    }

}



static void vhost_region_add(MemoryListener *listener,

/* 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,
@@ -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,