SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration: Make RAM_SAVE_FLAG_HOOK a normal case entry

Browse Source 
Fixes this commit, clearly a bad merge after a rebase or similar, it
should have been its own case since that point.

commit 5b0e9dd46fbda5152566a4a26fd96bc0d0452bf7
Author: Peter Lieven <pl@kamp.de>
Date:   Tue Jun 24 11:32:36 2014 +0200

    migration: catch unknown flag combinations in ram_load

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230504114443.23891-2-quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-05-04 13:44:39 +02:00
parent f3095cc8a7
commit 5f1e7540b4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/ram.c
View File

@ -4445,14 +4445,12 @@ static int ram_load_precopy(QEMUFile *f)
multifd_recv_sync_main(); multifd_recv_sync_main();
} }
break; break;
case RAM_SAVE_FLAG_HOOK:
ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL);
break;
default: default:
if (flags & RAM_SAVE_FLAG_HOOK) { error_report("Unknown combination of migration flags: 0x%x", flags);
ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL); ret = -EINVAL;
} else {
error_report("Unknown combination of migration flags: 0x%x",
flags);
ret = -EINVAL;
}
} }
if (!ret) { if (!ret) {
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);