[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/13] migration: Add migration prefix to functions in target.c
From: |
Cédric Le Goater |
Subject: |
[PULL 07/13] migration: Add migration prefix to functions in target.c |
Date: |
Mon, 11 Sep 2023 09:50:02 +0200 |
From: Avihai Horon <avihaih@nvidia.com>
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>
---
migration/migration.h | 4 ++--
migration/migration.c | 6 +++---
migration/savevm.c | 2 +-
migration/target.c | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/migration/migration.h b/migration/migration.h
index
6eea18db367585e6f08aada9d14fc37e02e50977..c5695de214965dfddd854779e4da8d09f04d35ba
100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -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
diff --git a/migration/migration.c b/migration/migration.c
index
5528acb65e0f7b84d528ee8e8c477975cb8a7dad..92866a8f49d3a7d24028198defb15c5d4d86726e
100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -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;
@@ -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;
@@ -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;
}
diff --git a/migration/savevm.c b/migration/savevm.c
index
a2cb8855e29547d2b66e6bddfc3363466c7c3bab..5bf8b59a7dfc243eb353674bdef8083d441797e3
100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -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();
diff --git a/migration/target.c b/migration/target.c
index
f39c9a8d88775648816d46113843ef58198c86fd..a6ffa9a5ce312d1e64157b650827aa726eb4d364
100644
--- a/migration/target.c
+++ b/migration/target.c
@@ -15,7 +15,7 @@
#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));
@@ -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();
}
#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
--
2.41.0
- [PULL 00/13] vfio queue, Cédric Le Goater, 2023/09/11
- [PULL 01/13] vfio/migration: Move from STOP_COPY to STOP in vfio_save_cleanup(), Cédric Le Goater, 2023/09/11
- [PULL 02/13] sysemu: Add prepare callback to struct VMChangeStateEntry, Cédric Le Goater, 2023/09/11
- [PULL 03/13] qdev: Add qdev_add_vm_change_state_handler_full(), Cédric Le Goater, 2023/09/11
- [PULL 05/13] vfio/migration: Add P2P support for VFIO migration, Cédric Le Goater, 2023/09/11
- [PULL 08/13] vfio/migration: Fail adding device with enable-migration=on and existing blocker, Cédric Le Goater, 2023/09/11
- [PULL 06/13] vfio/migration: Allow migration of multiple P2P supporting devices, Cédric Le Goater, 2023/09/11
- [PULL 07/13] migration: Add migration prefix to functions in target.c,
Cédric Le Goater <=
- [PULL 10/13] migration: Add .save_prepare() handler to struct SaveVMHandlers, Cédric Le Goater, 2023/09/11
- [PULL 04/13] vfio/migration: Refactor PRE_COPY and RUNNING state checks, Cédric Le Goater, 2023/09/11
- [PULL 09/13] migration: Move more initializations to migrate_init(), Cédric Le Goater, 2023/09/11
- [PULL 11/13] vfio/migration: Block VFIO migration with postcopy migration, Cédric Le Goater, 2023/09/11
- [PULL 13/13] vfio/common: Separate vfio-pci ranges, Cédric Le Goater, 2023/09/11
- [PULL 12/13] vfio/migration: Block VFIO migration with background snapshot, Cédric Le Goater, 2023/09/11
- Re: [PULL 00/13] vfio queue, Stefan Hajnoczi, 2023/09/11