tools/python: handle libxl__physmap_info.name properly in convert-legacy-stream
authorOlaf Hering <olaf@aepfle.de>
Thu, 1 Jul 2021 09:56:00 +0000 (11:56 +0200)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 15 Jul 2021 10:59:32 +0000 (11:59 +0100)
commitf6aec84fe7076d03ac8509de97275e9ef3da37cd
tree6c05eddbe0ad4681b4de1550fee91a4e5a6bac75
parent23d5e3d42cbf1673aa8c9c2d9601009e24077afc
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>
(cherry picked from commit c8f88810db2a25d6aacf65c1c60bc4f5d848a483)
tools/python/scripts/convert-legacy-stream