| Message ID | 20211207115016.73195-3-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration: Postcopy cleanup on ram disgard | expand |
* Peter Xu (peterx@redhat.com) wrote: > 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> OK, I was wondering if the discard_send_finish could fail, but I chased it another 3 or 4 levels and nothing returns an error flag either. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/ram.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 756ac800a7..fb8c1a887e 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2585,12 +2585,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 > * is the host-page for the particular RAMBlock, i.e. it might be a huge page > * > - * Returns zero on success > - * > * @ms: current migration state > * @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); > > @@ -2600,7 +2598,6 @@ static int postcopy_chunk_hostpages(MigrationState *ms, RAMBlock *block) > postcopy_chunk_hostpages_pass(ms, block); > > postcopy_discard_send_finish(ms); > - return 0; > } > > /** > @@ -2622,7 +2619,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) > { > RAMState *rs = ram_state; > RAMBlock *block; > - int ret; > > RCU_READ_LOCK_GUARD(); > > @@ -2636,10 +2632,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) > > RAMBLOCK_FOREACH_NOT_IGNORED(block) { > /* Deal with TPS != HPS and huge pages */ > - ret = postcopy_chunk_hostpages(ms, block); > - if (ret) { > - return ret; > - } > + postcopy_chunk_hostpages(ms, block); > } > trace_ram_postcopy_send_discard_bitmap(); > > -- > 2.32.0 >
Peter Xu <peterx@redhat.com> wrote: > 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: Juan Quintela <quintela@redhat.com> queued
diff --git a/migration/ram.c b/migration/ram.c index 756ac800a7..fb8c1a887e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2585,12 +2585,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 * is the host-page for the particular RAMBlock, i.e. it might be a huge page * - * Returns zero on success - * * @ms: current migration state * @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); @@ -2600,7 +2598,6 @@ static int postcopy_chunk_hostpages(MigrationState *ms, RAMBlock *block) postcopy_chunk_hostpages_pass(ms, block); postcopy_discard_send_finish(ms); - return 0; } /** @@ -2622,7 +2619,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) { RAMState *rs = ram_state; RAMBlock *block; - int ret; RCU_READ_LOCK_GUARD(); @@ -2636,10 +2632,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) RAMBLOCK_FOREACH_NOT_IGNORED(block) { /* Deal with TPS != HPS and huge pages */ - ret = postcopy_chunk_hostpages(ms, block); - if (ret) { - return ret; - } + postcopy_chunk_hostpages(ms, block); } trace_ram_postcopy_send_discard_bitmap();
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> --- migration/ram.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)