|
 |
1bdc94 |
From 156eb2b86b1383e639106650be32ca7d1a004f09 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 22 Jun 2018 18:59:59 +0200
|
|
|
1bdc94 |
Subject: [PATCH 20/57] migration: fix saving normal page even if it's been
|
|
|
1bdc94 |
compressed
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180622190005.21297-13-dgilbert@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 80997
|
|
|
1bdc94 |
O-Subject: [RHEL7.6 qemu-kvm-rhev PATCH 12/18] migration: fix saving normal page even if it's been compressed
|
|
|
1bdc94 |
Bugzilla: 1584139
|
|
|
1bdc94 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
From: Xiao Guangrong <xiaoguangrong@tencent.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Fix the bug introduced by da3f56cb2e767016 (migration: remove
|
|
|
1bdc94 |
ram_save_compressed_page()), It should be 'return' rather than
|
|
|
1bdc94 |
'res'
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Sorry for this stupid mistake :(
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com>
|
|
|
1bdc94 |
Message-Id: <20180428081045.8878-1-xiaoguangrong@tencent.com>
|
|
|
1bdc94 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 701b1876c0fc0c583e4aff300ace5d33a1b97ed6)
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
migration/ram.c | 2 +-
|
|
|
1bdc94 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/migration/ram.c b/migration/ram.c
|
|
|
1bdc94 |
index 466609f..c982201 100644
|
|
|
1bdc94 |
--- a/migration/ram.c
|
|
|
1bdc94 |
+++ b/migration/ram.c
|
|
|
1bdc94 |
@@ -1491,7 +1491,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss,
|
|
|
1bdc94 |
* CPU resource.
|
|
|
1bdc94 |
*/
|
|
|
1bdc94 |
if (block == rs->last_sent_block && save_page_use_compression(rs)) {
|
|
|
1bdc94 |
- res = compress_page_with_multi_thread(rs, block, offset);
|
|
|
1bdc94 |
+ return compress_page_with_multi_thread(rs, block, offset);
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
return ram_save_page(rs, pss, last_stage);
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|