And now we can simplify save_compress_page().
Reviewed-by: Lukas Straub <[email protected]>
Reviewed-by: Fabiano Rosas <[email protected]>
Signed-off-by: Juan Quintela <[email protected]>
Message-ID: <[email protected]>
---
migration/ram-compress.c | 1 +
migration/ram.c | 8 ++------
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index a991b15b7a..f56e1f8e69 100644
--- a/migration/ram-compress.c
+++ b/migration/ram-compress.c
@@ -291,6 +291,7 @@ bool compress_page_with_multi_thread(RAMBlock *block,
ram_addr_t offset,
}
if (!wait) {
qemu_mutex_unlock(&comp_done_lock);
+ compression_counters.busy++;
return false;
}
/*
diff --git a/migration/ram.c b/migration/ram.c
index 63a575ae90..46209388ec 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2067,12 +2067,8 @@ static bool save_compress_page(RAMState *rs,
PageSearchStatus *pss,
return false;
}
- if (compress_page_with_multi_thread(pss->block, offset, send_queued_data))
{
- return true;
- }
-
- compression_counters.busy++;
- return false;
+ return compress_page_with_multi_thread(pss->block, offset,
+ send_queued_data);
}
/**
--
2.41.0
