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 04/11] migration: Create ram_compressed_pages()
Date: Wed, 18 Oct 2023 12:06:44 +0200 [thread overview]
Message-ID: <20231018100651.32674-5-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-8-quintela@redhat.com>
---
migration/ram-compress.h | 1 +
migration/ram-compress.c | 6 ++++++
migration/ram.c | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
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)
--
2.41.0
next prev parent reply other threads:[~2023-10-18 10:09 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 ` Juan Quintela [this message]
2023-10-18 10:06 ` [PULL 05/11] migration: Move update_compress_threads_counts() to ram-compress.c Juan Quintela
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-5-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.