From: Peter Xu <[email protected]> Now after removing the special case in COLO, we can drop this parameter.
Reviewed-by: Fabiano Rosas <[email protected]> Signed-off-by: Peter Xu <[email protected]> Tested-by: Lukas Straub <[email protected]> Link: https://lore.kernel.org/qemu-devel/[email protected] Signed-off-by: Fabiano Rosas <[email protected]> --- migration/migration.c | 2 +- migration/savevm.c | 12 +++++------- migration/savevm.h | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 850150a261..b7a2eee25c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2757,7 +2757,7 @@ static int migration_completion_precopy(MigrationState *s) goto out_unlock; } - ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false); + ret = qemu_savevm_state_complete_precopy(s->to_dst_file); out_unlock: bql_unlock(); return ret; diff --git a/migration/savevm.c b/migration/savevm.c index d41be3a4a2..da9a60c73f 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1717,7 +1717,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f, return 0; } -int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only) +int qemu_savevm_state_complete_precopy(QEMUFile *f) { int ret; @@ -1726,11 +1726,9 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only) return ret; } - if (!iterable_only) { - ret = qemu_savevm_state_complete_precopy_non_iterable(f, false); - if (ret) { - return ret; - } + ret = qemu_savevm_state_complete_precopy_non_iterable(f, false); + if (ret) { + return ret; } return qemu_fflush(f); @@ -1830,7 +1828,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) ret = qemu_file_get_error(f); if (ret == 0) { - qemu_savevm_state_complete_precopy(f, false); + qemu_savevm_state_complete_precopy(f); ret = qemu_file_get_error(f); } if (ret != 0) { diff --git a/migration/savevm.h b/migration/savevm.h index 528607f09e..ea01ca63ec 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -42,7 +42,7 @@ void qemu_savevm_state_header(QEMUFile *f); int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy); void qemu_savevm_state_cleanup(void); void qemu_savevm_state_complete_postcopy(QEMUFile *f); -int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only); +int qemu_savevm_state_complete_precopy(QEMUFile *f); void qemu_savevm_state_pending_exact(uint64_t *must_precopy, uint64_t *can_postcopy); void qemu_savevm_state_pending_estimate(uint64_t *must_precopy, -- 2.51.0
