[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/16] migration/savevm: load_header before load_setu
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 12/16] migration/savevm: load_header before load_setup |
Date: |
Tue, 14 May 2019 19:34:50 +0100 |
From: Wei Yang <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
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);
--
2.21.0
- [Qemu-devel] [PULL 02/16] migration: not necessary to check ops again, (continued)
- [Qemu-devel] [PULL 02/16] migration: not necessary to check ops again, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 03/16] migration: remove not used field xfer_limit, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 04/16] vmstate: check subsection_found is enough, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 05/16] migration: savevm: fix error code with migration blockers, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 06/16] migration/colo.c: Remove redundant input parameter, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 07/16] migration/colo.h: Remove obsolete codes, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 08/16] qemu-option.hx: Update missed parameter for colo-compare, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 09/16] migration/ram.c: start of migration_bitmap_sync_range is always 0, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 10/16] migration: update comments of migration bitmap, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 11/16] migration/savevm: remove duplicate check of migration_is_blocked, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 12/16] migration/savevm: load_header before load_setup,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 13/16] migration/savevm: wrap into qemu_loadvm_state_header(), Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 14/16] migration: Fix use-after-free during process exit, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 15/16] migration/ram.c: fix typos in comments, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 16/16] monitor: Call mon_get_cpu() only once at hmp_gva2gpa(), Dr. David Alan Gilbert (git), 2019/05/14
- Re: [Qemu-devel] [PULL 00/16] migration queue, Peter Maydell, 2019/05/16