Re: [PATCH 05/16] vfio/helpers: Make vfio_device_get_name() return bool

[Cédric Le Goater]

On 5/15/24 10:20, Zhenzhong Duan wrote:
> This is to follow the coding standand in qapi/error.h to return bool
> for bool-valued functions.
>
> Suggested-by: Cédric Le Goater <clg@redhat.com>
> 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 | 2 +-
>   hw/vfio/ap.c                  | 2 +-
>   hw/vfio/ccw.c                 | 2 +-
>   hw/vfio/helpers.c             | 8 ++++----
>   hw/vfio/pci.c                 | 2 +-
>   hw/vfio/platform.c            | 5 ++---
>   6 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index fdce13f0f2..d9891c796f 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -280,7 +280,7 @@ int vfio_get_dirty_bitmap(const VFIOContainerBase 
> *bcontainer, uint64_t iova,
>                             uint64_t size, ram_addr_t ram_addr, Error **errp);
>   
>   /* Returns 0 on success, or a negative errno. */
> -int vfio_device_get_name(VFIODevice *vbasedev, Error **errp);
> +bool vfio_device_get_name(VFIODevice *vbasedev, Error **errp);
>   void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **errp);
>   void vfio_device_init(VFIODevice *vbasedev, int type, VFIODeviceOps *ops,
>                         DeviceState *dev, bool ram_discard);
> diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
> index d8a9615fee..c12531a788 100644
> --- a/hw/vfio/ap.c
> +++ b/hw/vfio/ap.c
> @@ -158,7 +158,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)
>       VFIOAPDevice *vapdev = VFIO_AP_DEVICE(dev);
>       VFIODevice *vbasedev = &vapdev->vdev;
>   
> -    if (vfio_device_get_name(vbasedev, errp) < 0) {
> +    if (!vfio_device_get_name(vbasedev, errp)) {
>           return;
>       }
>   
> diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> index 1f578a3c75..8850ca17c8 100644
> --- a/hw/vfio/ccw.c
> +++ b/hw/vfio/ccw.c
> @@ -588,7 +588,7 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp)
>           }
>       }
>   
> -    if (vfio_device_get_name(vbasedev, errp) < 0) {
> +    if (!vfio_device_get_name(vbasedev, errp)) {
>           return;
>       }
>   
> diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c
> index 93e6fef6de..a69b4411e5 100644
> --- a/hw/vfio/helpers.c
> +++ b/hw/vfio/helpers.c
> @@ -605,7 +605,7 @@ bool vfio_has_region_cap(VFIODevice *vbasedev, int region, 
> uint16_t cap_type)
>       return ret;
>   }
>   
> -int vfio_device_get_name(VFIODevice *vbasedev, Error **errp)
> +bool vfio_device_get_name(VFIODevice *vbasedev, Error **errp)
>   {
>       ERRP_GUARD();
>       struct stat st;
> @@ -614,7 +614,7 @@ int vfio_device_get_name(VFIODevice *vbasedev, Error **errp)
>           if (stat(vbasedev->sysfsdev, &st) < 0) {
>               error_setg_errno(errp, errno, "no such host device");
>               error_prepend(errp, VFIO_MSG_PREFIX, vbasedev->sysfsdev);
> -            return -errno;
> +            return false;
>           }
>           /* User may specify a name, e.g: VFIO platform device */
>           if (!vbasedev->name) {
> @@ -623,7 +623,7 @@ int vfio_device_get_name(VFIODevice *vbasedev, Error **errp)
>       } else {
>           if (!vbasedev->iommufd) {
>               error_setg(errp, "Use FD passing only with iommufd backend");
> -            return -EINVAL;
> +            return false;
>           }
>           /*
>            * Give a name with fd so any function printing out vbasedev->name
> @@ -634,7 +634,7 @@ int vfio_device_get_name(VFIODevice *vbasedev, Error **errp)
>           }
>       }
>   
> -    return 0;
> +    return true;
>   }
>   
>   void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **errp)
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index 358da4497b..aad012c348 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -2999,7 +2999,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
>                               vdev->host.slot, vdev->host.function);
>       }
>   
> -    if (vfio_device_get_name(vbasedev, errp) < 0) {
> +    if (!vfio_device_get_name(vbasedev, errp)) {
>           return;
>       }
>   
> diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
> index 3233ca8691..e1a32863d9 100644
> --- a/hw/vfio/platform.c
> +++ b/hw/vfio/platform.c
> @@ -545,9 +545,8 @@ static int vfio_base_device_init(VFIODevice *vbasedev, 
> Error **errp)
>                                                vbasedev->name);
>       }
>   
> -    ret = vfio_device_get_name(vbasedev, errp);
> -    if (ret) {
> -        return ret;
> +    if (!vfio_device_get_name(vbasedev, errp)) {
> +        return -EINVAL;
>       }
>   
>       if (!vfio_attach_device(vbasedev->name, vbasedev,