Peter Xu <[email protected]> writes: > Now after removing the special case in COLO, we can drop this parameter. > > Signed-off-by: Peter Xu <[email protected]> > --- > migration/savevm.h | 2 +- > migration/migration.c | 2 +- > migration/savevm.c | 12 +++++------- > 3 files changed, 7 insertions(+), 9 deletions(-) > > 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, > diff --git a/migration/migration.c b/migration/migration.c > index 1bcde301f7..5d21d6dc11 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -3018,7 +3018,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 529cf310e0..1bf1037ce1 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); > @@ -1831,7 +1829,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) > ret = qemu_file_get_error(f); > if (ret == 0) { > qemu_savevm_maybe_send_switchover_start(f); > - qemu_savevm_state_complete_precopy(f, false); > + qemu_savevm_state_complete_precopy(f); > ret = qemu_file_get_error(f); > } > if (ret != 0) {
Reviewed-by: Fabiano Rosas <[email protected]>
