On Sat, Apr 28, 2018 at 04:10:45PM +0800, guangrong.xiao@xxxxxxxxx wrote:
> From: Xiao Guangrong <xiaoguangrong@xxxxxxxxxxx>
>
> Fix the bug introduced by da3f56cb2e767016 (migration: remove
> ram_save_compressed_page()), It should be 'return' rather than
> 'res'
>
> Sorry for this stupid mistake :(
>
> Signed-off-by: Xiao Guangrong <xiaoguangrong@xxxxxxxxxxx>
Reviewed-by: Peter Xu <peterx@xxxxxxxxxx>
So is that only a performance degradation without this fix (since
AFAIU the compressing pages will be sent twice)? Thanks,
> ---
> migration/ram.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index 01cc815410..699546cc43 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -1490,7 +1490,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss,
> * CPU resource.
> */
> if (block == rs->last_sent_block && save_page_use_compression(rs)) {
> - res = compress_page_with_multi_thread(rs, block, offset);
> + return compress_page_with_multi_thread(rs, block, offset);
> }
>
> return ram_save_page(rs, pss, last_stage);
> --
> 2.14.3
>
--
Peter Xu
