It's new name is iommu_mr_notifier_init(). Again, literal changes only. Signed-off-by: Peter Xu <pet...@redhat.com> --- hw/vfio/common.c | 8 ++++---- hw/virtio/vhost.c | 8 ++++---- include/exec/memory.h | 7 ++++--- 3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c index bd113b7..6b3953b 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -481,10 +481,10 @@ static void vfio_listener_region_add(MemoryListener *listener, llend = int128_add(int128_make64(section->offset_within_region), section->size); llend = int128_sub(llend, int128_one()); - iommu_notifier_init(&giommu->n, vfio_iommu_map_notify, - IOMMU_MR_EVENT_ALL, - section->offset_within_region, - int128_get64(llend)); + iommu_mr_notifier_init(&giommu->n, vfio_iommu_map_notify, + IOMMU_MR_EVENT_ALL, + section->offset_within_region, + int128_get64(llend)); QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next); memory_region_register_iommu_notifier(giommu->iommu, &giommu->n); diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 81a8aea..7449cf8 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -746,10 +746,10 @@ static void vhost_iommu_region_add(MemoryListener *listener, end = int128_add(int128_make64(section->offset_within_region), section->size); end = int128_sub(end, int128_one()); - iommu_notifier_init(&iommu->n, vhost_iommu_unmap_notify, - IOMMU_MR_EVENT_UNMAP, - section->offset_within_region, - int128_get64(end)); + iommu_mr_notifier_init(&iommu->n, vhost_iommu_unmap_notify, + IOMMU_MR_EVENT_UNMAP, + section->offset_within_region, + int128_get64(end)); iommu->mr = section->mr; iommu->iommu_offset = section->offset_within_address_space - section->offset_within_region; diff --git a/include/exec/memory.h b/include/exec/memory.h index 6be0c02..8d8dcb2 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -93,9 +93,10 @@ struct IOMMUMRNotifier { }; typedef struct IOMMUMRNotifier IOMMUMRNotifier; -static inline void iommu_notifier_init(IOMMUMRNotifier *n, IOMMUNotify fn, - IOMMUMREventFlags flags, - hwaddr start, hwaddr end) +static inline void iommu_mr_notifier_init(IOMMUMRNotifier *n, + IOMMUNotify fn, + IOMMUMREventFlags flags, + hwaddr start, hwaddr end) { n->notify = fn; n->notifier_flags = flags; -- 2.7.4