Message ID | 09f7529c665cac0c6a5e032ac6fdb6ca701f7e37.1585329482.git.maozhongyi@cmss.chinamobile.com |
---|---|
State | New |
Headers | show |
Series | [v2] migration: fix bad indentation in error_report() | expand |
* Mao Zhongyi (maozhongyi@cmss.chinamobile.com) wrote: > bad indentation conflicts with CODING_STYLE doc. > > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> Thanks, Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/migration.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index c4c9aee15e..2b7b5bccfa 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -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); > 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); > 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); > mark_source_rp_bad(ms); > goto out; > } > -- > 2.17.1 > > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Mao Zhongyi <maozhongyi@cmss.chinamobile.com> wrote: > bad indentation conflicts with CODING_STYLE doc. > > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> Reviewed-by: Juan Quintela <quintela@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> Queued > --- > migration/migration.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index c4c9aee15e..2b7b5bccfa 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -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); > 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); > 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); > mark_source_rp_bad(ms); > goto out; > } > -- > 2.17.1 > > > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/migration.c b/migration/migration.c index c4c9aee15e..2b7b5bccfa 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -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); 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); 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); mark_source_rp_bad(ms); goto out; }
bad indentation conflicts with CODING_STYLE doc. Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> --- migration/migration.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)