All of lore.kernel.org
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>,
	Juan Quintela <quintela@redhat.com>,
	Fabiano Rosas <farosas@suse.de>,
	Lukas Straub <lukasstraub2@web.de>
Subject: [PULL 05/11] migration: Move update_compress_threads_counts() to ram-compress.c
Date: Wed, 18 Oct 2023 12:06:45 +0200	[thread overview]
Message-ID: <20231018100651.32674-6-quintela@redhat.com> (raw)
In-Reply-To: <20231018100651.32674-1-quintela@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Message-ID: <20230613145757.10131-9-quintela@redhat.com>
---
 migration/ram-compress.h |  1 +
 migration/ram-compress.c | 17 +++++++++++++++++
 migration/ram.c          | 15 ---------------
 3 files changed, 18 insertions(+), 15 deletions(-)

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-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.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.41.0



  parent reply	other threads:[~2023-10-18 10:08 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-18 10:06 [PULL 00/11] Migration 20231018 patches Juan Quintela
2023-10-18 10:06 ` [PULL 01/11] migration: RDMA is not compatible with anything else Juan Quintela
2023-10-18 10:06 ` [PULL 02/11] migration: Move compression_counters cleanup ram-compress.c Juan Quintela
2023-10-18 10:06 ` [PULL 03/11] migration: Create populate_compress() Juan Quintela
2023-10-18 10:06 ` [PULL 04/11] migration: Create ram_compressed_pages() Juan Quintela
2023-10-18 10:06 ` Juan Quintela [this message]
2023-10-18 10:06 ` [PULL 06/11] migration: Simplify decompress_data_with_multi_threads() Juan Quintela
2023-10-18 10:06 ` [PULL 07/11] migration: Use "i" as an for index in ram-compress.c Juan Quintela
2023-10-18 10:06 ` [PULL 08/11] migration: Print block status when needed Juan Quintela
2023-10-18 10:06 ` [PULL 09/11] migration: save_compress_page() can take block through pss Juan Quintela
2023-10-18 10:06 ` [PULL 10/11] migration: control_save_page() " Juan Quintela
2023-10-18 10:06 ` [PULL 11/11] migration: save_zero_page() " Juan Quintela
2023-10-19 18:51 ` [PULL 00/11] Migration 20231018 patches Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231018100651.32674-6-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=farosas@suse.de \
    --cc=leobras@redhat.com \
    --cc=lukasstraub2@web.de \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.