Signed-off-by: Juan Quintela
---
migration/migration.c| 91 ---
migration/migration.h| 11 -
migration/multifd-zlib.c | 1 +
migration/multifd-zstd.c | 1 +
migration/options.c | 93
migration/options.h | 13 ++
6 files changed, 108 insertions(+), 102 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 4aac939833..028c297121 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2265,79 +2265,6 @@ bool migrate_postcopy(void)
return migrate_postcopy_ram() || migrate_dirty_bitmaps();
}
-int migrate_compress_level(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-return s->parameters.compress_level;
-}
-
-int migrate_compress_threads(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-return s->parameters.compress_threads;
-}
-
-int migrate_compress_wait_thread(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-return s->parameters.compress_wait_thread;
-}
-
-int migrate_decompress_threads(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-return s->parameters.decompress_threads;
-}
-
-int migrate_multifd_channels(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-return s->parameters.multifd_channels;
-}
-
-MultiFDCompression migrate_multifd_compression(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-assert(s->parameters.multifd_compression < MULTIFD_COMPRESSION__MAX);
-return s->parameters.multifd_compression;
-}
-
-int migrate_multifd_zlib_level(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-return s->parameters.multifd_zlib_level;
-}
-
-int migrate_multifd_zstd_level(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-return s->parameters.multifd_zstd_level;
-}
-
int migrate_use_tls(void)
{
MigrationState *s;
@@ -2347,24 +2274,6 @@ int migrate_use_tls(void)
return s->parameters.tls_creds && *s->parameters.tls_creds;
}
-uint64_t migrate_xbzrle_cache_size(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-return s->parameters.xbzrle_cache_size;
-}
-
-static int64_t migrate_max_postcopy_bandwidth(void)
-{
-MigrationState *s;
-
-s = migrate_get_current();
-
-return s->parameters.max_postcopy_bandwidth;
-}
-
bool migrate_use_block_incremental(void)
{
MigrationState *s;
diff --git a/migration/migration.h b/migration/migration.h
index 24184622a8..8451e5f2fe 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -449,24 +449,13 @@ MigrationState *migrate_get_current(void);
bool migrate_postcopy(void);
-int migrate_multifd_channels(void);
-MultiFDCompression migrate_multifd_compression(void);
-int migrate_multifd_zlib_level(void);
-int migrate_multifd_zstd_level(void);
-
int migrate_use_tls(void);
-uint64_t migrate_xbzrle_cache_size(void);
bool migrate_use_block_incremental(void);
int migrate_max_cpu_throttle(void);
uint64_t ram_get_total_transferred_pages(void);
-int migrate_compress_level(void);
-int migrate_compress_threads(void);
-int migrate_compress_wait_thread(void);
-int migrate_decompress_threads(void);
-
/* Sending on the return path - generic and then for each message type */
void migrate_send_rp_shut(MigrationIncomingState *mis,
uint32_t value);
diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
index 37770248e1..81701250ad 100644
--- a/migration/multifd-zlib.c
+++ b/migration/multifd-zlib.c
@@ -18,6 +18,7 @@
#include "qapi/error.h"
#include "migration.h"
#include "trace.h"
+#include "options.h"
#include "multifd.h"
struct zlib_data {
diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
index f4a8e1ed1f..d1d29e76cc 100644
--- a/migration/multifd-zstd.c
+++ b/migration/multifd-zstd.c
@@ -18,6 +18,7 @@
#include "qapi/error.h"
#include "migration.h"
#include "trace.h"
+#include "options.h"
#include "multifd.h"
struct zstd_data {
diff --git a/migration/options.c b/migration/options.c
index f3b2d6e482..8d15be858c 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -460,3 +460,96 @@ void
qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
s->capabilities[cap->value->capability] = cap->value->state;
}
}
+
+/* parameters */
+
+int migrate_compress_level(void)
+{
+MigrationState *s;
+
+s = migrate_get_current();
+
+return s->parameters.compress_level;
+}
+
+int migrate_compress_threads(void)
+{
+MigrationState *s;
+
+s = migrate_get_current();
+
+return s->parameters.compress_threads;
+}
+
+int migrate_compress_wait_thread(void)
+{
+MigrationState *s;
+
+s = migrate_get_current();
+
+return s->parameters.compress_wait_thread;
+}
+
+int migrate_decompress_threads(void)
+{
+MigrationState *s;
+
+s = migrate_get_current();
+
+return s-
