* [PATCH] qapi/migration: Rewrap to 70 columns
@ 2025-11-05 13:45 Richard Henderson
2025-11-05 14:20 ` Markus Armbruster
0 siblings, 1 reply; 3+ messages in thread
From: Richard Henderson @ 2025-11-05 13:45 UTC (permalink / raw)
To: qemu-devel; +Cc: peterx, armbru
Avoid
In file included from ../publish/qapi/qapi-schema.json:53:
.../qapi/migration.json:1750:1: documentation line longer than 70 characters
Fixes: ae00f0088ff ("migration/qmp: Update "resume" flag doc in "migrate" command")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
Applied directly to master as a build fix.
---
qapi/migration.json | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/qapi/migration.json b/qapi/migration.json
index 6acd9e4b16..cf023bd29d 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1747,10 +1747,11 @@
# @detach: this argument exists only for compatibility reasons and is
# ignored by QEMU
#
-# @resume: when set, use the new uri/channels specified to resume paused
-# postcopy migration. This flag should only be used if the previous
-# postcopy migration was interrupted. The command will fail unless
-# migration is in "postcopy-paused" state. (default: false, since 3.0)
+# @resume: when set, use the new uri/channels specified to resume
+# paused postcopy migration. This flag should only be used if
+# the previous postcopy migration was interrupted. The command
+# will fail unless migration is in "postcopy-paused" state.
+# (default: false, since 3.0)
#
# Features:
#
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] qapi/migration: Rewrap to 70 columns
2025-11-05 13:45 [PATCH] qapi/migration: Rewrap to 70 columns Richard Henderson
@ 2025-11-05 14:20 ` Markus Armbruster
2025-11-05 16:33 ` Peter Xu
0 siblings, 1 reply; 3+ messages in thread
From: Markus Armbruster @ 2025-11-05 14:20 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, peterx
Richard Henderson <richard.henderson@linaro.org> writes:
> Avoid
>
> In file included from ../publish/qapi/qapi-schema.json:53:
> .../qapi/migration.json:1750:1: documentation line longer than 70 characters
>
> Fixes: ae00f0088ff ("migration/qmp: Update "resume" flag doc in "migrate" command")
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
Commit ae00f0088ff was actually fine when it went in. However, it
produced a semantic conflict with my PR (merge commit d752763d0b9).
> Applied directly to master as a build fix.
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] qapi/migration: Rewrap to 70 columns
2025-11-05 14:20 ` Markus Armbruster
@ 2025-11-05 16:33 ` Peter Xu
0 siblings, 0 replies; 3+ messages in thread
From: Peter Xu @ 2025-11-05 16:33 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Richard Henderson, qemu-devel
On Wed, Nov 05, 2025 at 03:20:59PM +0100, Markus Armbruster wrote:
> Richard Henderson <richard.henderson@linaro.org> writes:
>
> > Avoid
> >
> > In file included from ../publish/qapi/qapi-schema.json:53:
> > .../qapi/migration.json:1750:1: documentation line longer than 70 characters
> >
> > Fixes: ae00f0088ff ("migration/qmp: Update "resume" flag doc in "migrate" command")
> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> > ---
>
> Commit ae00f0088ff was actually fine when it went in. However, it
> produced a semantic conflict with my PR (merge commit d752763d0b9).
>
> > Applied directly to master as a build fix.
>
> Thanks!
Yeah I definitely overlooked what was happening concurrently.. thanks for
fixing it!
--
Peter Xu
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-11-05 16:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-05 13:45 [PATCH] qapi/migration: Rewrap to 70 columns Richard Henderson
2025-11-05 14:20 ` Markus Armbruster
2025-11-05 16:33 ` Peter Xu
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).