[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/16] migration/savevm: wrap into qemu_loadvm_state_
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 13/16] migration/savevm: wrap into qemu_loadvm_state_header() |
Date: |
Tue, 14 May 2019 19:34:51 +0100 |
From: Wei Yang <address@hidden>
On source side, we have qemu_savevm_state_header() to send related data,
while on the receiving side those steps are scattered in
qemu_loadvm_state().
This patch wrap those related steps into qemu_loadvm_state_header() to
make it friendly to read.
Signed-off-by: Wei Yang <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel Henrique Barboza <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/savevm.c | 69 +++++++++++++++++++++++++++-------------------
1 file changed, 40 insertions(+), 29 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 4c7b8379e8..c0e557b4c2 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2262,6 +2262,43 @@ qemu_loadvm_section_part_end(QEMUFile *f,
MigrationIncomingState *mis)
return 0;
}
+static int qemu_loadvm_state_header(QEMUFile *f)
+{
+ unsigned int v;
+ int ret;
+
+ v = qemu_get_be32(f);
+ if (v != QEMU_VM_FILE_MAGIC) {
+ error_report("Not a migration stream");
+ return -EINVAL;
+ }
+
+ v = qemu_get_be32(f);
+ if (v == QEMU_VM_FILE_VERSION_COMPAT) {
+ error_report("SaveVM v2 format is obsolete and don't work anymore");
+ return -ENOTSUP;
+ }
+ if (v != QEMU_VM_FILE_VERSION) {
+ error_report("Unsupported migration stream version");
+ return -ENOTSUP;
+ }
+
+ 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;
+ }
+ }
+ return 0;
+}
+
static int qemu_loadvm_state_setup(QEMUFile *f)
{
SaveStateEntry *se;
@@ -2410,7 +2447,6 @@ int qemu_loadvm_state(QEMUFile *f)
{
MigrationIncomingState *mis = migration_incoming_get_current();
Error *local_err = NULL;
- unsigned int v;
int ret;
if (qemu_savevm_state_blocked(&local_err)) {
@@ -2418,34 +2454,9 @@ int qemu_loadvm_state(QEMUFile *f)
return -EINVAL;
}
- v = qemu_get_be32(f);
- if (v != QEMU_VM_FILE_MAGIC) {
- error_report("Not a migration stream");
- return -EINVAL;
- }
-
- v = qemu_get_be32(f);
- if (v == QEMU_VM_FILE_VERSION_COMPAT) {
- error_report("SaveVM v2 format is obsolete and don't work anymore");
- return -ENOTSUP;
- }
- if (v != QEMU_VM_FILE_VERSION) {
- error_report("Unsupported migration stream version");
- return -ENOTSUP;
- }
-
- 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;
- }
+ ret = qemu_loadvm_state_header(f);
+ if (ret) {
+ return ret;
}
if (qemu_loadvm_state_setup(f) != 0) {
--
2.21.0
- [Qemu-devel] [PULL 03/16] migration: remove not used field xfer_limit, (continued)
- [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), 2019/05/14
- [Qemu-devel] [PULL 13/16] migration/savevm: wrap into qemu_loadvm_state_header(),
Dr. David Alan Gilbert (git) <=
- [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