* [PATCH] tools: handle xl migrate --debug in legacy stream
@ 2016-04-07 16:31 Olaf Hering
2016-04-07 19:10 ` Andrew Cooper
2016-04-08 10:53 ` Wei Liu
0 siblings, 2 replies; 6+ messages in thread
From: Olaf Hering @ 2016-04-07 16:31 UTC (permalink / raw)
To: xen-devel, Andrew Cooper; +Cc: Wei Liu, Olaf Hering, Ian Jackson
Doing a 'xl migrate --debug domU host' on xen-4.5 adds a
XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled.
Since using --debug is valid usage, handle it by logging the fact
instead of aborting the migration.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
tools/python/scripts/convert-legacy-stream | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream
index 41fee10..5f80f13 100755
--- a/tools/python/scripts/convert-legacy-stream
+++ b/tools/python/scripts/convert-legacy-stream
@@ -389,8 +389,7 @@ def read_chunks(vm):
write_page_data(pfns, pages)
elif marker == legacy.CHUNK_enable_verify_mode:
- # For debugging purposes only. Will not be seen in real migration
- raise RuntimeError("Unable to convert a debug stream")
+ info("This is a debug stream")
elif marker == legacy.CHUNK_vcpu_info:
max_id, = unpack_exact("i")
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] tools: handle xl migrate --debug in legacy stream
2016-04-07 16:31 [PATCH] tools: handle xl migrate --debug in legacy stream Olaf Hering
@ 2016-04-07 19:10 ` Andrew Cooper
2016-04-08 14:05 ` Ian Jackson
2016-04-08 10:53 ` Wei Liu
1 sibling, 1 reply; 6+ messages in thread
From: Andrew Cooper @ 2016-04-07 19:10 UTC (permalink / raw)
To: Olaf Hering, xen-devel; +Cc: Wei Liu, Ian Jackson
On 07/04/16 17:31, Olaf Hering wrote:
> Doing a 'xl migrate --debug domU host' on xen-4.5 adds a
> XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled.
> Since using --debug is valid usage, handle it by logging the fact
> instead of aborting the migration.
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
Hmm - I had never considered someone doing that. Debug mode for legacy
migration was sufficiently broken (in a falling over wild pointers kind
of way) that I assumed noone ever used it.
But yes - not needlessly killing the migration is an improvement.
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Ian: This is also a backport candidate for 4.6
> ---
> tools/python/scripts/convert-legacy-stream | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream
> index 41fee10..5f80f13 100755
> --- a/tools/python/scripts/convert-legacy-stream
> +++ b/tools/python/scripts/convert-legacy-stream
> @@ -389,8 +389,7 @@ def read_chunks(vm):
> write_page_data(pfns, pages)
>
> elif marker == legacy.CHUNK_enable_verify_mode:
> - # For debugging purposes only. Will not be seen in real migration
> - raise RuntimeError("Unable to convert a debug stream")
> + info("This is a debug stream")
>
> elif marker == legacy.CHUNK_vcpu_info:
> max_id, = unpack_exact("i")
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tools: handle xl migrate --debug in legacy stream
2016-04-07 19:10 ` Andrew Cooper
@ 2016-04-08 14:05 ` Ian Jackson
2016-05-09 17:10 ` Ian Jackson
0 siblings, 1 reply; 6+ messages in thread
From: Ian Jackson @ 2016-04-08 14:05 UTC (permalink / raw)
To: Andrew Cooper; +Cc: Olaf Hering, Wei Liu, xen-devel
Andrew Cooper writes ("Re: [PATCH] tools: handle xl migrate --debug in legacy stream"):
> On 07/04/16 17:31, Olaf Hering wrote:
> > Doing a 'xl migrate --debug domU host' on xen-4.5 adds a
> > XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled.
> > Since using --debug is valid usage, handle it by logging the fact
> > instead of aborting the migration.
> >
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
>
> Hmm - I had never considered someone doing that. Debug mode for legacy
> migration was sufficiently broken (in a falling over wild pointers kind
> of way) that I assumed noone ever used it.
>
> But yes - not needlessly killing the migration is an improvement.
>
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> Ian: This is also a backport candidate for 4.6
Queued for backport.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] tools: handle xl migrate --debug in legacy stream
2016-04-07 16:31 [PATCH] tools: handle xl migrate --debug in legacy stream Olaf Hering
2016-04-07 19:10 ` Andrew Cooper
@ 2016-04-08 10:53 ` Wei Liu
2016-04-08 13:45 ` Ian Jackson
1 sibling, 1 reply; 6+ messages in thread
From: Wei Liu @ 2016-04-08 10:53 UTC (permalink / raw)
To: Olaf Hering; +Cc: Andrew Cooper, Ian Jackson, Wei Liu, xen-devel
On Thu, Apr 07, 2016 at 06:31:01PM +0200, Olaf Hering wrote:
> Doing a 'xl migrate --debug domU host' on xen-4.5 adds a
> XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled.
> Since using --debug is valid usage, handle it by logging the fact
> instead of aborting the migration.
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/python/scripts/convert-legacy-stream | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream
> index 41fee10..5f80f13 100755
> --- a/tools/python/scripts/convert-legacy-stream
> +++ b/tools/python/scripts/convert-legacy-stream
> @@ -389,8 +389,7 @@ def read_chunks(vm):
> write_page_data(pfns, pages)
>
> elif marker == legacy.CHUNK_enable_verify_mode:
> - # For debugging purposes only. Will not be seen in real migration
> - raise RuntimeError("Unable to convert a debug stream")
> + info("This is a debug stream")
>
> elif marker == legacy.CHUNK_vcpu_info:
> max_id, = unpack_exact("i")
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tools: handle xl migrate --debug in legacy stream
2016-04-08 10:53 ` Wei Liu
@ 2016-04-08 13:45 ` Ian Jackson
0 siblings, 0 replies; 6+ messages in thread
From: Ian Jackson @ 2016-04-08 13:45 UTC (permalink / raw)
To: Wei Liu; +Cc: Andrew Cooper, Olaf Hering, xen-devel
Wei Liu writes ("Re: [PATCH] tools: handle xl migrate --debug in legacy stream"):
> On Thu, Apr 07, 2016 at 06:31:01PM +0200, Olaf Hering wrote:
> > Doing a 'xl migrate --debug domU host' on xen-4.5 adds a
> > XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled.
> > Since using --debug is valid usage, handle it by logging the fact
> > instead of aborting the migration.
> >
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
>
> Acked-by: Wei Liu <wei.liu2@citrix.com>
Thanks, and thanks to Andrew for the review. Queued for 4.7.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-05-09 17:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-07 16:31 [PATCH] tools: handle xl migrate --debug in legacy stream Olaf Hering
2016-04-07 19:10 ` Andrew Cooper
2016-04-08 14:05 ` Ian Jackson
2016-05-09 17:10 ` Ian Jackson
2016-04-08 10:53 ` Wei Liu
2016-04-08 13:45 ` Ian Jackson
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).