OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: Add migration prefix to functions in target.c 

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>
This commit is contained in:
Avihai Horon 2023-09-06 18:08:48 +03:00 committed by Cédric Le Goater
parent 5c7a4b6035
commit 38c482b477
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/migration.c
View File

@ -1039,7 +1039,7 @@ static void fill_source_migration_info(MigrationInfo *info)
populate_time_info(info, s); populate_time_info(info, s);
populate_ram_info(info, s); populate_ram_info(info, s);
populate_disk_info(info); populate_disk_info(info);
populate_vfio_info(info); migration_populate_vfio_info(info);
break; break;
case MIGRATION_STATUS_COLO: case MIGRATION_STATUS_COLO:
info->has_status = true; info->has_status = true;
@ -1048,7 +1048,7 @@ static void fill_source_migration_info(MigrationInfo *info)
case MIGRATION_STATUS_COMPLETED: case MIGRATION_STATUS_COMPLETED:
populate_time_info(info, s); populate_time_info(info, s);
populate_ram_info(info, s); populate_ram_info(info, s);
populate_vfio_info(info); migration_populate_vfio_info(info);
break; break;
case MIGRATION_STATUS_FAILED: case MIGRATION_STATUS_FAILED:
info->has_status = true; info->has_status = true;
@ -1641,7 +1641,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
*/ */
memset(&mig_stats, 0, sizeof(mig_stats)); memset(&mig_stats, 0, sizeof(mig_stats));
memset(&compression_counters, 0, sizeof(compression_counters)); memset(&compression_counters, 0, sizeof(compression_counters));
reset_vfio_bytes_transferred(); migration_reset_vfio_bytes_transferred();
return true; return true;
} }

4
migration/migration.h
View File

@ -512,8 +512,8 @@ void migration_consume_urgent_request(void);
bool migration_rate_limit(void); bool migration_rate_limit(void);
void migration_cancel(const Error *error); void migration_cancel(const Error *error);
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);
void postcopy_temp_page_reset(PostcopyTmpPage *tmp_page); void postcopy_temp_page_reset(PostcopyTmpPage *tmp_page);
#endif #endif

2
migration/savevm.c
View File

@ -1622,7 +1622,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
migrate_init(ms); migrate_init(ms);
memset(&mig_stats, 0, sizeof(mig_stats)); memset(&mig_stats, 0, sizeof(mig_stats));
memset(&compression_counters, 0, sizeof(compression_counters)); memset(&compression_counters, 0, sizeof(compression_counters));
reset_vfio_bytes_transferred(); migration_reset_vfio_bytes_transferred();
ms->to_dst_file = f; ms->to_dst_file = f;
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();

8
migration/target.c
View File

@ -15,7 +15,7 @@
#endif #endif
#ifdef CONFIG_VFIO #ifdef CONFIG_VFIO
void populate_vfio_info(MigrationInfo *info) void migration_populate_vfio_info(MigrationInfo *info)
{ {
if (vfio_mig_active()) { if (vfio_mig_active()) {
info->vfio = g_malloc0(sizeof(*info->vfio)); info->vfio = g_malloc0(sizeof(*info->vfio));
@ -23,16 +23,16 @@ void populate_vfio_info(MigrationInfo *info)
} }
} }
void reset_vfio_bytes_transferred(void) void migration_reset_vfio_bytes_transferred(void)
{ {
vfio_reset_bytes_transferred(); vfio_reset_bytes_transferred();
} }
#else #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 #endif