Commit 6df55517 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/elmarco/tags/dump-pull-request' into staging 



# gpg: Signature made Sat 20 Jan 2018 20:03:47 GMT
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/dump-pull-request:
  dump-guest-memory.py: fix python 2 support

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f7c6b96c 6f49ec40

scripts/dump-guest-memory.py

+1 −1
Original line number Diff line number Diff line
@@ -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."""