ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Wei Yang 2019-04-24 08:46:59 +08:00 committed by Dr. David Alan Gilbert
parent 5351e69af8
commit 9e14b84908
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/savevm.c
View File

@ -2434,10 +2434,6 @@ int qemu_loadvm_state(QEMUFile *f)
return -ENOTSUP; return -ENOTSUP;
} }
if (qemu_loadvm_state_setup(f) != 0) {
return -EINVAL;
}
if (migrate_get_current()->send_configuration) { if (migrate_get_current()->send_configuration) {
if (qemu_get_byte(f) != QEMU_VM_CONFIGURATION) { if (qemu_get_byte(f) != QEMU_VM_CONFIGURATION) {
error_report("Configuration section missing"); 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(); cpu_synchronize_all_pre_loadvm();
ret = qemu_loadvm_state_main(f, mis); ret = qemu_loadvm_state_main(f, mis);