[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/18] migration: Create populate_compress()
From: |
Juan Quintela |
Subject: |
[PATCH 06/18] migration: Create populate_compress() |
Date: |
Tue, 13 Jun 2023 16:57:45 +0200 |
So we don't have to access compression_counters from outside
ram-compress.c.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram-compress.h | 3 +++
migration/migration.c | 11 +----------
migration/ram-compress.c | 14 ++++++++++++++
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/migration/ram-compress.h b/migration/ram-compress.h
index 6f7fe2f472..43ff44c0ba 100644
--- a/migration/ram-compress.h
+++ b/migration/ram-compress.h
@@ -30,6 +30,7 @@
#define QEMU_MIGRATION_COMPRESS_H
#include "qemu-file.h"
+#include "qapi/qapi-types-migration.h"
enum CompressResult {
RES_NONE = 0,
@@ -67,4 +68,6 @@ void compress_threads_load_cleanup(void);
int compress_threads_load_setup(QEMUFile *f);
void decompress_data_with_multi_threads(QEMUFile *f, void *host, int len);
+void populate_compress(MigrationInfo *info);
+
#endif
diff --git a/migration/migration.c b/migration/migration.c
index 5105ad6825..402bcd0d67 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -956,16 +956,7 @@ static void populate_ram_info(MigrationInfo *info,
MigrationState *s)
info->xbzrle_cache->overflow = xbzrle_counters.overflow;
}
- if (migrate_compress()) {
- info->compression = g_malloc0(sizeof(*info->compression));
- info->compression->pages = compression_counters.pages;
- info->compression->busy = compression_counters.busy;
- info->compression->busy_rate = compression_counters.busy_rate;
- info->compression->compressed_size =
- compression_counters.compressed_size;
- info->compression->compression_rate =
- compression_counters.compression_rate;
- }
+ populate_compress(info);
if (cpu_throttle_active()) {
info->has_cpu_throttle_percentage = true;
diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index a0f6a56470..a91c32588e 100644
--- a/migration/ram-compress.c
+++ b/migration/ram-compress.c
@@ -488,3 +488,17 @@ void decompress_data_with_multi_threads(QEMUFile *f, void
*host, int len)
}
}
}
+
+void populate_compress(MigrationInfo *info)
+{
+ if (migrate_compress()) {
+ info->compression = g_malloc0(sizeof(*info->compression));
+ info->compression->pages = compression_counters.pages;
+ info->compression->busy = compression_counters.busy;
+ info->compression->busy_rate = compression_counters.busy_rate;
+ info->compression->compressed_size =
+ compression_counters.compressed_size;
+ info->compression->compression_rate =
+ compression_counters.compression_rate;
+ }
+}
--
2.40.1
- [PATCH 07/18] migration: Create ram_compressed_pages(), (continued)
- [PATCH 07/18] migration: Create ram_compressed_pages(), Juan Quintela, 2023/06/13
- [PATCH 03/18] migration: RDMA is not compatible with anything else, Juan Quintela, 2023/06/13
- [PATCH 02/18] migration: Give one error if trying to set COMPRESSION and XBZRLE, Juan Quintela, 2023/06/13
- [PATCH 08/18] migration: Move update_compress_threads_counts() to ram-compress.c, Juan Quintela, 2023/06/13
- [PATCH 09/18] migration: Make compress_data_with_multithreads return bool, Juan Quintela, 2023/06/13
- [PATCH 06/18] migration: Create populate_compress(),
Juan Quintela <=
- [PATCH 10/18] migration: Simplify compress_page_with_multithread(), Juan Quintela, 2023/06/13
- [PATCH 13/18] migration: Simplify decompress_data_with_multi_threads(), Juan Quintela, 2023/06/13
- [PATCH 15/18] migration: save_compress_page() can take block through pss, Juan Quintela, 2023/06/13
- [PATCH 18/18] migration: Remove not needed file parameter for save_zero_page*, Juan Quintela, 2023/06/13
- [PATCH 05/18] migration: Move compression_counters cleanup ram-compress.c, Juan Quintela, 2023/06/13