Re: [PATCH v6 25/36] vfio/migration: Setup and cleanup multifd transfer in these general methods

[Cédric Le Goater]

On 3/4/25 23:03, Maciej S. Szmigiero wrote:

From: "Maciej S. Szmigiero" <maciej.szmigi...@oracle.com>

Wire VFIO multifd transfer specific setup and cleanup functions into
general VFIO load/save setup and cleanup methods.

Signed-off-by: Maciej S. Szmigiero <maciej.szmigi...@oracle.com>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  hw/vfio/migration.c | 24 ++++++++++++++++++++++--
  1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index dc1fe4e717a4..3c8286ae6230 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -453,6 +453,10 @@ static int vfio_save_setup(QEMUFile *f, void *opaque, 
Error **errp)
      uint64_t stop_copy_size = VFIO_MIG_DEFAULT_DATA_BUFFER_SIZE;
      int ret;

+ if (!vfio_multifd_setup(vbasedev, false, errp)) {

+        return -EINVAL;
+    }
+
      qemu_put_be64(f, VFIO_MIG_FLAG_DEV_SETUP_STATE);

vfio_query_stop_copy_size(vbasedev, &stop_copy_size);

@@ -509,6 +513,9 @@ static void vfio_save_cleanup(void *opaque)
      Error *local_err = NULL;
      int ret;

+ /* Currently a NOP, done for symmetry with load_cleanup() */

+    vfio_multifd_cleanup(vbasedev);
+
      /*
       * Changing device state from STOP_COPY to STOP can take time. Do it here,
       * after migration has completed, so it won't increase downtime.
@@ -674,15 +681,28 @@ static void vfio_save_state(QEMUFile *f, void *opaque)
  static int vfio_load_setup(QEMUFile *f, void *opaque, Error **errp)
  {
      VFIODevice *vbasedev = opaque;
+    VFIOMigration *migration = vbasedev->migration;
+    int ret;

- return vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_RESUMING,

-                                    vbasedev->migration->device_state, errp);
+    if (!vfio_multifd_setup(vbasedev, true, errp)) {
+        return -EINVAL;
+    }
+
+    ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_RESUMING,
+                                   migration->device_state, errp);
+    if (ret) {
+        return ret;
+    }
+
+    return 0;
  }

static int vfio_load_cleanup(void *opaque)

  {
      VFIODevice *vbasedev = opaque;

+ vfio_multifd_cleanup(vbasedev);

+
      vfio_migration_cleanup(vbasedev);
      trace_vfio_load_cleanup(vbasedev->name);