On 9/15/20 9:14 PM, Matthew Rosato wrote:
> Rather than duplicating the same loop in multiple locations,
> create a static function to do the work.
>
> Signed-off-by: Matthew Rosato <mjros...@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> hw/vfio/common.c | 21 +++++++++++++--------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index 3335714..eba7b55 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -825,17 +825,12 @@ static void vfio_listener_release(VFIOContainer
> *container)
> }
> }
>
> -struct vfio_info_cap_header *
> -vfio_get_region_info_cap(struct vfio_region_info *info, uint16_t id)
> +static struct vfio_info_cap_header *
> +vfio_get_cap(void *ptr, uint32_t cap_offset, uint16_t id)
> {
> struct vfio_info_cap_header *hdr;
> - void *ptr = info;
> -
> - if (!(info->flags & VFIO_REGION_INFO_FLAG_CAPS)) {
> - return NULL;
> - }
>
> - for (hdr = ptr + info->cap_offset; hdr != ptr; hdr = ptr + hdr->next) {
> + for (hdr = ptr + cap_offset; hdr != ptr; hdr = ptr + hdr->next) {
> if (hdr->id == id) {
> return hdr;
> }
> @@ -844,6 +839,16 @@ vfio_get_region_info_cap(struct vfio_region_info *info,
> uint16_t id)
> return NULL;
> }
>
> +struct vfio_info_cap_header *
> +vfio_get_region_info_cap(struct vfio_region_info *info, uint16_t id)
> +{
> + if (!(info->flags & VFIO_REGION_INFO_FLAG_CAPS)) {
> + return NULL;
> + }
> +
> + return vfio_get_cap((void *)info, info->cap_offset, id);
> +}
> +
> static int vfio_setup_region_sparse_mmaps(VFIORegion *region,
> struct vfio_region_info *info)
> {
>
