Philippe Mathieu-Daudé <phi...@redhat.com> wrote:
> postcopy_send_discard_bm_ram() always return zero. Since it can't
> fail, simplify and do not return anything.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> Based-on: <20211224065000.97572-1-pet...@redhat.com>
> ---
> migration/ram.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index 5234d1ece11..e241ce98461 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -2433,14 +2433,12 @@ void
> ram_postcopy_migrated_memory_release(MigrationState *ms)
> /**
> * postcopy_send_discard_bm_ram: discard a RAMBlock
> *
> - * Returns zero on success
> - *
> * Callback from postcopy_each_ram_send_discard for each RAMBlock
> *
> * @ms: current migration state
> * @block: RAMBlock to discard
> */
> -static int postcopy_send_discard_bm_ram(MigrationState *ms, RAMBlock *block)
> +static void postcopy_send_discard_bm_ram(MigrationState *ms, RAMBlock *block)
> {
> unsigned long end = block->used_length >> TARGET_PAGE_BITS;
> unsigned long current;
> @@ -2464,8 +2462,6 @@ static int postcopy_send_discard_bm_ram(MigrationState
> *ms, RAMBlock *block)
> postcopy_discard_send_range(ms, one, discard_length);
> current = one + discard_length;
> }
> -
> - return 0;
> }
>
> static void postcopy_chunk_hostpages_pass(MigrationState *ms, RAMBlock
> *block);
Nack.
You need to change the only caller (postcopy_each_send_discard) also.
ret = postcopy_send_discard_bm_ram(ms, block);
postcopy_discard_send_finish(ms);
if (ret) {
return ret;
}
Not sure if doing the same operation with
postcopy_each_send_discard/ram_postcopy_send_discard_bitmap() and
postcopy_chunk_hugepages makes sense.
Later, Juan.
