提交 096c83b7 编写于 作者: D Dr. David Alan Gilbert

migration: cleanup in error paths in loadvm

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: NDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20180914170430.54271-3-dgilbert@redhat.com>
Reviewed-by: NPeter Xu <peterx@redhat.com>
Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
上级 9cf4bb87
...@@ -2333,11 +2333,13 @@ int qemu_loadvm_state(QEMUFile *f) ...@@ -2333,11 +2333,13 @@ int qemu_loadvm_state(QEMUFile *f)
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");
qemu_loadvm_state_cleanup();
return -EINVAL; return -EINVAL;
} }
ret = vmstate_load_state(f, &vmstate_configuration, &savevm_state, 0); ret = vmstate_load_state(f, &vmstate_configuration, &savevm_state, 0);
if (ret) { if (ret) {
qemu_loadvm_state_cleanup();
return ret; return ret;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册