On 5/7/24 08:42, Zhenzhong Duan wrote:
> This is to follow the coding standand to return bool if 'Error **'
> is used to pass error.
>
> 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/container.c | 3 +--
> hw/vfio/cpr.c | 4 ++--
> hw/vfio/iommufd.c | 3 +--
> 4 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index a7b6fc8f46..e4c60374fa 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -205,7 +205,7 @@ void vfio_detach_device(VFIODevice *vbasedev);
> int vfio_kvm_device_add_fd(int fd, Error **errp);
> int vfio_kvm_device_del_fd(int fd, Error **errp);
>
> -int vfio_cpr_register_container(VFIOContainerBase *bcontainer, Error **errp);
> +bool vfio_cpr_register_container(VFIOContainerBase *bcontainer, Error **errp);
> void vfio_cpr_unregister_container(VFIOContainerBase *bcontainer);
>
> extern const MemoryRegionOps vfio_region_ops;
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index b02583ea16..86266f3b83 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -616,8 +616,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as,
> goto free_container_exit;
> }
>
> - ret = vfio_cpr_register_container(bcontainer, errp);
> - if (ret) {
> + if (!vfio_cpr_register_container(bcontainer, errp)) {
> goto free_container_exit;
> }
>
> diff --git a/hw/vfio/cpr.c b/hw/vfio/cpr.c
> index 392c2dd95d..87e51fcee1 100644
> --- a/hw/vfio/cpr.c
> +++ b/hw/vfio/cpr.c
> @@ -25,12 +25,12 @@ static int vfio_cpr_reboot_notifier(NotifierWithReturn *notifier,
> return 0;
> }
>
> -int vfio_cpr_register_container(VFIOContainerBase *bcontainer, Error **errp)
> +bool vfio_cpr_register_container(VFIOContainerBase *bcontainer, Error **errp)
> {
> migration_add_notifier_mode(&bcontainer->cpr_reboot_notifier,
> vfio_cpr_reboot_notifier,
> MIG_MODE_CPR_REBOOT);
> - return 0;
> + return true;
> }
>
> void vfio_cpr_unregister_container(VFIOContainerBase *bcontainer)
> diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
> index 84c86b970e..6a446b16dc 100644
> --- a/hw/vfio/iommufd.c
> +++ b/hw/vfio/iommufd.c
> @@ -396,8 +396,7 @@ found_container:
> goto err_listener_register;
> }
>
> - ret = vfio_cpr_register_container(bcontainer, errp);
> - if (ret) {
> + if (!vfio_cpr_register_container(bcontainer, errp)) {
> goto err_listener_register;
> }
>