Re: [dpdk-dev] [PATCH v2 08/14] vhost: remove useless vDPA API

[Adrian Moreno <amorenoz@redhat.com>]

On 6/24/20 2:26 PM, Maxime Coquelin wrote:
> vDPA is no more used outside of the vDPA internals,
> so remove rte_vdpa_get_device() API that is now useless.
> 
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
>  lib/librte_vhost/rte_vdpa.h            | 30 -----------------
>  lib/librte_vhost/rte_vhost_version.map |  1 -
>  lib/librte_vhost/vdpa.c                | 46 ++++++--------------------
>  3 files changed, 10 insertions(+), 67 deletions(-)
> 
> diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/librte_vhost/rte_vdpa.h
> index 549b0a2cb0..da8ee33ab1 100644
> --- a/lib/librte_vhost/rte_vdpa.h
> +++ b/lib/librte_vhost/rte_vdpa.h
> @@ -174,36 +174,6 @@ __rte_experimental
>  struct rte_device *
>  rte_vdpa_get_rte_device(struct rte_vdpa_device *vdpa_dev);
>  
> -/**
> - * @warning
> - * @b EXPERIMENTAL: this API may change without prior notice
> - *
> - * Find the device id of a vdpa device
> - *
> - * @param addr
> - *  the vdpa device address
> - * @return
> - *  device id on success, -1 on failure
> - */
> -__rte_experimental
> -int
> -rte_vdpa_find_device_id(struct rte_vdpa_device *dev);
> -
> -/**
> - * @warning
> - * @b EXPERIMENTAL: this API may change without prior notice
> - *
> - * Find a vdpa device based on device id
> - *
> - * @param did
> - *  device id
> - * @return
> - *  rte_vdpa_device on success, NULL on failure
> - */
> -__rte_experimental
> -struct rte_vdpa_device *
> -rte_vdpa_get_device(int did);
> -
>  /**
>   * @warning
>   * @b EXPERIMENTAL: this API may change without prior notice
> diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map
> index ba55f6f421..d9124d0462 100644
> --- a/lib/librte_vhost/rte_vhost_version.map
> +++ b/lib/librte_vhost/rte_vhost_version.map
> @@ -36,7 +36,6 @@ EXPERIMENTAL {
>  	rte_vdpa_register_device;
>  	rte_vdpa_unregister_device;
>  	rte_vdpa_find_device_id;
> -	rte_vdpa_get_device;
>  	rte_vdpa_get_device_num;
>  	rte_vdpa_get_stats_names;
>  	rte_vdpa_get_stats;
> diff --git a/lib/librte_vhost/vdpa.c b/lib/librte_vhost/vdpa.c
> index 91bc483774..d7965b8854 100644
> --- a/lib/librte_vhost/vdpa.c
> +++ b/lib/librte_vhost/vdpa.c
> @@ -19,27 +19,6 @@ static struct rte_vdpa_device vdpa_devices[MAX_VHOST_DEVICE];
>  static uint32_t vdpa_device_num;
>  
>  
> -int
> -rte_vdpa_find_device_id(struct rte_vdpa_device *dev)
> -{
> -	struct rte_vdpa_device *tmp_dev;
> -	int i;
> -
> -	if (dev == NULL)
> -		return -1;
> -
> -	for (i = 0; i < MAX_VHOST_DEVICE; ++i) {
> -		tmp_dev = &vdpa_devices[i];
> -		if (tmp_dev->ops == NULL)
> -			continue;
> -
> -		if (tmp_dev == dev)
> -			return i;
> -	}
> -
> -	return -1;
> -}
> -
>  struct rte_vdpa_device *
>  rte_vdpa_find_device_by_name(const char *name)
>  {
> @@ -70,15 +49,6 @@ rte_vdpa_get_rte_device(struct rte_vdpa_device *vdpa_dev)
>  	return vdpa_dev->device;
>  }
>  
> -struct rte_vdpa_device *
> -rte_vdpa_get_device(int did)
> -{
> -	if (did < 0 || did >= MAX_VHOST_DEVICE)
> -		return NULL;
> -
> -	return &vdpa_devices[did];
> -}
> -
>  struct rte_vdpa_device *
>  rte_vdpa_register_device(struct rte_device *rte_dev,
>  		struct rte_vdpa_dev_ops *ops)
> @@ -117,15 +87,19 @@ rte_vdpa_register_device(struct rte_device *rte_dev,
>  int
>  rte_vdpa_unregister_device(struct rte_vdpa_device *vdev)
>  {
> -	int did = rte_vdpa_find_device_id(vdev);
> +	int i;
>  
> -	if (did < 0 || vdpa_devices[did].ops == NULL)
> -		return -1;
> +	for (i = 0; i < MAX_VHOST_DEVICE; i++) {
> +		if (vdev != &vdpa_devices[i])
> +			continue;
>  
> -	memset(&vdpa_devices[did], 0, sizeof(struct rte_vdpa_device));
> -	vdpa_device_num--;
> +		memset(vdev, 0, sizeof(struct rte_vdpa_device));
> +		vdpa_device_num--;
>  
> -	return 0;
> +		return 0;
> +	}
> +
> +	return -1;
>  }
>  
>  int
> 

Acked-by: Adrián Moreno <amorenoz@redhat.com>

-- 
Adrián Moreno