Commit 9e14b849 authored Apr 24, 2019 by Wei Yang Committed by Dr. David Alan Gilbert May 14, 2019

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>

parent 5351e69a

migration/savevm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);