[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/21] scripts: ensure signrom treats data as bytes
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 09/21] scripts: ensure signrom treats data as bytes |
Date: |
Mon, 5 Feb 2018 21:08:48 -0200 |
From: "Daniel P. Berrange" <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
scripts/signrom.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/signrom.py b/scripts/signrom.py
index d1dabe0240..0497a1c32e 100644
--- a/scripts/signrom.py
+++ b/scripts/signrom.py
@@ -18,7 +18,7 @@ fin = open(sys.argv[1], 'rb')
fout = open(sys.argv[2], 'wb')
magic = fin.read(2)
-if magic != '\x55\xaa':
+if magic != b'\x55\xaa':
sys.exit("%s: option ROM does not begin with magic 55 aa" % sys.argv[1])
size_byte = ord(fin.read(1))
@@ -33,7 +33,7 @@ elif len(data) < size:
# Add padding if necessary, rounding the whole input to a multiple of
# 512 bytes according to the third byte of the input.
# size-1 because a final byte is added below to store the checksum.
- data = data.ljust(size-1, '\0')
+ data = data.ljust(size-1, b'\0')
else:
if ord(data[-1:]) != 0:
sys.stderr.write('WARNING: ROM includes nonzero checksum\n')
--
2.14.3
- [Qemu-devel] [PULL 00/21] Python queue, 2018-02-05, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 01/21] qapi: convert to use python print function instead of statement, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 03/21] qapi: Use OrderedDict from standard library if available, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 02/21] qapi: use items()/values() intead of iteritems()/itervalues(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 04/21] qapi: adapt to moved location of StringIO module in py3, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 06/21] qapi: remove '-q' arg to diff when comparing QAPI output, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 07/21] qapi: ensure stable sort ordering when checking QAPI entities, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 05/21] qapi: Adapt to moved location of 'maketrans' function in py3, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 08/21] qapi: force a UTF-8 locale for running Python, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 09/21] scripts: ensure signrom treats data as bytes,
Eduardo Habkost <=
- [Qemu-devel] [PULL 10/21] configure: allow use of python 3, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 11/21] qemu.py: remove unused import, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 12/21] qemu.py: better control of created files, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 14/21] qemu.py: always cleanup on shutdown(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 13/21] qemu.py: refactor launch(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 15/21] qemu.py: use poll() instead of 'returncode', Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 16/21] qemu.py: cleanup redundant calls in launch(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 17/21] qemu.py: don't launch again before shutdown(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 18/21] input: add missing JIS keys to virtio input, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 19/21] ui: update keycodemapdb to get py3 fixes, Eduardo Habkost, 2018/02/05