diff options
| author | Juan Quintela <quintela@redhat.com> | 2023-05-04 13:44:39 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-05-05 01:04:32 +0200 |
| commit | 5f1e7540b45fb2a73055a73efb3d7568d107cdd5 (patch) | |
| tree | 7af5f6c719cc6bd02482a09f73f672548cd66bcb | |
| parent | f3095cc8a7be285f89c57341b4aaeedf49fad269 (diff) | |
| download | focaccia-qemu-5f1e7540b45fb2a73055a73efb3d7568d107cdd5.tar.gz focaccia-qemu-5f1e7540b45fb2a73055a73efb3d7568d107cdd5.zip | |
migration: Make RAM_SAVE_FLAG_HOOK a normal case entry
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>
Diffstat (limited to '')
| -rw-r--r-- | migration/ram.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/migration/ram.c b/migration/ram.c index 23ba1cefff..5e7bf20ca5 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4445,14 +4445,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); |