On Mon, 18 Dec 2017 20:13:40 +0000
"Dr. David Alan Gilbert (git)" <dgilb...@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
>
> 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 <dgilb...@redhat.com>
With style nit fixed
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> ---
> hw/virtio/vhost.c | 31 ++++---------------------------
> 1 file changed, 4 insertions(+), 27 deletions(-)
>
> diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
> index 358ceb3033..4eaa4f889f 100644
> --- a/hw/virtio/vhost.c
> +++ b/hw/virtio/vhost.c
> @@ -555,7 +555,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)
argument alignment should on '('
> {
> struct vhost_dev *dev = container_of(listener, struct vhost_dev,
> @@ -567,29 +568,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);
> @@ -1158,9 +1136,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,
