[Xen-changelog] [xen stable-4.6] tools: handle xl migrate --debug in legacy stream

[patchbot@xxxxxxx]

commit 699d286e8cf4627b7fa02539a00e92c84bcf682e
Author:     Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Thu Apr 7 18:31:01 2016 +0200
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon May 9 17:36:48 2016 +0100

    tools: handle xl migrate --debug in legacy stream
    
    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@xxxxxxxxx>
    Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    (cherry picked from commit 281962851f8bd59c6aed2efee222337349857e3a)
---
 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")
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog