Skip to contentSkip to conversation

hmp: Remove migration capabilities from "info migrate"

PATCH Superseded Wei Yang 2 participants 3 messages Aug 5, 2019 – Aug 6, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Wei Yang

author
#0 lore raw

PATCH v2 1/1 hmp: Remove migration capabilities from "info migrate"

With the growth of migration capabilities, it is not proper to display them in "info migrate". Users are recommended to use "info migrate_capabiltiies" to list them.

---
v2:
* remove capabilities from "info migrate"

---
 monitor/hmp-cmds.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
monitor/hmp-cmds.c +1 -12
index 99ceb0846b..05a09987da 100644
@@ -220,24 +220,13 @@ static char *SocketAddress_to_str(SocketAddress *addr)
 void hmp_info_migrate(Monitor *mon, const QDict *qdict)
 {
     MigrationInfo *info;
-    MigrationCapabilityStatusList *caps, *cap;
+    MigrationCapabilityStatusList *caps;
 
     info = qmp_query_migrate(NULL);
     caps = qmp_query_migrate_capabilities(NULL);
 
     migration_global_dump(mon);
 
-    /* do not display parameters during setup */
-    if (info->has_status && caps) {
-        monitor_printf(mon, "capabilities: ");
-        for (cap = caps; cap; cap = cap->next) {
-            monitor_printf(mon, "%s: %s ",
-                           MigrationCapability_str(cap->value->capability),
-                           cap->value->state ? "on" : "off");
-        }
-        monitor_printf(mon, "\n");
-    }
-
     if (info->has_status) {
         monitor_printf(mon, "Migration status: %s",
                        MigrationStatus_str(info->status));
Signature · 1 line
2.17.1
#1 lore raw
Quoted 19 lines · * Wei Yang ([email protected]) wrote:

With the growth of migration capabilities, it is not proper to display them in "info migrate". Users are recommended to use "info migrate_capabiltiies" to list them.

---
v2:
* remove capabilities from "info migrate"

---
 monitor/hmp-cmds.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
monitor/hmp-cmds.c +0 -0
index 99ceb0846b..05a09987da 100644

monitor/hmp-cmds.c static char *SocketAddress_to_str(SocketAddress *addr) · line 226

Quoted 8 lines
monitor/hmp-cmds.c +1 -1
@@ -220,24 +220,13 @@ static char *SocketAddress_to_str(SocketAddress *addr)
 void hmp_info_migrate(Monitor *mon, const QDict *qdict)
 {
     MigrationInfo *info;
-    MigrationCapabilityStatusList *caps, *cap;
+    MigrationCapabilityStatusList *caps;
 
     info = qmp_query_migrate(NULL);
     caps = qmp_query_migrate_capabilities(NULL);

Why keep 'caps' and query them? Can't this go as well?

Dave

Quoted 19 lines
monitor/hmp-cmds.c +0 -11
     migration_global_dump(mon);
 
-    /* do not display parameters during setup */
-    if (info->has_status && caps) {
-        monitor_printf(mon, "capabilities: ");
-        for (cap = caps; cap; cap = cap->next) {
-            monitor_printf(mon, "%s: %s ",
-                           MigrationCapability_str(cap->value->capability),
-                           cap->value->state ? "on" : "off");
-        }
-        monitor_printf(mon, "\n");
-    }
-
     if (info->has_status) {
         monitor_printf(mon, "Migration status: %s",
                        MigrationStatus_str(info->status));
Signature · 1 line
2.17.1

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

author
#2 lore raw
Quoted 26 lines · Dr. David Alan Gilbert
Quoted 25 lines · * Wei Yang ([email protected]) wrote:

With the growth of migration capabilities, it is not proper to display them in "info migrate". Users are recommended to use "info migrate_capabiltiies" to list them.

---
v2:
* remove capabilities from "info migrate"

---
 monitor/hmp-cmds.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
monitor/hmp-cmds.c +1 -1
index 99ceb0846b..05a09987da 100644
@@ -220,24 +220,13 @@ static char *SocketAddress_to_str(SocketAddress *addr)
 void hmp_info_migrate(Monitor *mon, const QDict *qdict)
 {
     MigrationInfo *info;
-    MigrationCapabilityStatusList *caps, *cap;
+    MigrationCapabilityStatusList *caps;
 
Quoted 4 lines

monitor/hmp-cmds.c static char *SocketAddress_to_str(SocketAddress *addr) · line 226

Quoted 2 lines
monitor/hmp-cmds.c +0 -0
     info = qmp_query_migrate(NULL);
     caps = qmp_query_migrate_capabilities(NULL);

Why keep 'caps' and query them? Can't this go as well?

You are right. Let me remove it.

Signature · 2 lines
Wei Yang
Help you, Help me