[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/13] scripts: ensure signrom treats data as byt
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v3 08/13] scripts: ensure signrom treats data as bytes |
Date: |
Mon, 15 Jan 2018 10:26:16 +0000 |
Signed-off-by: Daniel P. Berrange <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] [PATCH v3 03/13] qapi: Use OrderedDict from standard library if available, (continued)
- [Qemu-devel] [PATCH v3 03/13] qapi: Use OrderedDict from standard library if available, Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 02/13] qapi: use items()/values() intead of iteritems()/itervalues(), Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 04/13] qapi: adapt to moved location of StringIO module in py3, Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 05/13] qapi: Adapt to moved location of 'maketrans' function in py3, Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 06/13] qapi: remove '-q' arg to diff when comparing QAPI output, Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 07/13] qapi: ensure stable sort ordering when checking QAPI entities, Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 08/13] scripts: ensure signrom treats data as bytes,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v3 10/13] input: add missing JIS keys to virtio input, Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 09/13] configure: allow use of python 3, Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 11/13] ui: update keycodemapdb to get py3 fixes, Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 13/13] docker: change Fedora images to run with python3, Daniel P. Berrange, 2018/01/15
- [Qemu-devel] [PATCH v3 12/13] travis: improve python version test coverage, Daniel P. Berrange, 2018/01/15
- Re: [Qemu-devel] [PATCH v3 00/13] Support building with py2 or py3, no-reply, 2018/01/15