Skip to contentSkip to conversation

hmp/info_migration: formatting migration capability output

PATCH In review Wei Yang 3 participants 6 messages Aug 2, 2019

lore
Share & tools
lore

Wei Yang

author
#0 lore raw

PATCH 1/1 hmp/info_migration: formatting migration capability output

Current we put all migration capability in one line, which make it hard to read them and someone them are missed due to terminal width.

This patch formats it to print 4 in one line, which looks like this now:

capabilities:
xbzrle: off rdma-pin-all: off auto-converge: off zero-blocks: off
compress: on events: off postcopy-ram: off x-colo: off
release-ram: off block: off return-path: off pause-before-switchover: off
multifd: off dirty-bitmaps: off postcopy-blocktime: off late-block-activate: off
x-ignore-shared: off

---
 monitor/hmp-cmds.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
monitor/hmp-cmds.c +6 -2
index 5ca3ebe942..29ce5b73e4 100644
@@ -229,9 +229,13 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
 
     /* do not display parameters during setup */
     if (info->has_status && caps) {
+        int index = 0;
         monitor_printf(mon, "capabilities: ");
-        for (cap = caps; cap; cap = cap->next) {
-            monitor_printf(mon, "%s: %s ",
+        for (cap = caps; cap; cap = cap->next, index++) {
+            if (!(index % 4)) {
+                monitor_printf(mon, "\n");
+            }
+            monitor_printf(mon, "%20s: %3s ",
                            MigrationCapability_str(cap->value->capability),
                            cap->value->state ? "on" : "off");
         }
Signature · 1 line
2.17.1
#1 lore raw

Subject doesn't quite conform to conventions. Suggest

hmp: Improve how "info migrate" formats capabilities

Quoted 27 lines · Wei Yang

Current we put all migration capability in one line, which make it hard to read them and someone them are missed due to terminal width.

This patch formats it to print 4 in one line, which looks like this now:

capabilities:
xbzrle: off rdma-pin-all: off auto-converge: off zero-blocks: off
compress: on events: off postcopy-ram: off x-colo: off
release-ram: off block: off return-path: off pause-before-switchover: off
multifd: off dirty-bitmaps: off postcopy-blocktime: off late-block-activate: off
x-ignore-shared: off

---
 monitor/hmp-cmds.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
monitor/hmp-cmds.c +1 -0
index 5ca3ebe942..29ce5b73e4 100644
@@ -229,9 +229,13 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
 
     /* do not display parameters during setup */
     if (info->has_status && caps) {
+        int index = 0;
         monitor_printf(mon, "capabilities: ");

monitor/hmp-cmds.c void hmp_info_migrate(Monitor *mon, const QDict *qdict) · line 241

Quoted 10 lines
monitor/hmp-cmds.c +5 -2
-        for (cap = caps; cap; cap = cap->next) {
-            monitor_printf(mon, "%s: %s ",
+        for (cap = caps; cap; cap = cap->next, index++) {
+            if (!(index % 4)) {
+                monitor_printf(mon, "\n");
+            }
+            monitor_printf(mon, "%20s: %3s ",
                            MigrationCapability_str(cap->value->capability),
                            cap->value->state ? "on" : "off");
         }

This assumes migration capability names are at most 20 characters long. late-block-activate is pushing it already: 19 characters.

It adds up to 104 characters per line, which is rather wide.

What about putting each capability on its own line, just like globals, and just like "info migrate_capabilities"?

(qemu) info migrate
globals:
store-global-state: on
only-migratable: off
send-configuration: on
send-section-footer: on
decompress-error-check: on
clear-bitmap-shift: 18
capabilities:
xbzrle: off
rdma-pin-all: off
auto-converge: off
[...]

author
#2 lore raw
Quoted 3 lines · Markus Armbruster

Subject doesn't quite conform to conventions. Suggest

hmp: Improve how "info migrate" formats capabilities

Thanks

Quoted 49 lines
Quoted 27 lines · Wei Yang

Current we put all migration capability in one line, which make it hard to read them and someone them are missed due to terminal width.

This patch formats it to print 4 in one line, which looks like this now:

capabilities:
xbzrle: off rdma-pin-all: off auto-converge: off zero-blocks: off
compress: on events: off postcopy-ram: off x-colo: off
release-ram: off block: off return-path: off pause-before-switchover: off
multifd: off dirty-bitmaps: off postcopy-blocktime: off late-block-activate: off
x-ignore-shared: off

---
 monitor/hmp-cmds.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
monitor/hmp-cmds.c +1 -0
index 5ca3ebe942..29ce5b73e4 100644
@@ -229,9 +229,13 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
 
     /* do not display parameters during setup */
     if (info->has_status && caps) {
+        int index = 0;
         monitor_printf(mon, "capabilities: ");

monitor/hmp-cmds.c void hmp_info_migrate(Monitor *mon, const QDict *qdict) · line 241

Quoted 10 lines
monitor/hmp-cmds.c +5 -2
-        for (cap = caps; cap; cap = cap->next) {
-            monitor_printf(mon, "%s: %s ",
+        for (cap = caps; cap; cap = cap->next, index++) {
+            if (!(index % 4)) {
+                monitor_printf(mon, "\n");
+            }
+            monitor_printf(mon, "%20s: %3s ",
                            MigrationCapability_str(cap->value->capability),
                            cap->value->state ? "on" : "off");
         }

This assumes migration capability names are at most 20 characters long. late-block-activate is pushing it already: 19 characters.

It adds up to 104 characters per line, which is rather wide.

What about putting each capability on its own line, just like globals, and just like "info migrate_capabilities"?

Quoted 13 lines

(qemu) info migrate
globals:
store-global-state: on
only-migratable: off
send-configuration: on
send-section-footer: on
decompress-error-check: on
clear-bitmap-shift: 18
capabilities:
xbzrle: off
rdma-pin-all: off
auto-converge: off
[...]

This looks good, while would reader may feel difficult to clarify from which one the capabilities stops.

How about add 4 space at the beginning of each capability?

Would the output be too long? How about wrap two capability into one line?

Signature · 2 lines
Wei Yang
Help you, Help me
#3 lore raw
Quoted 70 lines · * Wei Yang ([email protected]) wrote:
Quoted 3 lines · Markus Armbruster

Subject doesn't quite conform to conventions. Suggest

hmp: Improve how "info migrate" formats capabilities

Thanks

Quoted 49 lines
Quoted 27 lines · Wei Yang

Current we put all migration capability in one line, which make it hard to read them and someone them are missed due to terminal width.

This patch formats it to print 4 in one line, which looks like this now:

capabilities:
xbzrle: off rdma-pin-all: off auto-converge: off zero-blocks: off
compress: on events: off postcopy-ram: off x-colo: off
release-ram: off block: off return-path: off pause-before-switchover: off
multifd: off dirty-bitmaps: off postcopy-blocktime: off late-block-activate: off
x-ignore-shared: off

---
 monitor/hmp-cmds.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
monitor/hmp-cmds.c +1 -0
index 5ca3ebe942..29ce5b73e4 100644
@@ -229,9 +229,13 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
 
     /* do not display parameters during setup */
     if (info->has_status && caps) {
+        int index = 0;
         monitor_printf(mon, "capabilities: ");

monitor/hmp-cmds.c void hmp_info_migrate(Monitor *mon, const QDict *qdict) · line 241

Quoted 10 lines
monitor/hmp-cmds.c +5 -2
-        for (cap = caps; cap; cap = cap->next) {
-            monitor_printf(mon, "%s: %s ",
+        for (cap = caps; cap; cap = cap->next, index++) {
+            if (!(index % 4)) {
+                monitor_printf(mon, "\n");
+            }
+            monitor_printf(mon, "%20s: %3s ",
                            MigrationCapability_str(cap->value->capability),
                            cap->value->state ? "on" : "off");
         }

This assumes migration capability names are at most 20 characters long. late-block-activate is pushing it already: 19 characters.

It adds up to 104 characters per line, which is rather wide.

What about putting each capability on its own line, just like globals, and just like "info migrate_capabilities"?

Quoted 13 lines

(qemu) info migrate
globals:
store-global-state: on
only-migratable: off
send-configuration: on
send-section-footer: on
decompress-error-check: on
clear-bitmap-shift: 18
capabilities:
xbzrle: off
rdma-pin-all: off
auto-converge: off
[...]

Quoted 6 lines

This looks good, while would reader may feel difficult to clarify from which one the capabilities stops.

How about add 4 space at the beginning of each capability?

Would the output be too long? How about wrap two capability into one line?

IMHO the simpler way is just not to display the capabilities on 'info migrate' at all. If people want the list of capabilities there's already 'info migrate_capabiltiies' they can use.

It was nice displaying them at the start of 'info migrate' when we only had a few, but nowe we've got so many it's perhaps easier just to omit them.

Dave

Quoted 3 lines
Signature · 2 lines
Wei Yang
Help you, Help me

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

author
#4 lore raw
Quoted 78 lines · Dr. David Alan Gilbert
Quoted 70 lines · * Wei Yang ([email protected]) wrote:
Quoted 3 lines · Markus Armbruster

Subject doesn't quite conform to conventions. Suggest

hmp: Improve how "info migrate" formats capabilities

Thanks

Quoted 49 lines
Quoted 27 lines · Wei Yang

Current we put all migration capability in one line, which make it hard to read them and someone them are missed due to terminal width.

This patch formats it to print 4 in one line, which looks like this now:

capabilities:
xbzrle: off rdma-pin-all: off auto-converge: off zero-blocks: off
compress: on events: off postcopy-ram: off x-colo: off
release-ram: off block: off return-path: off pause-before-switchover: off
multifd: off dirty-bitmaps: off postcopy-blocktime: off late-block-activate: off
x-ignore-shared: off

---
 monitor/hmp-cmds.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
monitor/hmp-cmds.c +1 -0
index 5ca3ebe942..29ce5b73e4 100644
@@ -229,9 +229,13 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
 
     /* do not display parameters during setup */
     if (info->has_status && caps) {
+        int index = 0;
         monitor_printf(mon, "capabilities: ");

monitor/hmp-cmds.c void hmp_info_migrate(Monitor *mon, const QDict *qdict) · line 241

Quoted 10 lines
monitor/hmp-cmds.c +5 -2
-        for (cap = caps; cap; cap = cap->next) {
-            monitor_printf(mon, "%s: %s ",
+        for (cap = caps; cap; cap = cap->next, index++) {
+            if (!(index % 4)) {
+                monitor_printf(mon, "\n");
+            }
+            monitor_printf(mon, "%20s: %3s ",
                            MigrationCapability_str(cap->value->capability),
                            cap->value->state ? "on" : "off");
         }

This assumes migration capability names are at most 20 characters long. late-block-activate is pushing it already: 19 characters.

It adds up to 104 characters per line, which is rather wide.

What about putting each capability on its own line, just like globals, and just like "info migrate_capabilities"?

Quoted 13 lines

(qemu) info migrate
globals:
store-global-state: on
only-migratable: off
send-configuration: on
send-section-footer: on
decompress-error-check: on
clear-bitmap-shift: 18
capabilities:
xbzrle: off
rdma-pin-all: off
auto-converge: off
[...]

Quoted 6 lines

This looks good, while would reader may feel difficult to clarify from which one the capabilities stops.

How about add 4 space at the beginning of each capability?

Would the output be too long? How about wrap two capability into one line?

Quoted 8 lines

IMHO the simpler way is just not to display the capabilities on 'info migrate' at all. If people want the list of capabilities there's already 'info migrate_capabiltiies' they can use.

It was nice displaying them at the start of 'info migrate' when we only had a few, but nowe we've got so many it's perhaps easier just to omit them.

Got it.

Quoted 7 lines

Dave

Quoted 3 lines
Signature · 2 lines
Wei Yang
Help you, Help me

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

Signature · 2 lines
Wei Yang
Help you, Help me
#5 lore raw
In reply to Wei Yang
Quoted 70 lines · Wei Yang
Quoted 3 lines · Markus Armbruster

Subject doesn't quite conform to conventions. Suggest

hmp: Improve how "info migrate" formats capabilities

Thanks

Quoted 49 lines
Quoted 27 lines · Wei Yang

Current we put all migration capability in one line, which make it hard to read them and someone them are missed due to terminal width.

This patch formats it to print 4 in one line, which looks like this now:

capabilities:
xbzrle: off rdma-pin-all: off auto-converge: off zero-blocks: off
compress: on events: off postcopy-ram: off x-colo: off
release-ram: off block: off return-path: off pause-before-switchover: off
multifd: off dirty-bitmaps: off postcopy-blocktime: off late-block-activate: off
x-ignore-shared: off

---
 monitor/hmp-cmds.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
monitor/hmp-cmds.c +1 -0
index 5ca3ebe942..29ce5b73e4 100644
@@ -229,9 +229,13 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
 
     /* do not display parameters during setup */
     if (info->has_status && caps) {
+        int index = 0;
         monitor_printf(mon, "capabilities: ");

monitor/hmp-cmds.c void hmp_info_migrate(Monitor *mon, const QDict *qdict) · line 241

Quoted 10 lines
monitor/hmp-cmds.c +5 -2
-        for (cap = caps; cap; cap = cap->next) {
-            monitor_printf(mon, "%s: %s ",
+        for (cap = caps; cap; cap = cap->next, index++) {
+            if (!(index % 4)) {
+                monitor_printf(mon, "\n");
+            }
+            monitor_printf(mon, "%20s: %3s ",
                            MigrationCapability_str(cap->value->capability),
                            cap->value->state ? "on" : "off");
         }

This assumes migration capability names are at most 20 characters long. late-block-activate is pushing it already: 19 characters.

It adds up to 104 characters per line, which is rather wide.

What about putting each capability on its own line, just like globals, and just like "info migrate_capabilities"?

Quoted 13 lines

(qemu) info migrate
globals:
store-global-state: on
only-migratable: off
send-configuration: on
send-section-footer: on
decompress-error-check: on
clear-bitmap-shift: 18
capabilities:
xbzrle: off
rdma-pin-all: off
auto-converge: off
[...]

Quoted 6 lines

This looks good, while would reader may feel difficult to clarify from which one the capabilities stops.

How about add 4 space at the beginning of each capability?

Would the output be too long? How about wrap two capability into one line?

Perhaps David has a preference.