migration: Create ram_compressed_pages()

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Message-ID: <20230613145757.10131-8-quintela@redhat.com>

diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index bbf78a02d4a9a478504f0385c7ec6d3c873307b1..d54345d0c1e64e461bf77ca85ea2be3fbc541737 100644 (file)
--- 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-compress.h b/migration/ram-compress.h
index 43ff44c0ba2365848878ea6dc2de7b582e7788c5..77465dad4b7d40ba0dbb6b4ced8a3439ae83906c 100644 (file)
--- 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.c b/migration/ram.c
index c844151ee951da0eb43435f03e815e8063a82ddd..2a9c899cb00ec64868aa363692328ca12fc9da25 100644 (file)
--- 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)