Based-on: <20200130163232.10446-1-philmd@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
scripts/signrom.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/scripts/signrom.py b/scripts/signrom.py
index 313ee28a17..9be5dab1cf 100644
--- a/scripts/signrom.py
+++ b/scripts/signrom.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
from __future__ import print_function
#
# Option ROM signing utility
@@ -44,14 +46,8 @@ fout.write(data)
checksum = 0
for b in data:
- # catch Python 2 vs. 3 differences
- if isinstance(b, int):
- checksum += b
- else:
- checksum += ord(b)
-checksum = (256 - checksum) % 256
-
-# Python 3 no longer allows chr(checksum)
+ checksum = (checksum - b) & 255
+
fout.write(struct.pack('B', checksum))
fin.close()
--
2.21.0
On 2/4/20 5:00 PM, Paolo Bonzini wrote: > Based-on: <20200130163232.10446-1-philmd@redhat.com> > Cc: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > scripts/signrom.py | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/scripts/signrom.py b/scripts/signrom.py > index 313ee28a17..9be5dab1cf 100644 > --- a/scripts/signrom.py > +++ b/scripts/signrom.py > @@ -1,3 +1,5 @@ > +#!/usr/bin/env python3 > + > from __future__ import print_function > # > # Option ROM signing utility > @@ -44,14 +46,8 @@ fout.write(data) > > checksum = 0 > for b in data: > - # catch Python 2 vs. 3 differences > - if isinstance(b, int): > - checksum += b > - else: > - checksum += ord(b) > -checksum = (256 - checksum) % 256 > - > -# Python 3 no longer allows chr(checksum) > + checksum = (checksum - b) & 255 > + > fout.write(struct.pack('B', checksum)) > > fin.close() > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Also, applied to my python-next tree: https://gitlab.com/philmd/qemu/commits/python-next
On 04/02/20 17:02, Philippe Mathieu-Daudé wrote: > On 2/4/20 5:00 PM, Paolo Bonzini wrote: >> Based-on: <20200130163232.10446-1-philmd@redhat.com> >> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> --- >> scripts/signrom.py | 12 ++++-------- >> 1 file changed, 4 insertions(+), 8 deletions(-) >> >> diff --git a/scripts/signrom.py b/scripts/signrom.py >> index 313ee28a17..9be5dab1cf 100644 >> --- a/scripts/signrom.py >> +++ b/scripts/signrom.py >> @@ -1,3 +1,5 @@ >> +#!/usr/bin/env python3 >> + >> from __future__ import print_function >> # >> # Option ROM signing utility >> @@ -44,14 +46,8 @@ fout.write(data) >> checksum = 0 >> for b in data: >> - # catch Python 2 vs. 3 differences >> - if isinstance(b, int): >> - checksum += b >> - else: >> - checksum += ord(b) >> -checksum = (256 - checksum) % 256 >> - >> -# Python 3 no longer allows chr(checksum) >> + checksum = (checksum - b) & 255 >> + >> fout.write(struct.pack('B', checksum)) >> fin.close() >> > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Also, applied to my python-next tree: > https://gitlab.com/philmd/qemu/commits/python-next Oh, good. So I've unqueued your series on which this is based. Paolo
On 2/4/20 5:07 PM, Paolo Bonzini wrote: > On 04/02/20 17:02, Philippe Mathieu-Daudé wrote: >> On 2/4/20 5:00 PM, Paolo Bonzini wrote: >>> Based-on: <20200130163232.10446-1-philmd@redhat.com> >>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> >>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >>> --- >>> scripts/signrom.py | 12 ++++-------- >>> 1 file changed, 4 insertions(+), 8 deletions(-) >>> >>> diff --git a/scripts/signrom.py b/scripts/signrom.py >>> index 313ee28a17..9be5dab1cf 100644 >>> --- a/scripts/signrom.py >>> +++ b/scripts/signrom.py >>> @@ -1,3 +1,5 @@ >>> +#!/usr/bin/env python3 >>> + >>> from __future__ import print_function >>> # >>> # Option ROM signing utility >>> @@ -44,14 +46,8 @@ fout.write(data) >>> checksum = 0 >>> for b in data: >>> - # catch Python 2 vs. 3 differences >>> - if isinstance(b, int): >>> - checksum += b >>> - else: >>> - checksum += ord(b) >>> -checksum = (256 - checksum) % 256 >>> - >>> -# Python 3 no longer allows chr(checksum) >>> + checksum = (checksum - b) & 255 >>> + >>> fout.write(struct.pack('B', checksum)) >>> fin.close() >>> >> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> >> Also, applied to my python-next tree: >> https://gitlab.com/philmd/qemu/commits/python-next > > Oh, good. So I've unqueued your series on which this is based. Aargh I received your "series queued" mail _after_ this patch. As you prefer, but I have various python patches pending already. If I keep "Explicit usage of Python 3" do you mind Acking it? Thanks! Phil.
On 04/02/20 17:11, Philippe Mathieu-Daudé wrote: >>>> >>> >>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >>> >>> Also, applied to my python-next tree: >>> https://gitlab.com/philmd/qemu/commits/python-next >> >> Oh, good. So I've unqueued your series on which this is based. > > Aargh I received your "series queued" mail _after_ this patch. > > As you prefer, but I have various python patches pending already. > If I keep "Explicit usage of Python 3" do you mind Acking it? Sure, the least patches I queue the better. Acked-by: Paolo Bonzini <pbonzini@redhat.com> Paolo
© 2016 - 2024 Red Hat, Inc.