[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/30] migration: Move qmp_migrate_set_capabilities() to options.c
From: |
Juan Quintela |
Subject: |
[PULL 17/30] migration: Move qmp_migrate_set_capabilities() to options.c |
Date: |
Mon, 24 Apr 2023 15:27:17 +0200 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
migration/migration.c | 26 --------------------------
migration/options.c | 26 ++++++++++++++++++++++++++
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 0004c163a6..b198f4acf5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1222,32 +1222,6 @@ MigrationInfo *qmp_query_migrate(Error **errp)
return info;
}
-void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
- Error **errp)
-{
- MigrationState *s = migrate_get_current();
- MigrationCapabilityStatusList *cap;
- bool new_caps[MIGRATION_CAPABILITY__MAX];
-
- if (migration_is_running(s->state)) {
- error_setg(errp, QERR_MIGRATION_ACTIVE);
- return;
- }
-
- memcpy(new_caps, s->capabilities, sizeof(new_caps));
- for (cap = params; cap; cap = cap->next) {
- new_caps[cap->value->capability] = cap->value->state;
- }
-
- if (!migrate_caps_check(s->capabilities, new_caps, errp)) {
- return;
- }
-
- for (cap = params; cap; cap = cap->next) {
- s->capabilities[cap->value->capability] = cap->value->state;
- }
-}
-
/*
* Check whether the parameters are valid. Error will be put into errp
* (if provided). Return true if valid, otherwise false.
diff --git a/migration/options.c b/migration/options.c
index ff621bdeb3..4cbe77e35a 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -413,3 +413,29 @@ MigrationCapabilityStatusList
*qmp_query_migrate_capabilities(Error **errp)
return head;
}
+
+void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
+ Error **errp)
+{
+ MigrationState *s = migrate_get_current();
+ MigrationCapabilityStatusList *cap;
+ bool new_caps[MIGRATION_CAPABILITY__MAX];
+
+ if (migration_is_running(s->state)) {
+ error_setg(errp, QERR_MIGRATION_ACTIVE);
+ return;
+ }
+
+ memcpy(new_caps, s->capabilities, sizeof(new_caps));
+ for (cap = params; cap; cap = cap->next) {
+ new_caps[cap->value->capability] = cap->value->state;
+ }
+
+ if (!migrate_caps_check(s->capabilities, new_caps, errp)) {
+ return;
+ }
+
+ for (cap = params; cap; cap = cap->next) {
+ s->capabilities[cap->value->capability] = cap->value->state;
+ }
+}
--
2.39.2
- [PULL 22/30] migration: Create migrate_throttle_trigger_threshold(), (continued)
- [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
- [PULL 17/30] migration: Move qmp_migrate_set_capabilities() to options.c,
Juan Quintela <=
- [PULL 21/30] migration: Move migrate_use_block_incremental() to option.c, Juan Quintela, 2023/04/24
- [PULL 18/30] migration: Move migrate_cap_set() to options.c, Juan Quintela, 2023/04/24
- [PULL 19/30] migration: Move parameters functions to option.c, Juan Quintela, 2023/04/24
- [PULL 24/30] migration: Create migrate_max_cpu_throttle(), Juan Quintela, 2023/04/24
- [PULL 23/30] migration: Create migrate_checkpoint_delay(), Juan Quintela, 2023/04/24
- [PULL 28/30] migration: Create migrate_cpu_throttle_tailslow() function, Juan Quintela, 2023/04/24
- Re: [PULL 00/30] Migration 20230424 patches, Richard Henderson, 2023/04/24