[PULL,04/11] migration: Create ram_compressed_pages()

Commit Message

Juan Quintela Oct. 18, 2023, 10:06 a.m. UTC

Signed-off-by: Juan Quintela <[e-mail]>
Reviewed-by: Lukas Straub <[e-mail]>
Message-ID: <[e-mail]>
---
 migration/ram-compress.h | 1 +
 migration/ram-compress.c | 6 ++++++
 migration/ram.c          | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

Patch

diff --git a/migration/ram-compress.h b/migration/ram-compress.h
index 43ff44c0ba..77465dad4b 100644
--- a/migration/ram-compress.h
+++ b/migration/ram-compress.h
@@ -69,5 +69,6 @@  int compress_threads_load_setup(QEMUFile *f);
 void decompress_data_with_multi_threads(QEMUFile *f, void *host, int len);
 
 void populate_compress(MigrationInfo *info);
+uint64_t ram_compressed_pages(void);
 
 #endif
diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index bbf78a02d4..d54345d0c1 100644
--- a/migration/ram-compress.c
+++ b/migration/ram-compress.c
@@ -501,3 +501,9 @@  void populate_compress(MigrationInfo *info)
     info->compression->compressed_size = compression_counters.compressed_size;
     info->compression->compression_rate = compression_counters.compression_rate;
 }
+
+uint64_t ram_compressed_pages(void)
+{
+    return compression_counters.pages;
+}
+
diff --git a/migration/ram.c b/migration/ram.c
index c844151ee9..2a9c899cb0 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -939,7 +939,7 @@  uint64_t ram_get_total_transferred_pages(void)
 {
     return stat64_get(&mig_stats.normal_pages) +
         stat64_get(&mig_stats.zero_pages) +
-        compression_counters.pages + xbzrle_counters.pages;
+        ram_compressed_pages() + xbzrle_counters.pages;
 }
 
 static void migration_update_rates(RAMState *rs, int64_t end_time)