tools: handle xl migrate --debug in legacy stream
authorOlaf Hering <olaf@aepfle.de>
Thu, 7 Apr 2016 16:31:01 +0000 (18:31 +0200)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 8 Apr 2016 13:44:28 +0000 (14:44 +0100)
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>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
tools/python/scripts/convert-legacy-stream

index 41fee109182de83e1074eaaa3094110aab95074a..5f80f1365417d22dad55727f4602f86554607d75 100755 (executable)
@@ -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")