qapi/migration: Rewrap to 70 columns

[PATCH] qapi/migration: Rewrap to 70 columns

Posted by Richard Henderson 1 week, 1 day ago

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

Re: [PATCH] qapi/migration: Rewrap to 70 columns

Posted by Markus Armbruster 1 week, 1 day ago

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!

Re: [PATCH] qapi/migration: Rewrap to 70 columns

Posted by Peter Xu 1 week, 1 day ago

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