[v4,19/41] vfio/container: Move iova_ranges to base container

Meanwhile remove the helper function vfio_free_container as it
only calls g_free now.

No functional change intended.

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
 include/hw/vfio/vfio-common.h         |  1 -
 include/hw/vfio/vfio-container-base.h |  1 +
 hw/vfio/common.c                      |  5 +++--
 hw/vfio/container-base.c              |  3 +++
 hw/vfio/container.c                   | 19 ++++++-------------
 5 files changed, 13 insertions(+), 16 deletions(-)

On 11/2/23 08:12, Zhenzhong Duan wrote:
> Meanwhile remove the helper function vfio_free_container as it
> only calls g_free now.
> 
> No functional change intended.
> 
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   include/hw/vfio/vfio-common.h         |  1 -
>   include/hw/vfio/vfio-container-base.h |  1 +
>   hw/vfio/common.c                      |  5 +++--
>   hw/vfio/container-base.c              |  3 +++
>   hw/vfio/container.c                   | 19 ++++++-------------
>   5 files changed, 13 insertions(+), 16 deletions(-)
> 
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index b1c9fe711b..b9e5a0e64b 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -82,7 +82,6 @@ typedef struct VFIOContainer {
>       unsigned iommu_type;
>       QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
>       QLIST_HEAD(, VFIOGroup) group_list;
> -    GList *iova_ranges;
>   } VFIOContainer;
>   
>   typedef struct VFIOHostDMAWindow {
> diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container-base.h
> index 80e4a993c5..9658ffb526 100644
> --- a/include/hw/vfio/vfio-container-base.h
> +++ b/include/hw/vfio/vfio-container-base.h
> @@ -48,6 +48,7 @@ typedef struct VFIOContainerBase {
>       QLIST_HEAD(, VFIORamDiscardListener) vrdl_list;
>       QLIST_ENTRY(VFIOContainerBase) next;
>       QLIST_HEAD(, VFIODevice) device_list;
> +    GList *iova_ranges;
>   } VFIOContainerBase;
>   
>   typedef struct VFIOGuestIOMMU {
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index be623e544b..8ef2e7967d 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -637,9 +637,10 @@ static void vfio_listener_region_add(MemoryListener *listener,
>               goto fail;
>           }
>   
> -        if (container->iova_ranges) {
> +        if (bcontainer->iova_ranges) {
>               ret = memory_region_iommu_set_iova_ranges(giommu->iommu_mr,
> -                    container->iova_ranges, &err);
> +                                                      bcontainer->iova_ranges,
> +                                                      &err);
>               if (ret) {
>                   g_free(giommu);
>                   goto fail;
> diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c
> index 7f508669f5..0177f43741 100644
> --- a/hw/vfio/container-base.c
> +++ b/hw/vfio/container-base.c
> @@ -54,6 +54,7 @@ void vfio_container_init(VFIOContainerBase *bcontainer, VFIOAddressSpace *space,
>       bcontainer->error = NULL;
>       bcontainer->dirty_pages_supported = false;
>       bcontainer->dma_max_mappings = 0;
> +    bcontainer->iova_ranges = NULL;
>       QLIST_INIT(&bcontainer->giommu_list);
>       QLIST_INIT(&bcontainer->vrdl_list);
>   }
> @@ -70,4 +71,6 @@ void vfio_container_destroy(VFIOContainerBase *bcontainer)
>           QLIST_REMOVE(giommu, giommu_next);
>           g_free(giommu);
>       }
> +
> +    g_list_free_full(bcontainer->iova_ranges, g_free);
>   }
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index c8088a8174..721c0d7375 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -308,7 +308,7 @@ bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info *info,
>   }
>   
>   static bool vfio_get_info_iova_range(struct vfio_iommu_type1_info *info,
> -                                     VFIOContainer *container)
> +                                     VFIOContainerBase *bcontainer)
>   {
>       struct vfio_info_cap_header *hdr;
>       struct vfio_iommu_type1_info_cap_iova_range *cap;
> @@ -326,8 +326,8 @@ static bool vfio_get_info_iova_range(struct vfio_iommu_type1_info *info,
>   
>           range_set_bounds(range, cap->iova_ranges[i].start,
>                            cap->iova_ranges[i].end);
> -        container->iova_ranges =
> -            range_list_insert(container->iova_ranges, range);
> +        bcontainer->iova_ranges =
> +            range_list_insert(bcontainer->iova_ranges, range);
>       }
>   
>       return true;
> @@ -475,12 +475,6 @@ static void vfio_get_iommu_info_migration(VFIOContainer *container,
>       }
>   }
>   
> -static void vfio_free_container(VFIOContainer *container)
> -{
> -    g_list_free_full(container->iova_ranges, g_free);
> -    g_free(container);
> -}
> -
>   static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
>                                     Error **errp)
>   {
> @@ -560,7 +554,6 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
>   
>       container = g_malloc0(sizeof(*container));
>       container->fd = fd;
> -    container->iova_ranges = NULL;
>       bcontainer = &container->bcontainer;
>       vfio_container_init(bcontainer, space, &vfio_legacy_ops);
>   
> @@ -597,7 +590,7 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
>               bcontainer->dma_max_mappings = 65535;
>           }
>   
> -        vfio_get_info_iova_range(info, container);
> +        vfio_get_info_iova_range(info, bcontainer);
>   
>           vfio_get_iommu_info_migration(container, info);
>           g_free(info);
> @@ -649,7 +642,7 @@ enable_discards_exit:
>       vfio_ram_block_discard_disable(container, false);
>   
>   free_container_exit:
> -    vfio_free_container(container);
> +    g_free(container);
>   
>   close_fd_exit:
>       close(fd);
> @@ -693,7 +686,7 @@ static void vfio_disconnect_container(VFIOGroup *group)
>   
>           trace_vfio_disconnect_container(container->fd);
>           close(container->fd);
> -        vfio_free_container(container);
> +        g_free(container);
>   
>           vfio_put_address_space(space);
>       }