mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Remove "rs" parameter in migration_bitmap_sync_precopy

Browse Source 
The global static variable ram_state in fact is referred to by the
"rs" parameter in migration_bitmap_sync_precopy. For ease of calling
by the callees, use the global variable directly in
migration_bitmap_sync_precopy and remove "rs" parameter.

The migration_bitmap_sync_precopy will be exported in the next commit.

Signed-off-by: Hyman Huang <yong.huang@smartx.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/283c335d61463bf477160da91b24da45cdaf3e43.1729146786.git.yong.huang@smartx.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Hyman Huang 2024-10-17 14:42:53 +08:00 committed by Peter Xu
parent d481cec756
commit 6a39ba7cab
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/ram.c
View File

@ -1088,9 +1088,10 @@ static void migration_bitmap_sync(RAMState *rs, bool last_stage)
} }
} }
static void migration_bitmap_sync_precopy(RAMState *rs, bool last_stage) static void migration_bitmap_sync_precopy(bool last_stage)
{ {
Error *local_err = NULL; Error *local_err = NULL;
assert(ram_state);
/* /*
* The current notifier usage is just an optimization to migration, so we * The current notifier usage is just an optimization to migration, so we
@ -1101,7 +1102,7 @@ static void migration_bitmap_sync_precopy(RAMState *rs, bool last_stage)
local_err = NULL; local_err = NULL;
} }
migration_bitmap_sync(rs, last_stage); migration_bitmap_sync(ram_state, last_stage);
if (precopy_notify(PRECOPY_NOTIFY_AFTER_BITMAP_SYNC, &local_err)) { if (precopy_notify(PRECOPY_NOTIFY_AFTER_BITMAP_SYNC, &local_err)) {
error_report_err(local_err); error_report_err(local_err);
@ -2782,7 +2783,7 @@ static bool ram_init_bitmaps(RAMState *rs, Error **errp)
if (!ret) { if (!ret) {
goto out_unlock; goto out_unlock;
} }
migration_bitmap_sync_precopy(rs, false); migration_bitmap_sync_precopy(false);
} }
} }
out_unlock: out_unlock:
@ -3248,7 +3249,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
WITH_RCU_READ_LOCK_GUARD() { WITH_RCU_READ_LOCK_GUARD() {
if (!migration_in_postcopy()) { if (!migration_in_postcopy()) {
migration_bitmap_sync_precopy(rs, true); migration_bitmap_sync_precopy(true);
} }
ret = rdma_registration_start(f, RAM_CONTROL_FINISH); ret = rdma_registration_start(f, RAM_CONTROL_FINISH);
@ -3330,7 +3331,7 @@ static void ram_state_pending_exact(void *opaque, uint64_t *must_precopy,
if (!migration_in_postcopy()) { if (!migration_in_postcopy()) {
bql_lock(); bql_lock();
WITH_RCU_READ_LOCK_GUARD() { WITH_RCU_READ_LOCK_GUARD() {
migration_bitmap_sync_precopy(rs, false); migration_bitmap_sync_precopy(false);
} }
bql_unlock(); bql_unlock();
} }