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

migration: Modify ram_init_bitmaps() to report dirty tracking errors

Browse Source 
The .save_setup() handler has now an Error** argument that we can use
to propagate errors reported by the .log_global_start() handler. Do
that for the RAM. The caller qemu_savevm_state_setup() will store the
error under the migration stream for later detection in the migration
sequence.

Signed-off-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240320064911.545001-15-clg@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Cédric Le Goater 2024-03-20 07:49:10 +01:00 committed by Peter Xu
parent 7bee8ba8bb
commit 030b56b280
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
migration/ram.c
View File

@ -2857,9 +2857,8 @@ static void migration_bitmap_clear_discarded_pages(RAMState *rs)
} }
} }
static void ram_init_bitmaps(RAMState *rs) static bool ram_init_bitmaps(RAMState *rs, Error **errp)
{ {
Error *local_err = NULL;
bool ret = true; bool ret = true;
qemu_mutex_lock_ramlist(); qemu_mutex_lock_ramlist();
@ -2868,10 +2867,8 @@ static void ram_init_bitmaps(RAMState *rs)
ram_list_init_bitmaps(); ram_list_init_bitmaps();
/* We don't use dirty log with background snapshots */ /* We don't use dirty log with background snapshots */
if (!migrate_background_snapshot()) { if (!migrate_background_snapshot()) {
ret = memory_global_dirty_log_start(GLOBAL_DIRTY_MIGRATION, ret = memory_global_dirty_log_start(GLOBAL_DIRTY_MIGRATION, errp);
&local_err);
if (!ret) { if (!ret) {
error_report_err(local_err);
goto out_unlock; goto out_unlock;
} }
migration_bitmap_sync_precopy(rs, false); migration_bitmap_sync_precopy(rs, false);
@ -2882,7 +2879,7 @@ out_unlock:
if (!ret) { if (!ret) {
ram_bitmaps_destroy(); ram_bitmaps_destroy();
return; return false;
} }
/* /*
@ -2890,24 +2887,23 @@ out_unlock:
* containing all 1s to exclude any discarded pages from migration. * containing all 1s to exclude any discarded pages from migration.
*/ */
migration_bitmap_clear_discarded_pages(rs); migration_bitmap_clear_discarded_pages(rs);
return true;
} }
static int ram_init_all(RAMState **rsp) static int ram_init_all(RAMState **rsp, Error **errp)
{ {
Error *local_err = NULL; if (!ram_state_init(rsp, errp)) {
if (!ram_state_init(rsp, &local_err)) {
error_report_err(local_err);
return -1; return -1;
} }
if (!xbzrle_init(&local_err)) { if (!xbzrle_init(errp)) {
error_report_err(local_err);
ram_state_cleanup(rsp); ram_state_cleanup(rsp);
return -1; return -1;
} }
ram_init_bitmaps(*rsp); if (!ram_init_bitmaps(*rsp, errp)) {
return -1;
}
return 0; return 0;
} }
@ -3104,8 +3100,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque, Error **errp)
/* migration has already setup the bitmap, reuse it. */ /* migration has already setup the bitmap, reuse it. */
if (!migration_in_colo_state()) { if (!migration_in_colo_state()) {
if (ram_init_all(rsp) != 0) { if (ram_init_all(rsp, errp) != 0) {
error_setg(errp, "%s: failed to setup RAM for migration", __func__);
compress_threads_save_cleanup(); compress_threads_save_cleanup();
return -1; return -1;
} }