[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/16] migration: cleanup in error paths in loadvm
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 12/16] migration: cleanup in error paths in loadvm |
Date: |
Wed, 26 Sep 2018 18:12:32 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
There's a couple of error paths in qemu_loadvm_state
which happen early on but after we've initialised the
load state; that needs to be cleaned up otherwise
we can hit asserts if the state gets reinitialised later.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/savevm.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/migration/savevm.c b/migration/savevm.c
index d35e87b88c..2d10e45582 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2333,11 +2333,13 @@ int qemu_loadvm_state(QEMUFile *f)
if (migrate_get_current()->send_configuration) {
if (qemu_get_byte(f) != QEMU_VM_CONFIGURATION) {
error_report("Configuration section missing");
+ qemu_loadvm_state_cleanup();
return -EINVAL;
}
ret = vmstate_load_state(f, &vmstate_configuration, &savevm_state, 0);
if (ret) {
+ qemu_loadvm_state_cleanup();
return ret;
}
}
--
2.17.1
- [Qemu-devel] [PULL 05/16] migration: do not flush_compressed_data at the end of iteration, (continued)
- [Qemu-devel] [PULL 05/16] migration: do not flush_compressed_data at the end of iteration, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 07/16] migration: use save_page_use_compression in flush_compressed_data, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 06/16] migration: show the statistics of compression, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 08/16] tests/migration: Convert x86 boot block compilation script into Makefile, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 09/16] tests/migration: Support cross compilation in generating boot header file, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 10/16] tests/migration: Add migration-test header file, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 11/16] migration/postcopy: Clear have_listen_thread, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 13/16] tests/migration: Speed up the test on ppc64, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 14/16] migration: fix QEMUFile leak, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 15/16] migration: fix the compression code, Dr. David Alan Gilbert (git), 2018/09/26
- [Qemu-devel] [PULL 12/16] migration: cleanup in error paths in loadvm,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 16/16] migration/ram.c: Avoid taking address of fields in packed MultiFDInit_t struct, Dr. David Alan Gilbert (git), 2018/09/26
- Re: [Qemu-devel] [PULL 00/16] migration queue, Peter Maydell, 2018/09/28