Message ID | 1490599288-11751-5-git-send-email-peterx@redhat.com |
---|---|
State | New |
Headers | show |
* Peter Xu (peterx@redhat.com) wrote: > Do the same (one per line) to the parameter list. > > CC: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > hmp.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) > > diff --git a/hmp.c b/hmp.c > index 95eef8c..b33e39e 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -282,46 +282,44 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) > params = qmp_query_migrate_parameters(NULL); > > if (params) { > - monitor_printf(mon, "parameters:"); > assert(params->has_compress_level); > - monitor_printf(mon, " %s: %" PRId64, > + monitor_printf(mon, "%s: %" PRId64 "\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_COMPRESS_LEVEL], > params->compress_level); > assert(params->has_compress_threads); > - monitor_printf(mon, " %s: %" PRId64, > + monitor_printf(mon, "%s: %" PRId64 "\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_COMPRESS_THREADS], > params->compress_threads); > assert(params->has_decompress_threads); > - monitor_printf(mon, " %s: %" PRId64, > + monitor_printf(mon, "%s: %" PRId64 "\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_DECOMPRESS_THREADS], > params->decompress_threads); > assert(params->has_cpu_throttle_initial); > - monitor_printf(mon, " %s: %" PRId64, > + monitor_printf(mon, "%s: %" PRId64 "\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL], > params->cpu_throttle_initial); > assert(params->has_cpu_throttle_increment); > - monitor_printf(mon, " %s: %" PRId64, > + monitor_printf(mon, "%s: %" PRId64 "\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT], > params->cpu_throttle_increment); > - monitor_printf(mon, " %s: '%s'", > + monitor_printf(mon, "%s: '%s'\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_TLS_CREDS], > params->has_tls_creds ? params->tls_creds : ""); > - monitor_printf(mon, " %s: '%s'", > + monitor_printf(mon, "%s: '%s'\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_TLS_HOSTNAME], > params->has_tls_hostname ? params->tls_hostname : ""); > assert(params->has_max_bandwidth); > - monitor_printf(mon, " %s: %" PRId64 " bytes/second", > + monitor_printf(mon, "%s: %" PRId64 " bytes/second\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_MAX_BANDWIDTH], > params->max_bandwidth); > assert(params->has_downtime_limit); > - monitor_printf(mon, " %s: %" PRId64 " milliseconds", > + monitor_printf(mon, "%s: %" PRId64 " milliseconds\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_DOWNTIME_LIMIT], > params->downtime_limit); > assert(params->has_x_checkpoint_delay); > - monitor_printf(mon, " %s: %" PRId64, > + monitor_printf(mon, "%s: %" PRId64 "\n", > MigrationParameter_lookup[MIGRATION_PARAMETER_X_CHECKPOINT_DELAY], > params->x_checkpoint_delay); > - monitor_printf(mon, "\n"); > } > > qapi_free_MigrationParameters(params); > -- > 2.7.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/hmp.c b/hmp.c index 95eef8c..b33e39e 100644 --- a/hmp.c +++ b/hmp.c @@ -282,46 +282,44 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) params = qmp_query_migrate_parameters(NULL); if (params) { - monitor_printf(mon, "parameters:"); assert(params->has_compress_level); - monitor_printf(mon, " %s: %" PRId64, + monitor_printf(mon, "%s: %" PRId64 "\n", MigrationParameter_lookup[MIGRATION_PARAMETER_COMPRESS_LEVEL], params->compress_level); assert(params->has_compress_threads); - monitor_printf(mon, " %s: %" PRId64, + monitor_printf(mon, "%s: %" PRId64 "\n", MigrationParameter_lookup[MIGRATION_PARAMETER_COMPRESS_THREADS], params->compress_threads); assert(params->has_decompress_threads); - monitor_printf(mon, " %s: %" PRId64, + monitor_printf(mon, "%s: %" PRId64 "\n", MigrationParameter_lookup[MIGRATION_PARAMETER_DECOMPRESS_THREADS], params->decompress_threads); assert(params->has_cpu_throttle_initial); - monitor_printf(mon, " %s: %" PRId64, + monitor_printf(mon, "%s: %" PRId64 "\n", MigrationParameter_lookup[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL], params->cpu_throttle_initial); assert(params->has_cpu_throttle_increment); - monitor_printf(mon, " %s: %" PRId64, + monitor_printf(mon, "%s: %" PRId64 "\n", MigrationParameter_lookup[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT], params->cpu_throttle_increment); - monitor_printf(mon, " %s: '%s'", + monitor_printf(mon, "%s: '%s'\n", MigrationParameter_lookup[MIGRATION_PARAMETER_TLS_CREDS], params->has_tls_creds ? params->tls_creds : ""); - monitor_printf(mon, " %s: '%s'", + monitor_printf(mon, "%s: '%s'\n", MigrationParameter_lookup[MIGRATION_PARAMETER_TLS_HOSTNAME], params->has_tls_hostname ? params->tls_hostname : ""); assert(params->has_max_bandwidth); - monitor_printf(mon, " %s: %" PRId64 " bytes/second", + monitor_printf(mon, "%s: %" PRId64 " bytes/second\n", MigrationParameter_lookup[MIGRATION_PARAMETER_MAX_BANDWIDTH], params->max_bandwidth); assert(params->has_downtime_limit); - monitor_printf(mon, " %s: %" PRId64 " milliseconds", + monitor_printf(mon, "%s: %" PRId64 " milliseconds\n", MigrationParameter_lookup[MIGRATION_PARAMETER_DOWNTIME_LIMIT], params->downtime_limit); assert(params->has_x_checkpoint_delay); - monitor_printf(mon, " %s: %" PRId64, + monitor_printf(mon, "%s: %" PRId64 "\n", MigrationParameter_lookup[MIGRATION_PARAMETER_X_CHECKPOINT_DELAY], params->x_checkpoint_delay); - monitor_printf(mon, "\n"); } qapi_free_MigrationParameters(params);
Do the same (one per line) to the parameter list. CC: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> --- hmp.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)