672f70aa3d
Update to 2.11.1, plus a few other fixes. OBS-URL: https://build.opensuse.org/request/show/579209 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=392
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 93a3811284417987034a0c72387db589760fcaaa Mon Sep 17 00:00:00 2001
|
|
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
Date: Tue, 16 Jan 2018 13:42:12 +0000
|
|
Subject: [PATCH] scripts: ensure signrom treats data as bytes
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
Message-Id: <20180116134217.8725-10-berrange@redhat.com>
|
|
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
(cherry picked from commit 31d8f92e646f7d4cfbb4ffab440ab41a3c838fd3)
|
|
[BR: BSC#1077564]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.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')
|