ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ram.c: remove unneeded labels 

ram_save_queue_pages() has an 'err' label that can be replaced by
'return -1' instead.

Same thing with ram_discard_range(), and in this case we can also
get rid of the 'ret' variable and return either '-1' on error
or the result of ram_block_discard_range().

CC: Juan Quintela <quintela@redhat.com>
CC: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-01-06 15:23:31 -03:00 committed by Juan Quintela
parent ddad81bd28
commit 03acb4e94d
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
migration/ram.c
View File

@ -2459,7 +2459,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
* it's the 1st request. * it's the 1st request.
*/ */
error_report("ram_save_queue_pages no previous block"); error_report("ram_save_queue_pages no previous block");
goto err; return -1;
} }
} else { } else {
ramblock = qemu_ram_block_by_name(rbname); ramblock = qemu_ram_block_by_name(rbname);
@ -2467,7 +2467,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
if (!ramblock) { if (!ramblock) {
/* We shouldn't be asked for a non-existent RAMBlock */ /* We shouldn't be asked for a non-existent RAMBlock */
error_report("ram_save_queue_pages no block '%s'", rbname); error_report("ram_save_queue_pages no block '%s'", rbname);
goto err; return -1;
} }
rs->last_req_rb = ramblock; rs->last_req_rb = ramblock;
} }
@ -2476,7 +2476,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
error_report("%s request overrun start=" RAM_ADDR_FMT " len=" error_report("%s request overrun start=" RAM_ADDR_FMT " len="
RAM_ADDR_FMT " blocklen=" RAM_ADDR_FMT, RAM_ADDR_FMT " blocklen=" RAM_ADDR_FMT,
__func__, start, len, ramblock->used_length); __func__, start, len, ramblock->used_length);
goto err; return -1;
} }
struct RAMSrcPageRequest *new_entry = struct RAMSrcPageRequest *new_entry =
@ -2492,9 +2492,6 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
qemu_mutex_unlock(&rs->src_page_req_mutex); qemu_mutex_unlock(&rs->src_page_req_mutex);
return 0; return 0;
err:
return -1;
} }
static bool save_page_use_compression(RAMState *rs) static bool save_page_use_compression(RAMState *rs)
@ -3097,8 +3094,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
*/ */
int ram_discard_range(const char *rbname, uint64_t start, size_t length) int ram_discard_range(const char *rbname, uint64_t start, size_t length)
{ {
int ret = -1;
trace_ram_discard_range(rbname, start, length); trace_ram_discard_range(rbname, start, length);
RCU_READ_LOCK_GUARD(); RCU_READ_LOCK_GUARD();
@ -3106,7 +3101,7 @@ int ram_discard_range(const char *rbname, uint64_t start, size_t length)
if (!rb) { if (!rb) {
error_report("ram_discard_range: Failed to find block '%s'", rbname); error_report("ram_discard_range: Failed to find block '%s'", rbname);
goto err; return -1;
} }
/* /*
@ -3118,10 +3113,7 @@ int ram_discard_range(const char *rbname, uint64_t start, size_t length)
length >> qemu_target_page_bits()); length >> qemu_target_page_bits());
} }
ret = ram_block_discard_range(rb, start, length); return ram_block_discard_range(rb, start, length);
err:
return ret;
} }
/* /*