aboutsummaryrefslogtreecommitdiff
path: root/scripts/signrom.py
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-08-05 10:51:37 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-08-09 22:57:36 +0200
commit7f2569246c81d5f88e74c142b8fbdc0ee601bffe (patch)
tree6f76bd0576c31d849f31cb960de0e0c7af7a5573 /scripts/signrom.py
parent2bb15bddf2607110820d5ce5aa43baac27292fb3 (diff)
downloadqemu-7f2569246c81d5f88e74c142b8fbdc0ee601bffe.zip
qemu-7f2569246c81d5f88e74c142b8fbdc0ee601bffe.tar.gz
qemu-7f2569246c81d5f88e74c142b8fbdc0ee601bffe.tar.bz2
linuxboot_dma: avoid guest ABI breakage on gcc vs. clang compilation
Recent GCC compiles linuxboot_dma.c to 921 bytes, while CentOS 6 needs 1029 and clang needs 1527. Because the size of the ROM, rounded to the next 512 bytes, must match, this causes the API to break between a <1K ROM and one that is bigger. We want to make the ROM 1.5 KB in size, but it's better to make clang produce leaner ROMs, because currently it is worryingly close to the limit. To fix this prevent clang's happy inlining (which -Os cannot prevent). This only requires adding a noinline attribute. Second, the patch makes sure that the ROM has enough padding to prevent ABI breakage on different compilers. The size is now hardcoded in the file that is passed to signrom.py, as was the case before commit 6f71b77 ("scripts/signrom.py: Allow option ROM checksum script to write the size header.", 2016-05-23); signrom.py however will still pad the input to the requested size. This ensures that the padding goes beyond the next multiple of 512 if necessary, and also avoids the need for -fno-toplevel-reorder which clang doesn't support. signrom.py can then error out if the requested size is too small for the actual size of the compiled ROM. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts/signrom.py')
-rw-r--r--scripts/signrom.py27
1 files changed, 11 insertions, 16 deletions
diff --git a/scripts/signrom.py b/scripts/signrom.py
index 5629bca..d1dabe0 100644
--- a/scripts/signrom.py
+++ b/scripts/signrom.py
@@ -23,26 +23,21 @@ if magic != '\x55\xaa':
size_byte = ord(fin.read(1))
fin.seek(0)
+data = fin.read()
-if size_byte == 0:
- # If the caller left the size field blank then we will fill it in,
- # also rounding the whole input to a multiple of 512 bytes.
- data = fin.read()
- # +1 because we need a byte to store the checksum.
- size = len(data) + 1
- # Round up to next multiple of 512.
- size += 511
- size -= size % 512
- if size >= 65536:
- sys.exit("%s: option ROM size too large" % sys.argv[1])
+size = size_byte * 512
+if len(data) > size:
+ sys.stderr.write('error: ROM is too large (%d > %d)\n' % (len(data), size))
+ sys.exit(1)
+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[:2] + chr(size/512) + data[3:]
else:
- # Otherwise the input file specifies the size so use it.
- # -1 because we overwrite the last byte of the file with the checksum.
- size = size_byte * 512 - 1
- data = fin.read(size)
+ if ord(data[-1:]) != 0:
+ sys.stderr.write('WARNING: ROM includes nonzero checksum\n')
+ data = data[:size-1]
fout.write(data)