[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/12] vfio/migration: Move migration v1 logic to vfio_migration_i
From: |
Alex Williamson |
Subject: |
[PULL 06/12] vfio/migration: Move migration v1 logic to vfio_migration_init() |
Date: |
Thu, 16 Feb 2023 16:02:23 -0700 |
User-agent: |
StGit/1.5.dev2+g9ce680a52bd9 |
From: Avihai Horon <avihaih@nvidia.com>
Move vfio_dev_get_region_info() logic from vfio_migration_probe() to
vfio_migration_init(). This logic is specific to v1 protocol and moving
it will make it easier to add the v2 protocol implementation later.
No functional changes intended.
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Link: 20230216143630.25610-7-avihaih@nvidia.com">https://lore.kernel.org/r/20230216143630.25610-7-avihaih@nvidia.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/vfio/migration.c | 30 +++++++++++++++---------------
hw/vfio/trace-events | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 8e9699966962..a3bf7327a1d6 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -786,14 +786,14 @@ static void vfio_migration_exit(VFIODevice *vbasedev)
vbasedev->migration = NULL;
}
-static int vfio_migration_init(VFIODevice *vbasedev,
- struct vfio_region_info *info)
+static int vfio_migration_init(VFIODevice *vbasedev)
{
int ret;
Object *obj;
VFIOMigration *migration;
char id[256] = "";
g_autofree char *path = NULL, *oid = NULL;
+ struct vfio_region_info *info;
if (!vbasedev->ops->vfio_get_object) {
return -EINVAL;
@@ -804,6 +804,14 @@ static int vfio_migration_init(VFIODevice *vbasedev,
return -EINVAL;
}
+ ret = vfio_get_dev_region_info(vbasedev,
+ VFIO_REGION_TYPE_MIGRATION_DEPRECATED,
+ VFIO_REGION_SUBTYPE_MIGRATION_DEPRECATED,
+ &info);
+ if (ret) {
+ return ret;
+ }
+
vbasedev->migration = g_new0(VFIOMigration, 1);
vbasedev->migration->device_state = VFIO_DEVICE_STATE_V1_RUNNING;
vbasedev->migration->vm_running = runstate_is_running();
@@ -823,6 +831,8 @@ static int vfio_migration_init(VFIODevice *vbasedev,
goto err;
}
+ g_free(info);
+
migration = vbasedev->migration;
migration->vbasedev = vbasedev;
@@ -845,6 +855,7 @@ static int vfio_migration_init(VFIODevice *vbasedev,
return 0;
err:
+ g_free(info);
vfio_migration_exit(vbasedev);
return ret;
}
@@ -858,22 +869,13 @@ int64_t vfio_mig_bytes_transferred(void)
int vfio_migration_probe(VFIODevice *vbasedev, Error **errp)
{
- struct vfio_region_info *info = NULL;
int ret = -ENOTSUP;
if (!vbasedev->enable_migration) {
goto add_blocker;
}
- ret = vfio_get_dev_region_info(vbasedev,
- VFIO_REGION_TYPE_MIGRATION_DEPRECATED,
- VFIO_REGION_SUBTYPE_MIGRATION_DEPRECATED,
- &info);
- if (ret) {
- goto add_blocker;
- }
-
- ret = vfio_migration_init(vbasedev, info);
+ ret = vfio_migration_init(vbasedev);
if (ret) {
goto add_blocker;
}
@@ -883,14 +885,12 @@ int vfio_migration_probe(VFIODevice *vbasedev, Error
**errp)
return ret;
}
- trace_vfio_migration_probe(vbasedev->name, info->index);
- g_free(info);
+ trace_vfio_migration_probe(vbasedev->name);
return 0;
add_blocker:
error_setg(&vbasedev->migration_blocker,
"VFIO device doesn't support migration");
- g_free(info);
ret = migrate_add_blocker(vbasedev->migration_blocker, errp);
if (ret < 0) {
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
index 90a8aecb3765..6be5381cc973 100644
--- a/hw/vfio/trace-events
+++ b/hw/vfio/trace-events
@@ -148,7 +148,7 @@ vfio_display_edid_update(uint32_t prefx, uint32_t prefy)
"%ux%u"
vfio_display_edid_write_error(void) ""
# migration.c
-vfio_migration_probe(const char *name, uint32_t index) " (%s) Region %d"
+vfio_migration_probe(const char *name) " (%s)"
vfio_migration_set_state(const char *name, uint32_t state) " (%s) state %d"
vfio_vmstate_change(const char *name, int running, const char *reason,
uint32_t dev_state) " (%s) running %d reason %s device state %d"
vfio_migration_state_notifier(const char *name, const char *state) " (%s)
state %s"
- [PULL 00/12] VFIO updates 2023-02-16, Alex Williamson, 2023/02/16
- [PULL 01/12] linux-headers: Update to v6.2-rc8, Alex Williamson, 2023/02/16
- [PULL 02/12] vfio/migration: Fix NULL pointer dereference bug, Alex Williamson, 2023/02/16
- [PULL 03/12] vfio/migration: Allow migration without VFIO IOMMU dirty tracking support, Alex Williamson, 2023/02/16
- [PULL 04/12] vfio/common: Change vfio_devices_all_running_and_saving() logic to equivalent one, Alex Williamson, 2023/02/16
- [PULL 05/12] vfio/migration: Block multiple devices migration, Alex Williamson, 2023/02/16
- [PULL 06/12] vfio/migration: Move migration v1 logic to vfio_migration_init(),
Alex Williamson <=
- [PULL 07/12] vfio/migration: Rename functions/structs related to v1 protocol, Alex Williamson, 2023/02/16
- [PULL 08/12] vfio/migration: Implement VFIO migration protocol v2, Alex Williamson, 2023/02/16
- [PULL 09/12] vfio/migration: Remove VFIO migration protocol v1, Alex Williamson, 2023/02/16
- [PULL 10/12] vfio: Alphabetize migration section of VFIO trace-events file, Alex Williamson, 2023/02/16
- [PULL 11/12] docs/devel: Align VFIO migration docs to v2 protocol, Alex Williamson, 2023/02/16
- [PULL 12/12] MAINTAINERS: Add myself as VFIO reviewer, Alex Williamson, 2023/02/16
- Re: [PULL 00/12] VFIO updates 2023-02-16, Peter Maydell, 2023/02/21