Commit 16015d32 authored by Wei Yang's avatar Wei Yang Committed by Dr. David Alan Gilbert
Browse files

migration/savevm: wrap into qemu_loadvm_state_header() 



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: default avatarWei Yang <richardw.yang@linux.intel.com>
Message-Id: <20190424004700.12766-5-richardw.yang@linux.intel.com>
Reviewed-by: default avatarDaniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 9e14b849

migration/savevm.c

+40 −29
Original line number Diff line number Diff line
@@ -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,35 +2454,10 @@ 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);



    ret = qemu_loadvm_state_header(f);

    if (ret) {

            qemu_loadvm_state_cleanup();

        return ret;

    }

    }



    if (qemu_loadvm_state_setup(f) != 0) {

        return -EINVAL;