mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools/python: handle libxl__physmap_info.name properly in convert-legacy-stream
The trailing member name[] in libxl__physmap_info is written as a
cstring into the stream. The current code does a sanity check if the
last byte is zero. This attempt fails with python3 because name[-1]
returns a type int. As a result the comparison with byte(\00) fails:
File "/usr/lib/xen/bin/convert-legacy-stream", line 347, in read_libxl_toolstack
raise StreamError("physmap name not NUL terminated")
StreamError: physmap name not NUL terminated
To handle both python variants, cast to bytearray().
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
This commit is contained in:
1 parent
918b8842a8
commit
c8f88810db
1 file changed
+1
-1
@@ -343,7 +343,7 @@ def read_libxl_toolstack(vm, data):
|
||||
if twidth == 64:
|
||||
name = name[:-4]
|
||||
|
||||
if name[-1] != b'\x00':
|
||||
if bytearray(name)[-1] != 0:
|
||||
raise StreamError("physmap name not NUL terminated")
|
||||
|
||||
root = b"physmap/%x" % (phys, )
|
||||
|
||||