Skip to content

Commit

Permalink
migration: Add migration prefix to functions in target.c
Browse files Browse the repository at this point in the history
The functions in target.c are not static, yet they don't have a proper
migration prefix. Add such prefix.

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 5c7a4b6 commit 38c482b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions migration/migration.c
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ static void fill_source_migration_info(MigrationInfo *info)
populate_time_info(info, s);
populate_ram_info(info, s);
populate_disk_info(info);
populate_vfio_info(info);
migration_populate_vfio_info(info);
break;
case MIGRATION_STATUS_COLO:
info->has_status = true;
Expand All @@ -1048,7 +1048,7 @@ static void fill_source_migration_info(MigrationInfo *info)
case MIGRATION_STATUS_COMPLETED:
populate_time_info(info, s);
populate_ram_info(info, s);
populate_vfio_info(info);
migration_populate_vfio_info(info);
break;
case MIGRATION_STATUS_FAILED:
info->has_status = true;
Expand Down Expand Up @@ -1641,7 +1641,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
*/
memset(&mig_stats, 0, sizeof(mig_stats));
memset(&compression_counters, 0, sizeof(compression_counters));
reset_vfio_bytes_transferred();
migration_reset_vfio_bytes_transferred();

return true;
}
Expand Down
4 changes: 2 additions & 2 deletions migration/migration.h
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,8 @@ void migration_consume_urgent_request(void);
bool migration_rate_limit(void);
void migration_cancel(const Error *error);

void populate_vfio_info(MigrationInfo *info);
void reset_vfio_bytes_transferred(void);
void migration_populate_vfio_info(MigrationInfo *info);
void migration_reset_vfio_bytes_transferred(void);
void postcopy_temp_page_reset(PostcopyTmpPage *tmp_page);

#endif
2 changes: 1 addition & 1 deletion migration/savevm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1622,7 +1622,7 @@ 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));
reset_vfio_bytes_transferred();
migration_reset_vfio_bytes_transferred();
ms->to_dst_file = f;

qemu_mutex_unlock_iothread();
Expand Down
8 changes: 4 additions & 4 deletions migration/target.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
#endif

#ifdef CONFIG_VFIO
void populate_vfio_info(MigrationInfo *info)
void migration_populate_vfio_info(MigrationInfo *info)
{
if (vfio_mig_active()) {
info->vfio = g_malloc0(sizeof(*info->vfio));
info->vfio->transferred = vfio_mig_bytes_transferred();
}
}

void reset_vfio_bytes_transferred(void)
void migration_reset_vfio_bytes_transferred(void)
{
vfio_reset_bytes_transferred();
}
#else
void populate_vfio_info(MigrationInfo *info)
void migration_populate_vfio_info(MigrationInfo *info)
{
}

void reset_vfio_bytes_transferred(void)
void migration_reset_vfio_bytes_transferred(void)
{
}
#endif

0 comments on commit 38c482b

Please sign in to comment.