[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/1] dump-guest-memory.py: fix python 2 support
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 1/1] dump-guest-memory.py: fix python 2 support |
Date: |
Sat, 20 Jan 2018 21:03:58 +0100 |
Python GDB support may use Python 2 or 3.
Inferior.read_memory() may return a 'buffer' with Python 2 or a
'memoryview' with Python 3 (see also
https://sourceware.org/gdb/onlinedocs/gdb/Inferiors-In-Python.html)
The elf.add_vmcoreinfo_note() method expects a "bytes" object. Wrap
the returned memory with bytes(), which works with both 'memoryview'
and 'buffer'.
Fixes a regression introduced with commit
d23bfa91b7789534d16ede6cb7d925bfac3f3c4c ("add vmcoreinfo").
Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/dump-guest-memory.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py
index 09bec92b50..03fbf69f8a 100644
--- a/scripts/dump-guest-memory.py
+++ b/scripts/dump-guest-memory.py
@@ -564,7 +564,7 @@ shape and this command should mostly work."""
vmcoreinfo = self.phys_memory_read(addr, size)
if vmcoreinfo:
- self.elf.add_vmcoreinfo_note(vmcoreinfo.tobytes())
+ self.elf.add_vmcoreinfo_note(bytes(vmcoreinfo))
def invoke(self, args, from_tty):
"""Handles command invocation from gdb."""
--
2.16.0.rc1.1.gef27df75a1
- Re: [Qemu-devel] [PULL 0/1] Dump patches, (continued)
- Re: [Qemu-devel] [PULL 0/1] Dump patches, Eric Blake, 2018/01/17
- Re: [Qemu-devel] [PULL 0/1] Dump patches, Peter Maydell, 2018/01/19
- Re: [Qemu-devel] [PULL 0/1] Dump patches, Marc-Andre Lureau, 2018/01/19
- Re: [Qemu-devel] [PULL 0/1] Dump patches, Eric Blake, 2018/01/19
- Re: [Qemu-devel] [PULL 0/1] Dump patches, Peter Maydell, 2018/01/19
- Re: [Qemu-devel] [PULL 0/1] Dump patches, Peter Maydell, 2018/01/19
- Re: [Qemu-devel] [PULL 0/1] Dump patches, Marc-Andre Lureau, 2018/01/19
- Re: [Qemu-devel] [PULL 0/1] Dump patches, Peter Maydell, 2018/01/19
- Re: [Qemu-devel] [PULL 0/1] Dump patches, Marc-Andre Lureau, 2018/01/19
[Qemu-devel] [PULL 0/1] Dump patches, Marc-André Lureau, 2018/01/20