motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 12:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: Merge precopy/postcopy on switchover start

Browse source 
Now after all the cleanups, finally we can merge the switchover startup
phase into one single function for precopy/postcopy.

Signed-off-by: Peter Xu <peterx@redhat.com>
Tested-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Juraj Marcin <jmarcin@redhat.com>
Link: https://lore.kernel.org/r/20250114230746.3268797-16-peterx@redhat.com
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Peter Xu 2025-01-14 18:07:45 -05:00 • committed by Fabiano Rosas
parent 4881411136
commit 3dde8fdbad
1 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

66
migration/migration.c
View file

@ -105,7 +105,7 @@ static MigrationIncomingState *current_incoming;
static GSList *migration_blockers[MIG_MODE__MAX]; static GSList *migration_blockers[MIG_MODE__MAX];
static bool migration_object_check(MigrationState *ms, Error **errp); static bool migration_object_check(MigrationState *ms, Error **errp);
static bool migration_switchover_start(MigrationState *s); static bool migration_switchover_start(MigrationState *s, Error **errp);
static void migrate_fd_cancel(MigrationState *s); static void migrate_fd_cancel(MigrationState *s);
static bool close_return_path_on_source(MigrationState *s); static bool close_return_path_on_source(MigrationState *s);
static void migration_completion_end(MigrationState *s); static void migration_completion_end(MigrationState *s);
@ -2667,21 +2667,10 @@ static int postcopy_start(MigrationState *ms, Error **errp)
goto fail; goto fail;
} }
if (!migration_switchover_start(ms)) { if (!migration_switchover_start(ms, errp)) {
error_setg(errp, "migration_switchover_start() failed");
goto fail; goto fail;
} }
if (!migration_block_inactivate()) {
error_setg(errp, "%s: Failed in bdrv_inactivate_all()", __func__);
goto fail;
}
/* Switchover phase, switch to unlimited */
migration_rate_set(RATE_LIMIT_DISABLED);
precopy_notify_complete();
/* /*
* Cause any non-postcopiable, but iterative devices to * Cause any non-postcopiable, but iterative devices to
* send out their final data. * send out their final data.
@ -2813,7 +2802,7 @@ fail:
} }
/** /**
* @migration_switchover_start: Start VM switchover procedure * @migration_switchover_prepare: Start VM switchover procedure
* *
* @s: The migration state object pointer * @s: The migration state object pointer
* *
@ -2828,7 +2817,7 @@ fail:
* *
* Returns: true on success, false on interruptions. * Returns: true on success, false on interruptions.
*/ */
static bool migration_switchover_start(MigrationState *s) static bool migration_switchover_prepare(MigrationState *s)
{ {
/* Concurrent cancellation? Quit */ /* Concurrent cancellation? Quit */
if (s->state == MIGRATION_STATUS_CANCELLING) { if (s->state == MIGRATION_STATUS_CANCELLING) {
@ -2876,6 +2865,34 @@ static bool migration_switchover_start(MigrationState *s)
return s->state == MIGRATION_STATUS_DEVICE; return s->state == MIGRATION_STATUS_DEVICE;
} }
static bool migration_switchover_start(MigrationState *s, Error **errp)
{
ERRP_GUARD();
if (!migration_switchover_prepare(s)) {
error_setg(errp, "Switchover is interrupted");
return false;
}
/* Inactivate disks except in COLO */
if (!migrate_colo()) {
/*
* Inactivate before sending QEMU_VM_EOF so that the
* bdrv_activate_all() on the other end won't fail.
*/
if (!migration_block_inactivate()) {
error_setg(errp, "Block inactivate failed during switchover");
return false;
}
}
migration_rate_set(RATE_LIMIT_DISABLED);
precopy_notify_complete();
return true;
}
static int migration_completion_precopy(MigrationState *s) static int migration_completion_precopy(MigrationState *s)
{ {
int ret; int ret;
@ -2889,26 +2906,11 @@ static int migration_completion_precopy(MigrationState *s)
} }
} }
if (!migration_switchover_start(s)) { if (!migration_switchover_start(s, NULL)) {
ret = -EFAULT;
goto out_unlock; goto out_unlock;
} }
/* Inactivate disks except in COLO */
if (!migrate_colo()) {
/*
* Inactivate before sending QEMU_VM_EOF so that the
* bdrv_activate_all() on the other end won't fail.
*/
if (!migration_block_inactivate()) {
ret = -EFAULT;
goto out_unlock;
}
}
migration_rate_set(RATE_LIMIT_DISABLED);
precopy_notify_complete();
ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false); ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false);
out_unlock: out_unlock:
bql_unlock(); bql_unlock();