[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 25/30] migration: Move migrate_announce_params() to option.c
From: |
Juan Quintela |
Subject: |
[PULL 25/30] migration: Move migrate_announce_params() to option.c |
Date: |
Mon, 24 Apr 2023 15:27:25 +0200 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
---
Fix extra whitespace (fabiano)
---
migration/migration.c | 14 --------------
migration/options.c | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 5ab1e48f57..dccad95a55 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -954,20 +954,6 @@ MigrationParameters *qmp_query_migrate_parameters(Error
**errp)
return params;
}
-AnnounceParameters *migrate_announce_params(void)
-{
- static AnnounceParameters ap;
-
- MigrationState *s = migrate_get_current();
-
- ap.initial = s->parameters.announce_initial;
- ap.max = s->parameters.announce_max;
- ap.rounds = s->parameters.announce_rounds;
- ap.step = s->parameters.announce_step;
-
- return ≈
-}
-
/*
* Return true if we're already in the middle of a migration
* (i.e. any of the active or setup states)
diff --git a/migration/options.c b/migration/options.c
index 2cb04fbbd1..418aafac64 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -16,6 +16,7 @@
#include "qapi/qapi-commands-migration.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/runstate.h"
+#include "migration/misc.h"
#include "migration.h"
#include "ram.h"
#include "options.h"
@@ -589,3 +590,19 @@ uint64_t migrate_xbzrle_cache_size(void)
return s->parameters.xbzrle_cache_size;
}
+
+/* parameters helpers */
+
+AnnounceParameters *migrate_announce_params(void)
+{
+ static AnnounceParameters ap;
+
+ MigrationState *s = migrate_get_current();
+
+ ap.initial = s->parameters.announce_initial;
+ ap.max = s->parameters.announce_max;
+ ap.rounds = s->parameters.announce_rounds;
+ ap.step = s->parameters.announce_step;
+
+ return ≈
+}
--
2.39.2
- [PULL 08/30] migration: Move migrate_use_events() to options.c, (continued)
- [PULL 08/30] migration: Move migrate_use_events() to options.c, Juan Quintela, 2023/04/24
- [PULL 10/30] migration: Move migrate_use_zero_copy_send() to options.c, Juan Quintela, 2023/04/24
- [PULL 11/30] migration: Move migrate_use_xbzrle() to options.c, Juan Quintela, 2023/04/24
- [PULL 03/30] spice: move client_migrate_info command to ui/, Juan Quintela, 2023/04/24
- [PULL 04/30] migration: Create migrate_cap_set(), Juan Quintela, 2023/04/24
- [PULL 06/30] migration: Move migrate_colo_enabled() to options.c, Juan Quintela, 2023/04/24
- [PULL 07/30] migration: Move migrate_use_compression() to options.c, Juan Quintela, 2023/04/24
- [PULL 13/30] migration: Move migrate_use_return() to options.c, Juan Quintela, 2023/04/24
- [PULL 05/30] migration: Create options.c, Juan Quintela, 2023/04/24
- [PULL 09/30] migration: Move migrate_use_multifd() to options.c, Juan Quintela, 2023/04/24
- [PULL 25/30] migration: Move migrate_announce_params() to option.c,
Juan Quintela <=
- [PULL 22/30] migration: Create migrate_throttle_trigger_threshold(), Juan Quintela, 2023/04/24
- [PULL 26/30] migration: Create migrate_cpu_throttle_initial() to option.c, Juan Quintela, 2023/04/24
- [PULL 30/30] migration: Create migrate_max_bandwidth() function, Juan Quintela, 2023/04/24
- [PULL 12/30] migration: Move migrate_use_block() to options.c, Juan Quintela, 2023/04/24
- [PULL 14/30] migration: Create migrate_rdma_pin_all() function, Juan Quintela, 2023/04/24
- [PULL 15/30] migration: Move migrate_caps_check() to options.c, Juan Quintela, 2023/04/24
- [PULL 20/30] migration: Use migrate_max_postcopy_bandwidth(), Juan Quintela, 2023/04/24
- [PULL 27/30] migration: Create migrate_cpu_throttle_increment() function, Juan Quintela, 2023/04/24
- [PULL 29/30] migration: Move migrate_postcopy() to options.c, Juan Quintela, 2023/04/24
- [PULL 16/30] migration: Move qmp_query_migrate_capabilities() to options.c, Juan Quintela, 2023/04/24