dump-guest-memory.py: fix python 2 support
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 <peter.maydell@linaro.org> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Acked-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
		
							parent
							
								
									b384cd95eb
								
							
						
					
					
						commit
						6f49ec4034
					
				| @ -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.""" | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Marc-André Lureau
						Marc-André Lureau