@@ -4466,14 +4466,12 @@ static int ram_load_precopy(QEMUFile *f)
multifd_recv_sync_main();
}
break;
+ case RAM_SAVE_FLAG_HOOK:
+ ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL);
+ break;
default:
- if (flags & RAM_SAVE_FLAG_HOOK) {
- ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL);
- } else {
- error_report("Unknown combination of migration flags: 0x%x",
- flags);
- ret = -EINVAL;
- }
+ error_report("Unknown combination of migration flags: 0x%x", flags);
+ ret = -EINVAL;
}
if (!ret) {
ret = qemu_file_get_error(f);
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> --- migration/ram.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)