Re: [PATCH v5 03/10] vfio: Extend migration_file_set_error() with Error** argument

[Avihai Horon]

On 06/05/2024 12:20, Cédric Le Goater wrote:

External email: Use caution opening links or attachments

Change commit title:

vfio: Extend migration_file_set_error() with Error** argument

to:

migration: Extend migration_file_set_error() with Error* argument

?

Other than that,
Reviewed-by: Avihai Horon <avih...@nvidia.com>

Use it to update the current error of the migration stream if
available and if not, simply print out the error. Next changes will
update with an error to report.

Signed-off-by: Cédric Le Goater <c...@redhat.com>
---
  include/migration/misc.h | 2 +-
  hw/vfio/common.c         | 2 +-
  hw/vfio/migration.c      | 4 ++--
  migration/migration.c    | 6 ++++--
  4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/migration/misc.h b/include/migration/misc.h
index 
c9e200f4eb8f8a8ab2c8b8d0e0dbf871817b94fc..8da2f6454d82046c449f034eb978e1247a9be682
 100644
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -103,7 +103,7 @@ void migration_add_notifier_mode(NotifierWithReturn *notify,

  void migration_remove_notifier(NotifierWithReturn *notify);
  bool migration_is_running(void);
-void migration_file_set_error(int err);
+void migration_file_set_error(int ret, Error *err);

  /* True if incoming migration entered POSTCOPY_INCOMING_DISCARD */
  bool migration_in_incoming_postcopy(void);
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 
b5102f54a6474a50c6366e8fbce23812d55e384e..ed5ee6349ced78b3bde68d2ee506f78ba1a9dd9c
 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -150,7 +150,7 @@ bool vfio_viommu_preset(VFIODevice *vbasedev)
  static void vfio_set_migration_error(int err)
  {
      if (migration_is_setup_or_active()) {
-        migration_file_set_error(err);
+        migration_file_set_error(err, NULL);
      }
  }

diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 
06ae40969b6c19037e190008e14f28be646278cd..bf2fd0759ba6e4fb103cc5c1a43edb180a3d0de4
 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -726,7 +726,7 @@ static void vfio_vmstate_change_prepare(void *opaque, bool 
running,
           * Migration should be aborted in this case, but vm_state_notify()
           * currently does not support reporting failures.
           */
-        migration_file_set_error(ret);
+        migration_file_set_error(ret, NULL);
      }

      trace_vfio_vmstate_change_prepare(vbasedev->name, running,
@@ -756,7 +756,7 @@ static void vfio_vmstate_change(void *opaque, bool running, 
RunState state)
           * Migration should be aborted in this case, but vm_state_notify()
           * currently does not support reporting failures.
           */
-        migration_file_set_error(ret);
+        migration_file_set_error(ret, NULL);
      }

      trace_vfio_vmstate_change(vbasedev->name, running, RunState_str(state),
diff --git a/migration/migration.c b/migration/migration.c
index 
b5af6b5105d58f358f6d4d31694e21debd8eb81d..9c648f5ba1c0104088e37baf90d9f94fbdc21570
 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3033,13 +3033,15 @@ static MigThrError postcopy_pause(MigrationState *s)
      }
  }

-void migration_file_set_error(int err)
+void migration_file_set_error(int ret, Error *err)
  {
      MigrationState *s = current_migration;

      WITH_QEMU_LOCK_GUARD(&s->qemu_file_lock) {
          if (s->to_dst_file) {
-            qemu_file_set_error(s->to_dst_file, err);
+            qemu_file_set_error_obj(s->to_dst_file, ret, err);
+        } else if (err) {
+            error_report_err(err);
          }
      }
  }
--
2.45.0