Commit 21a246a4 authored by ChenLiang's avatar ChenLiang Committed by Juan Quintela
Browse files

migration: remove duplicate code 



version_id is checked twice in the ram_load.

Signed-off-by: default avatarChenLiang <chenliang88@huawei.com>
Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent d99598cc

arch_init.c

+33 −35
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 


    seq_iter++;



    if (version_id < 4 || version_id > 4) {

    if (version_id != 4) {

        return -EINVAL;

    }
@@ -1021,7 +1021,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 
        addr &= TARGET_PAGE_MASK;



        if (flags & RAM_SAVE_FLAG_MEM_SIZE) {

            if (version_id == 4) {

            /* Synchronize RAM block list */

            char id[256];

            ram_addr_t length;
@@ -1060,7 +1059,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 
                total_ram_bytes -= length;

            }

        }

        }



        if (flags & RAM_SAVE_FLAG_COMPRESS) {

            void *host;