* Peter Xu (pet...@redhat.com) wrote:
> Make it usable outside migration. To make it easier to use, remove the
> RAMState parameter since after all ram.c has the reference of ram_state
> directly from its context.
>
> Signed-off-by: Peter Xu <pet...@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> include/migration/misc.h | 1 +
> migration/ram.c | 10 +++++-----
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/include/migration/misc.h b/include/migration/misc.h
> index d2762257aa..e338be8c30 100644
> --- a/include/migration/misc.h
> +++ b/include/migration/misc.h
> @@ -66,6 +66,7 @@ void remove_migration_state_change_notifier(Notifier
> *notify);
> bool migration_in_setup(MigrationState *);
> bool migration_has_finished(MigrationState *);
> bool migration_has_failed(MigrationState *);
> +void migration_bitmap_sync_precopy(void);
> /* ...and after the device transmission */
> bool migration_in_postcopy_after_devices(MigrationState *);
> void migration_global_dump(Monitor *mon);
> diff --git a/migration/ram.c b/migration/ram.c
> index 04f13feb2e..d737175d4e 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -970,7 +970,7 @@ static void migration_bitmap_sync(RAMState *rs)
> }
> }
>
> -static void migration_bitmap_sync_precopy(RAMState *rs)
> +void migration_bitmap_sync_precopy(void)
> {
> Error *local_err = NULL;
>
> @@ -983,7 +983,7 @@ static void migration_bitmap_sync_precopy(RAMState *rs)
> local_err = NULL;
> }
>
> - migration_bitmap_sync(rs);
> + migration_bitmap_sync(ram_state);
>
> if (precopy_notify(PRECOPY_NOTIFY_AFTER_BITMAP_SYNC, &local_err)) {
> error_report_err(local_err);
> @@ -2303,7 +2303,7 @@ static void ram_init_bitmaps(RAMState *rs)
> WITH_RCU_READ_LOCK_GUARD() {
> ram_list_init_bitmaps();
> memory_global_dirty_log_start();
> - migration_bitmap_sync_precopy(rs);
> + migration_bitmap_sync_precopy();
> }
> qemu_mutex_unlock_ramlist();
> qemu_mutex_unlock_iothread();
> @@ -2592,7 +2592,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
>
> WITH_RCU_READ_LOCK_GUARD() {
> if (!migration_in_postcopy()) {
> - migration_bitmap_sync_precopy(rs);
> + migration_bitmap_sync_precopy();
> }
>
> ram_control_before_iterate(f, RAM_CONTROL_FINISH);
> @@ -2642,7 +2642,7 @@ static void ram_save_pending(QEMUFile *f, void *opaque,
> uint64_t max_size,
> remaining_size < max_size) {
> qemu_mutex_lock_iothread();
> WITH_RCU_READ_LOCK_GUARD() {
> - migration_bitmap_sync_precopy(rs);
> + migration_bitmap_sync_precopy();
> }
> qemu_mutex_unlock_iothread();
> remaining_size = rs->migration_dirty_pages * TARGET_PAGE_SIZE;
> --
> 2.24.1
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
