diff options
| author | Wei Yang <richardw.yang@linux.intel.com> | 2019-04-24 08:46:59 +0800 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2019-05-14 17:33:35 +0100 |
| commit | 9e14b849082755c80efe59d7a4e5a77b5ac24877 (patch) | |
| tree | fb121751901a1f4091035fee138a88cc7f5e643a /migration | |
| parent | 5351e69af826665cef6858c960c3336a4228bb70 (diff) | |
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 <richardw.yang@linux.intel.com>
Message-Id: <20190424004700.12766-4-richardw.yang@linux.intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/savevm.c | 8 |
1 files 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); |