All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Richard W.M. Jones" <rjones@redhat.com>
To: qemu-devel@nongnu.org
Cc: stefanha@gmail.com, marc.mari.barcelo@gmail.com,
	ehabkost@redhat.com, mst@redhat.com, kraxel@redhat.com,
	rth@twiddle.net, lersek@redhat.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v8 1/3] scripts/signrom.py: Allow option ROM checksum script to write the size header.
Date: Wed, 11 May 2016 22:06:45 +0100	[thread overview]
Message-ID: <1463000807-18015-2-git-send-email-rjones@redhat.com> (raw)
In-Reply-To: <1463000807-18015-1-git-send-email-rjones@redhat.com>

Modify the signrom.py script so that if the size byte in the header is
0 (ie. not set) then the script will set the size.  If the size byte
is non-zero then we do the same as before, so this doesn't require
changes to any existing ROM sourcecode.

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
 scripts/signrom.py | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/scripts/signrom.py b/scripts/signrom.py
index f9c35cc..6c8b9bf 100644
--- a/scripts/signrom.py
+++ b/scripts/signrom.py
@@ -18,10 +18,29 @@ fin = open(sys.argv[1], 'rb')
 fout = open(sys.argv[2], 'wb')
 
 fin.seek(2)
-size = ord(fin.read(1)) * 512 - 1
-
+size_byte = ord(fin.read(1))
 fin.seek(0)
-data = fin.read(size)
+
+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-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)
+
 fout.write(data)
 
 checksum = 0
-- 
2.7.4

  reply	other threads:[~2016-05-11 21:07 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-11 21:06 [Qemu-devel] [PATCH v8 0/3] Add optionrom compatible with fw_cfg DMA version Richard W.M. Jones
2016-05-11 21:06 ` Richard W.M. Jones [this message]
2016-05-11 21:06 ` [Qemu-devel] [PATCH v8 2/3] scripts/signrom.py: Check for magic in option ROMs Richard W.M. Jones
2016-05-11 21:06 ` [Qemu-devel] [PATCH v8 3/3] Add optionrom compatible with fw_cfg DMA version Richard W.M. Jones
2016-05-23 15:05   ` Paolo Bonzini
2016-05-23 15:44     ` Richard W.M. Jones
2016-05-17 14:18 ` [Qemu-devel] [PATCH v8 0/3] " Richard W.M. Jones
2016-05-17 14:35   ` Laszlo Ersek
2016-05-17 16:41     ` Paolo Bonzini

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=1463000807-18015-2-git-send-email-rjones@redhat.com \
    --to=rjones@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=lersek@redhat.com \
    --cc=marc.mari.barcelo@gmail.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=stefanha@gmail.com \
    /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.