mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfio/migration: Move migration v1 logic to vfio_migration_init()

Browse Source 
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: https://lore.kernel.org/r/20230216143630.25610-7-avihaih@nvidia.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Avihai Horon 2023-02-16 16:36:25 +02:00 committed by Alex Williamson
parent 29d81b71aa
commit 16fe4e8ab7
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/vfio/migration.c
View File

@ -786,14 +786,14 @@ static void vfio_migration_exit(VFIODevice *vbasedev)
vbasedev->migration = NULL; vbasedev->migration = NULL;
} }
static int vfio_migration_init(VFIODevice *vbasedev, static int vfio_migration_init(VFIODevice *vbasedev)
struct vfio_region_info *info)
{ {
int ret; int ret;
Object *obj; Object *obj;
VFIOMigration *migration; VFIOMigration *migration;
char id[256] = ""; char id[256] = "";
g_autofree char *path = NULL, *oid = NULL; g_autofree char *path = NULL, *oid = NULL;
struct vfio_region_info *info;
if (!vbasedev->ops->vfio_get_object) { if (!vbasedev->ops->vfio_get_object) {
return -EINVAL; return -EINVAL;
@ -804,6 +804,14 @@ static int vfio_migration_init(VFIODevice *vbasedev,
return -EINVAL; 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 = g_new0(VFIOMigration, 1);
vbasedev->migration->device_state = VFIO_DEVICE_STATE_V1_RUNNING; vbasedev->migration->device_state = VFIO_DEVICE_STATE_V1_RUNNING;
vbasedev->migration->vm_running = runstate_is_running(); vbasedev->migration->vm_running = runstate_is_running();
@ -823,6 +831,8 @@ static int vfio_migration_init(VFIODevice *vbasedev,
goto err; goto err;
} }
g_free(info);
migration = vbasedev->migration; migration = vbasedev->migration;
migration->vbasedev = vbasedev; migration->vbasedev = vbasedev;
@ -845,6 +855,7 @@ static int vfio_migration_init(VFIODevice *vbasedev,
return 0; return 0;
err: err:
g_free(info);
vfio_migration_exit(vbasedev); vfio_migration_exit(vbasedev);
return ret; return ret;
} }
@ -858,22 +869,13 @@ int64_t vfio_mig_bytes_transferred(void)
int vfio_migration_probe(VFIODevice *vbasedev, Error **errp) int vfio_migration_probe(VFIODevice *vbasedev, Error **errp)
{ {
struct vfio_region_info *info = NULL;
int ret = -ENOTSUP; int ret = -ENOTSUP;
if (!vbasedev->enable_migration) { if (!vbasedev->enable_migration) {
goto add_blocker; goto add_blocker;
} }
ret = vfio_get_dev_region_info(vbasedev, ret = vfio_migration_init(vbasedev);
VFIO_REGION_TYPE_MIGRATION_DEPRECATED,
VFIO_REGION_SUBTYPE_MIGRATION_DEPRECATED,
&info);
if (ret) {
goto add_blocker;
}
ret = vfio_migration_init(vbasedev, info);
if (ret) { if (ret) {
goto add_blocker; goto add_blocker;
} }
@ -883,14 +885,12 @@ int vfio_migration_probe(VFIODevice *vbasedev, Error **errp)
return ret; return ret;
} }
trace_vfio_migration_probe(vbasedev->name, info->index); trace_vfio_migration_probe(vbasedev->name);
g_free(info);
return 0; return 0;
add_blocker: add_blocker:
error_setg(&vbasedev->migration_blocker, error_setg(&vbasedev->migration_blocker,
"VFIO device doesn't support migration"); "VFIO device doesn't support migration");
g_free(info);
ret = migrate_add_blocker(vbasedev->migration_blocker, errp); ret = migrate_add_blocker(vbasedev->migration_blocker, errp);
if (ret < 0) { if (ret < 0) {

2
hw/vfio/trace-events
View File

@ -148,7 +148,7 @@ vfio_display_edid_update(uint32_t prefx, uint32_t prefy) "%ux%u"
vfio_display_edid_write_error(void) "" vfio_display_edid_write_error(void) ""
# migration.c # 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_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_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" vfio_migration_state_notifier(const char *name, const char *state) " (%s) state %s"