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

migration: Don't return for postcopy_chunk_hostpages() 

It always return zero, because it just can't go wrong so far.  Simplify the
code with no functional change.

Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.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:
Peter Xu 2021-12-07 19:50:11 +08:00 committed by Juan Quintela
parent 53405ffb33
commit dc57d6f2ec
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/ram.c
View File

@ -2566,12 +2566,10 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, RAMBlock *block)
* dirty host-page size chunks as all dirty. In this case the host-page * dirty host-page size chunks as all dirty. In this case the host-page
* is the host-page for the particular RAMBlock, i.e. it might be a huge page * is the host-page for the particular RAMBlock, i.e. it might be a huge page
* *
* Returns zero on success
*
* @ms: current migration state * @ms: current migration state
* @block: block we want to work with * @block: block we want to work with
*/ */
static int postcopy_chunk_hostpages(MigrationState *ms, RAMBlock *block) static void postcopy_chunk_hostpages(MigrationState *ms, RAMBlock *block)
{ {
postcopy_discard_send_init(ms, block->idstr); postcopy_discard_send_init(ms, block->idstr);
@ -2581,7 +2579,6 @@ static int postcopy_chunk_hostpages(MigrationState *ms, RAMBlock *block)
postcopy_chunk_hostpages_pass(ms, block); postcopy_chunk_hostpages_pass(ms, block);
postcopy_discard_send_finish(ms); postcopy_discard_send_finish(ms);
return 0;
} }
/** /**
@ -2603,7 +2600,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
{ {
RAMState *rs = ram_state; RAMState *rs = ram_state;
RAMBlock *block; RAMBlock *block;
int ret;
RCU_READ_LOCK_GUARD(); RCU_READ_LOCK_GUARD();
@ -2617,10 +2613,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
RAMBLOCK_FOREACH_NOT_IGNORED(block) { RAMBLOCK_FOREACH_NOT_IGNORED(block) {
/* Deal with TPS != HPS and huge pages */ /* Deal with TPS != HPS and huge pages */
ret = postcopy_chunk_hostpages(ms, block); postcopy_chunk_hostpages(ms, block);
if (ret) {
return ret;
}
} }
trace_ram_postcopy_send_discard_bitmap(); trace_ram_postcopy_send_discard_bitmap();