From c3f7e63561bbede9c3b6278a5fd5e262ce960f4c Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Wed, 1 Aug 2018 13:55:16 +0100 Subject: [PATCH 12/21] migration: fix saving normal page even if it's been compressed RH-Author: Dr. David Alan Gilbert Message-id: <20180801135522.11658-13-dgilbert@redhat.com> Patchwork-id: 81568 O-Subject: [qemu-kvm RHEL8/virt212 PATCH 12/18] migration: fix saving normal page even if it's been compressed Bugzilla: 1594384 RH-Acked-by: Peter Xu RH-Acked-by: John Snow RH-Acked-by: Juan Quintela From: Xiao Guangrong 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 Message-Id: <20180428081045.8878-1-xiaoguangrong@tencent.com> Signed-off-by: Juan Quintela (cherry picked from commit 701b1876c0fc0c583e4aff300ace5d33a1b97ed6) Signed-off-by: Danilo C. L. de Paula --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 466609f..c982201 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1491,7 +1491,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); -- 1.8.3.1