diff options
| author | Juan Quintela <quintela@redhat.com> | 2023-06-13 16:57:45 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-10-17 22:14:51 +0200 |
| commit | 6f609005730d51e085d7404fcfc72576add237e1 (patch) | |
| tree | 8454a38084438545f059ca0a4eb6c24b7078aaa1 | |
| parent | 809f188a1a874ead74a784977e15dec33100891e (diff) | |
| download | qemu-6f609005730d51e085d7404fcfc72576add237e1.zip qemu-6f609005730d51e085d7404fcfc72576add237e1.tar.gz qemu-6f609005730d51e085d7404fcfc72576add237e1.tar.bz2 | |
migration: Create populate_compress()
So we don't have to access compression_counters from outside
ram-compress.c.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Message-ID: <20230613145757.10131-7-quintela@redhat.com>
| -rw-r--r-- | migration/migration.c | 11 | ||||
| -rw-r--r-- | migration/ram-compress.c | 13 | ||||
| -rw-r--r-- | migration/ram-compress.h | 3 |
3 files changed, 17 insertions, 10 deletions
diff --git a/migration/migration.c b/migration/migration.c index a808abd..05c0b80 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -974,16 +974,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 a0f6a56..bbf78a0 100644 --- a/migration/ram-compress.c +++ b/migration/ram-compress.c @@ -488,3 +488,16 @@ void decompress_data_with_multi_threads(QEMUFile *f, void *host, int len) } } } + +void populate_compress(MigrationInfo *info) +{ + if (!migrate_compress()) { + return; + } + 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; +} diff --git a/migration/ram-compress.h b/migration/ram-compress.h index 6f7fe2f..43ff44c 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 |