mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-28 18:09:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

migration: remove duplicate code

Browse Source 
version_id is checked twice in the ram_load.

Signed-off-by: ChenLiang <chenliang88@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
(cherry picked from commit 21a246a43b)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
ChenLiang
2014-04-25 17:06:20 +08:00
committed by Michael Roth
parent ba980a52d6
commit fe7e98c46e
1 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch_init.c
View File

@ -997,7 +997,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
seq_iter++; seq_iter++;
if (version_id < 4 || version_id > 4) { if (version_id != 4) {
return -EINVAL; return -EINVAL;
} }
@ -1008,7 +1008,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
addr &= TARGET_PAGE_MASK; addr &= TARGET_PAGE_MASK;
if (flags & RAM_SAVE_FLAG_MEM_SIZE) { if (flags & RAM_SAVE_FLAG_MEM_SIZE) {
if (version_id == 4) {
/* Synchronize RAM block list */ /* Synchronize RAM block list */
char id[256]; char id[256];
ram_addr_t length; ram_addr_t length;
@ -1047,7 +1046,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
total_ram_bytes -= length; total_ram_bytes -= length;
} }
} }
}
if (flags & RAM_SAVE_FLAG_COMPRESS) { if (flags & RAM_SAVE_FLAG_COMPRESS) {
void *host; void *host;