From 9e14b849082755c80efe59d7a4e5a77b5ac24877 Mon Sep 17 00:00:00 2001 From: Wei Yang Date: Wed, 24 Apr 2019 08:46:59 +0800 Subject: [PATCH] migration/savevm: load_header before load_setup In migration_thread() and qemu_savevm_state(), we savevm_state in following sequence: qemu_savevm_state_header(f); qemu_savevm_state_setup(f); Then it would be more proper to loadvm_state in the save sequence. Signed-off-by: Wei Yang Message-Id: <20190424004700.12766-4-richardw.yang@linux.intel.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- migration/savevm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 6e8912af49..4c7b8379e8 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2434,10 +2434,6 @@ int qemu_loadvm_state(QEMUFile *f) return -ENOTSUP; } - if (qemu_loadvm_state_setup(f) != 0) { - return -EINVAL; - } - if (migrate_get_current()->send_configuration) { if (qemu_get_byte(f) != QEMU_VM_CONFIGURATION) { error_report("Configuration section missing"); @@ -2452,6 +2448,10 @@ int qemu_loadvm_state(QEMUFile *f) } } + if (qemu_loadvm_state_setup(f) != 0) { + return -EINVAL; + } + cpu_synchronize_all_pre_loadvm(); ret = qemu_loadvm_state_main(f, mis);