From 1fd03d41b86daa1eb8c941dfa013cc806bcaf053 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 13 Jun 2023 16:57:47 +0200 Subject: [PATCH] migration: Move update_compress_threads_counts() to ram-compress.c Signed-off-by: Juan Quintela Reviewed-by: Lukas Straub Message-ID: <20230613145757.10131-9-quintela@redhat.com> --- migration/ram-compress.c | 17 +++++++++++++++++ migration/ram-compress.h | 1 + migration/ram.c | 15 --------------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/migration/ram-compress.c b/migration/ram-compress.c index d54345d0c1..3ad5975d48 100644 --- a/migration/ram-compress.c +++ b/migration/ram-compress.c @@ -32,11 +32,14 @@ #include "ram-compress.h" #include "qemu/error-report.h" +#include "qemu/stats64.h" #include "migration.h" #include "options.h" #include "io/channel-null.h" #include "exec/target_page.h" #include "exec/ramblock.h" +#include "ram.h" +#include "migration-stats.h" CompressionStats compression_counters; @@ -507,3 +510,17 @@ uint64_t ram_compressed_pages(void) return compression_counters.pages; } +void update_compress_thread_counts(const CompressParam *param, int bytes_xmit) +{ + ram_transferred_add(bytes_xmit); + + if (param->result == RES_ZEROPAGE) { + stat64_add(&mig_stats.zero_pages, 1); + return; + } + + /* 8 means a header with RAM_SAVE_FLAG_CONTINUE. */ + compression_counters.compressed_size += bytes_xmit - 8; + compression_counters.pages++; +} + diff --git a/migration/ram-compress.h b/migration/ram-compress.h index 77465dad4b..e55d3b50bd 100644 --- a/migration/ram-compress.h +++ b/migration/ram-compress.h @@ -70,5 +70,6 @@ void decompress_data_with_multi_threads(QEMUFile *f, void *host, int len); void populate_compress(MigrationInfo *info); uint64_t ram_compressed_pages(void); +void update_compress_thread_counts(const CompressParam *param, int bytes_xmit); #endif diff --git a/migration/ram.c b/migration/ram.c index 2a9c899cb0..5595379fa6 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1292,21 +1292,6 @@ static int ram_save_multifd_page(QEMUFile *file, RAMBlock *block, return 1; } -static void -update_compress_thread_counts(const CompressParam *param, int bytes_xmit) -{ - ram_transferred_add(bytes_xmit); - - if (param->result == RES_ZEROPAGE) { - stat64_add(&mig_stats.zero_pages, 1); - return; - } - - /* 8 means a header with RAM_SAVE_FLAG_CONTINUE. */ - compression_counters.compressed_size += bytes_xmit - 8; - compression_counters.pages++; -} - static bool save_page_use_compression(RAMState *rs); static int send_queued_data(CompressParam *param) -- 2.11.4.GIT