Skip to content

Commit

Permalink
migration: Move more initializations to migrate_init()
Browse files Browse the repository at this point in the history
Initialization of mig_stats, compression_counters and VFIO bytes
transferred is hard-coded in migration code path and snapshot code path.

Make the code cleaner by initializing them in migrate_init().

Suggested-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
  • Loading branch information
avihai1122 authored and legoater committed Sep 11, 2023
1 parent 8118349 commit f543aa2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
14 changes: 7 additions & 7 deletions migration/migration.c
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,13 @@ void migrate_init(MigrationState *s)
s->iteration_initial_bytes = 0;
s->threshold_size = 0;
s->switchover_acked = false;
/*
* set mig_stats compression_counters memory to zero for a
* new migration
*/
memset(&mig_stats, 0, sizeof(mig_stats));
memset(&compression_counters, 0, sizeof(compression_counters));
migration_reset_vfio_bytes_transferred();
}

int migrate_add_blocker_internal(Error *reason, Error **errp)
Expand Down Expand Up @@ -1635,13 +1642,6 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
}

migrate_init(s);
/*
* set mig_stats compression_counters memory to zero for a
* new migration
*/
memset(&mig_stats, 0, sizeof(mig_stats));
memset(&compression_counters, 0, sizeof(compression_counters));
migration_reset_vfio_bytes_transferred();

return true;
}
Expand Down
3 changes: 0 additions & 3 deletions migration/savevm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1620,9 +1620,6 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
}

migrate_init(ms);
memset(&mig_stats, 0, sizeof(mig_stats));
memset(&compression_counters, 0, sizeof(compression_counters));
migration_reset_vfio_bytes_transferred();
ms->to_dst_file = f;

qemu_mutex_unlock_iothread();
Expand Down

0 comments on commit f543aa2

Please sign in to comment.