mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch_init: Be sure of only one exit entry with DPRINTF() for ram_load()

Browse Source 
When DPRINTF() has effect, the original author wants to print all
ram_load() calling results. So need use 'goto' instead of 'return'
within ram_load(), just like other areas have done.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Chen Gang 2014-05-01 21:28:11 +08:00 committed by Michael Tokarev
parent ad0a118fa3
commit 4798fe55c4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch_init.c
View File

@ -1036,7 +1036,8 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
seq_iter++; seq_iter++;
if (version_id != 4) { if (version_id != 4) {
return -EINVAL; ret = -EINVAL;
goto done;
} }
do { do {
@ -1091,7 +1092,8 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
host = host_from_stream_offset(f, addr, flags); host = host_from_stream_offset(f, addr, flags);
if (!host) { if (!host) {
return -EINVAL; ret = -EINVAL;
goto done;
} }
ch = qemu_get_byte(f); ch = qemu_get_byte(f);
@ -1101,14 +1103,16 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
host = host_from_stream_offset(f, addr, flags); host = host_from_stream_offset(f, addr, flags);
if (!host) { if (!host) {
return -EINVAL; ret = -EINVAL;
goto done;
} }
qemu_get_buffer(f, host, TARGET_PAGE_SIZE); qemu_get_buffer(f, host, TARGET_PAGE_SIZE);
} else if (flags & RAM_SAVE_FLAG_XBZRLE) { } else if (flags & RAM_SAVE_FLAG_XBZRLE) {
void *host = host_from_stream_offset(f, addr, flags); void *host = host_from_stream_offset(f, addr, flags);
if (!host) { if (!host) {
return -EINVAL; ret = -EINVAL;
goto done;
} }
if (load_xbzrle(f, addr, host) < 0) { if (load_xbzrle(f, addr, host) < 0) {