From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebm95-0005zz-Pg for qemu-devel@nongnu.org; Wed, 17 Jan 2018 06:44:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebm91-0002qX-Tq for qemu-devel@nongnu.org; Wed, 17 Jan 2018 06:44:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58702) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebm91-0002py-OU for qemu-devel@nongnu.org; Wed, 17 Jan 2018 06:44:39 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E626DC04BD5A for ; Wed, 17 Jan 2018 11:44:38 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 17 Jan 2018 12:44:30 +0100 Message-Id: <20180117114430.19110-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] dump-guest-memory.py: fix python 2 support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lersek@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Eduardo Habkost , Cleber Rosa 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 expect a byte string, but Python 2 buffer doesn't provide the tobyes() method. Wrap the read_memory() result to a memoryview, available in Python 2.7. (if the return object is already a memoryview, this adds a useless identity view on top) Fixes a regression introduced with commit d23bfa91b7789534d16ede6cb7d925bfac3f3c4c ("add vmcoreinfo"). Signed-off-by: Marc-Andr=C3=A9 Lureau --- scripts/dump-guest-memory.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py index 09bec92b50..6f7e1a83b3 100644 --- a/scripts/dump-guest-memory.py +++ b/scripts/dump-guest-memory.py @@ -564,7 +564,9 @@ shape and this command should mostly work.""" =20 vmcoreinfo =3D self.phys_memory_read(addr, size) if vmcoreinfo: - self.elf.add_vmcoreinfo_note(vmcoreinfo.tobytes()) + # Python 2.7 returns a buffer + vmciview =3D memoryview(vmcoreinfo) + self.elf.add_vmcoreinfo_note(vmciview.tobytes()) =20 def invoke(self, args, from_tty): """Handles command invocation from gdb.""" --=20 2.16.0.rc1.1.gef27df75a1