Re: [PATCH] migration: fix bad indentation in error_report()

["Dr. David Alan Gilbert" <dgilbert@redhat.com>]

* Mao Zhongyi (maozhongyi@cmss.chinamobile.com) wrote:
> bad indentation conflicts with CODING_STYLE doc.
> 
> Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
> ---
>  migration/migration.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index c4c9aee15e..aa43137bd2 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1203,15 +1203,15 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
>  
>      if (params->has_max_bandwidth && (params->max_bandwidth > SIZE_MAX)) {
>          error_setg(errp, "Parameter 'max_bandwidth' expects an integer in the"
> -                         " range of 0 to %zu bytes/second", SIZE_MAX);
> +                   " range of 0 to %zu bytes/second", SIZE_MAX);

No, where a parameter crosses multiple lines, it is clearer to line up
the continuation of the parameter with the parameter above.

>          return false;
>      }
>  
>      if (params->has_downtime_limit &&
>          (params->downtime_limit > MAX_MIGRATE_DOWNTIME)) {
>          error_setg(errp, "Parameter 'downtime_limit' expects an integer in "
> -                         "the range of 0 to %d milliseconds",
> -                         MAX_MIGRATE_DOWNTIME);
> +                   "the range of 0 to %d milliseconds",
> +                   MAX_MIGRATE_DOWNTIME);

same as above.

>          return false;
>      }
>  
> @@ -2109,8 +2109,8 @@ void qmp_migrate_set_downtime(double value, Error **errp)
>  {
>      if (value < 0 || value > MAX_MIGRATE_DOWNTIME_SECONDS) {
>          error_setg(errp, "Parameter 'downtime_limit' expects an integer in "
> -                         "the range of 0 to %d seconds",
> -                         MAX_MIGRATE_DOWNTIME_SECONDS);
> +                   "the range of 0 to %d seconds",
> +                   MAX_MIGRATE_DOWNTIME_SECONDS);

same as above.

>          return;
>      }
>  
> @@ -2495,7 +2495,7 @@ retry:
>          if (header_type >= MIG_RP_MSG_MAX ||
>              header_type == MIG_RP_MSG_INVALID) {
>              error_report("RP: Received invalid message 0x%04x length 0x%04x",
> -                    header_type, header_len);
> +                         header_type, header_len);

OK, yes that's better.

>              mark_source_rp_bad(ms);
>              goto out;
>          }
> @@ -2504,9 +2504,9 @@ retry:
>              header_len != rp_cmd_args[header_type].len) ||
>              header_len > sizeof(buf)) {
>              error_report("RP: Received '%s' message (0x%04x) with"
> -                    "incorrect length %d expecting %zu",
> -                    rp_cmd_args[header_type].name, header_type, header_len,
> -                    (size_t)rp_cmd_args[header_type].len);
> +                         "incorrect length %d expecting %zu",
> +                         rp_cmd_args[header_type].name, header_type, header_len,
> +                         (size_t)rp_cmd_args[header_type].len);

OK.

>              mark_source_rp_bad(ms);
>              goto out;
>          }
> @@ -2561,7 +2561,7 @@ retry:
>              }
>              if (header_len != expected_len) {
>                  error_report("RP: Req_Page_id with length %d expecting %zd",
> -                        header_len, expected_len);
> +                             header_len, expected_len);

OK.

Dave

>                  mark_source_rp_bad(ms);
>                  goto out;
>              }
> -- 
> 2.17.1
> 
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK