Re: [PATCH v2 16/43] migration: Move qmp_migrate_set_capabilities() to options.c

2023-04-20 Thread Vladimir Sementsov-Ogievskiy

On 20.04.23 16:39, Juan Quintela wrote:

Signed-off-by: Juan Quintela


Reviewed-by: Vladimir Sementsov-Ogievskiy 

--
Best regards,
Vladimir




[PATCH v2 16/43] migration: Move qmp_migrate_set_capabilities() to options.c

2023-04-20 Thread Juan Quintela
Signed-off-by: Juan Quintela 
---
 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 bc796879c0..854be12ca6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1223,32 +1223,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