* [PATCH v2] migration: fix bad indentation in error_report()
@ 2020-03-27 17:19 Mao Zhongyi
2020-03-27 17:38 ` Dr. David Alan Gilbert
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Mao Zhongyi @ 2020-03-27 17:19 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, Mao Zhongyi, quintela
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(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] migration: fix bad indentation in error_report()
2020-03-27 17:19 [PATCH v2] migration: fix bad indentation in error_report() Mao Zhongyi
@ 2020-03-27 17:38 ` Dr. David Alan Gilbert
2020-03-30 11:46 ` Juan Quintela
2020-05-07 14:28 ` Dr. David Alan Gilbert
2 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2020-03-27 17:38 UTC (permalink / raw)
To: Mao Zhongyi; +Cc: qemu-devel, quintela
* 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] migration: fix bad indentation in error_report()
2020-03-27 17:19 [PATCH v2] migration: fix bad indentation in error_report() Mao Zhongyi
2020-03-27 17:38 ` Dr. David Alan Gilbert
@ 2020-03-30 11:46 ` Juan Quintela
2020-05-07 14:28 ` Dr. David Alan Gilbert
2 siblings, 0 replies; 4+ messages in thread
From: Juan Quintela @ 2020-03-30 11:46 UTC (permalink / raw)
To: Mao Zhongyi; +Cc: qemu-devel, dgilbert
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>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] migration: fix bad indentation in error_report()
2020-03-27 17:19 [PATCH v2] migration: fix bad indentation in error_report() Mao Zhongyi
2020-03-27 17:38 ` Dr. David Alan Gilbert
2020-03-30 11:46 ` Juan Quintela
@ 2020-05-07 14:28 ` Dr. David Alan Gilbert
2 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2020-05-07 14:28 UTC (permalink / raw)
To: Mao Zhongyi; +Cc: qemu-devel, quintela
* 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-07 14:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-27 17:19 [PATCH v2] migration: fix bad indentation in error_report() Mao Zhongyi
2020-03-27 17:38 ` Dr. David Alan Gilbert
2020-03-30 11:46 ` Juan Quintela
2020-05-07 14:28 ` Dr. David Alan Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).