From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Fam Zheng" <famz@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Eric Blake" <eblake@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v3 08/13] scripts: ensure signrom treats data as bytes
Date: Mon, 15 Jan 2018 10:26:16 +0000 [thread overview]
Message-ID: <20180115102621.9183-9-berrange@redhat.com> (raw)
In-Reply-To: <20180115102621.9183-1-berrange@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
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
next prev parent reply other threads:[~2018-01-15 10:27 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 10:26 [Qemu-devel] [PATCH v3 00/13] Support building with py2 or py3 Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 01/13] qapi: convert to use python print function instead of statement Daniel P. Berrange
2018-01-15 10:37 ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 02/13] qapi: use items()/values() intead of iteritems()/itervalues() Daniel P. Berrange
2018-01-15 10:38 ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 03/13] qapi: Use OrderedDict from standard library if available Daniel P. Berrange
2018-01-15 10:39 ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 04/13] qapi: adapt to moved location of StringIO module in py3 Daniel P. Berrange
2018-01-15 10:40 ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 05/13] qapi: Adapt to moved location of 'maketrans' function " Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 06/13] qapi: remove '-q' arg to diff when comparing QAPI output Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 07/13] qapi: ensure stable sort ordering when checking QAPI entities Daniel P. Berrange
2018-01-15 10:40 ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` Daniel P. Berrange [this message]
2018-01-15 10:41 ` [Qemu-devel] [PATCH v3 08/13] scripts: ensure signrom treats data as bytes Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 09/13] configure: allow use of python 3 Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 10/13] input: add missing JIS keys to virtio input Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 11/13] ui: update keycodemapdb to get py3 fixes Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 12/13] travis: improve python version test coverage Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 13/13] docker: change Fedora images to run with python3 Daniel P. Berrange
2018-01-15 10:47 ` Philippe Mathieu-Daudé
2018-01-15 10:53 ` Daniel P. Berrange
2018-01-15 13:06 ` Philippe Mathieu-Daudé
2018-01-15 11:07 ` [Qemu-devel] [PATCH v3 00/13] Support building with py2 or py3 no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180115102621.9183-9-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.