On 6/9/26 09:58, Avihai Horon wrote:
> vfio_migration_init() already has many failure points and a new one will
> be added in next patch.
>
> Add Error ** parameter to vfio_migration_init() to report a detailed
> error message through it. Refactor it to return bool as well.
>
> Signed-off-by: Avihai Horon <avihaih@nvidia.com>
> ---
> hw/vfio/migration.c | 36 ++++++++++++++++++------------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
> index 45f8e346b4..3ab6b7248f 100644
> --- a/hw/vfio/migration.c
> +++ b/hw/vfio/migration.c
> @@ -1056,7 +1056,7 @@ static bool vfio_dma_logging_supported(VFIODevice *vbasedev)
> return !ioctl(vbasedev->fd, VFIO_DEVICE_FEATURE, feature);
> }
>
> -static int vfio_migration_init(VFIODevice *vbasedev)
> +static bool vfio_migration_init(VFIODevice *vbasedev, Error **errp)
> {
> int ret;
> Object *obj;
> @@ -1067,22 +1067,32 @@ static int vfio_migration_init(VFIODevice *vbasedev)
> VMChangeStateHandler *prepare_cb;
>
> if (!vbasedev->ops->vfio_get_object) {
> - return -EINVAL;
> + error_setg(errp, "no vfio_get_object handler");
> + return false;
> }
>
> obj = vbasedev->ops->vfio_get_object(vbasedev);
> if (!obj) {
> - return -EINVAL;
> + error_setg(errp, "failed to get object");
> + return false;
> }
>
> ret = vfio_migration_query_flags(vbasedev, &mig_flags);
> if (ret) {
> - return ret;
> + if (ret == -ENOTTY) {
> + error_setg_errno(errp, -ret,
> + "migration is not supported in kernel");
> + } else {
> + error_setg_errno(errp, -ret, "failed to query migration flags");
> + }
> +
> + return false;
> }
>
> /* Basic migration functionality must be supported */
> if (!(mig_flags & VFIO_MIGRATION_STOP_COPY)) {
> - return -EOPNOTSUPP;
> + error_setg(errp, "VFIO_MIGRATION_STOP_COPY is not supported");
> + return false;
> }
>
> vbasedev->migration = g_new0(VFIOMigration, 1);
> @@ -1113,7 +1123,7 @@ static int vfio_migration_init(VFIODevice *vbasedev)
> migration_add_notifier(&migration->migration_state,
> vfio_migration_state_notifier);
>
> - return 0;
> + return true;
> }
>
> static Error *multiple_devices_migration_blocker;
> @@ -1279,18 +1289,8 @@ bool vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
> return !vfio_block_migration(vbasedev, err, errp);
> }
>
> - ret = vfio_migration_init(vbasedev);
> - if (ret) {
> - if (ret == -ENOTTY) {
> - error_setg(&err, "%s: VFIO migration is not supported in kernel",
> - vbasedev->name);
> - } else {
> - error_setg(&err,
> - "%s: Migration couldn't be initialized for VFIO device, "
> - "err: %d (%s)",
> - vbasedev->name, ret, strerror(-ret));
> - }
> -
> + if (!vfio_migration_init(vbasedev, &err)) {
> + error_prepend(&err, "%s: VFIO migration init failed: ", vbasedev->name);
> return !vfio_block_migration(vbasedev, err, errp);
> }
>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.