[Qemu-devel] [PULL 0/1] Dump patches

[Qemu-devel] [PULL 0/1] Dump patches

[Marc-André Lureau]

The following changes since commit 8e5dc9ba49743b46d955ec7dacb04e42ae7ada7c:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180116' into staging (2018-01-16 17:36:39 +0000)

are available in the Git repository at:

  https://github.com/elmarco/qemu.git tags/dump-pull-request

for you to fetch changes up to 48fb74965a8d8f2916da30d9c5b9945df25142af:

  dump-guest-memory.py: fix python 2 support (2018-01-17 15:47:14 +0100)

----------------------------------------------------------------

----------------------------------------------------------------

Marc-André Lureau (1):
  dump-guest-memory.py: fix python 2 support

 scripts/dump-guest-memory.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.16.0.rc1.1.gef27df75a1

[Qemu-devel] [PULL 1/1] dump-guest-memory.py: fix python 2 support

[Marc-André Lureau]

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é Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
 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."""
 
         vmcoreinfo = self.phys_memory_read(addr, size)
         if vmcoreinfo:
-            self.elf.add_vmcoreinfo_note(vmcoreinfo.tobytes())
+            # Python 2.7 returns a buffer
+            vmciview = memoryview(vmcoreinfo)
+            self.elf.add_vmcoreinfo_note(vmciview.tobytes())
 
     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

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 782 bytes --]

On 01/17/2018 08:47 AM, Marc-André Lureau wrote:
> The following changes since commit 8e5dc9ba49743b46d955ec7dacb04e42ae7ada7c:
> 
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180116' into staging (2018-01-16 17:36:39 +0000)
> 
> are available in the Git repository at:
> 
>   https://github.com/elmarco/qemu.git tags/dump-pull-request
> 
> for you to fetch changes up to 48fb74965a8d8f2916da30d9c5b9945df25142af:
> 
>   dump-guest-memory.py: fix python 2 support (2018-01-17 15:47:14 +0100)
> 

The commit says it works with python 2.7, but we still require support
for python 2.6.  Is this pull request premature?

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Peter Maydell]

On 17 January 2018 at 15:02, Eric Blake <eblake@redhat.com> wrote:
> On 01/17/2018 08:47 AM, Marc-André Lureau wrote:
>> The following changes since commit 8e5dc9ba49743b46d955ec7dacb04e42ae7ada7c:
>>
>>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180116' into staging (2018-01-16 17:36:39 +0000)
>>
>> are available in the Git repository at:
>>
>>   https://github.com/elmarco/qemu.git tags/dump-pull-request
>>
>> for you to fetch changes up to 48fb74965a8d8f2916da30d9c5b9945df25142af:
>>
>>   dump-guest-memory.py: fix python 2 support (2018-01-17 15:47:14 +0100)
>>
>
> The commit says it works with python 2.7, but we still require support
> for python 2.6.  Is this pull request premature?

So should I apply this, or not?

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Marc-Andre Lureau]

Hi

On Fri, Jan 19, 2018 at 3:29 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 17 January 2018 at 15:02, Eric Blake <eblake@redhat.com> wrote:
>> On 01/17/2018 08:47 AM, Marc-André Lureau wrote:
>>> The following changes since commit 8e5dc9ba49743b46d955ec7dacb04e42ae7ada7c:
>>>
>>>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180116' into staging (2018-01-16 17:36:39 +0000)
>>>
>>> are available in the Git repository at:
>>>
>>>   https://github.com/elmarco/qemu.git tags/dump-pull-request
>>>
>>> for you to fetch changes up to 48fb74965a8d8f2916da30d9c5b9945df25142af:
>>>
>>>   dump-guest-memory.py: fix python 2 support (2018-01-17 15:47:14 +0100)
>>>
>>
>> The commit says it works with python 2.7, but we still require support
>> for python 2.6.  Is this pull request premature?
>
> So should I apply this, or not?

I have not found how to translate a python 'buffer' to a bytes string
in 2.6. For now, I think we should go with this patch, it's already an
improvement..

Thanks

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1312 bytes --]

On 01/19/2018 08:35 AM, Marc-Andre Lureau wrote:

>>>>   dump-guest-memory.py: fix python 2 support (2018-01-17 15:47:14 +0100)
>>>>
>>>
>>> The commit says it works with python 2.7, but we still require support
>>> for python 2.6.  Is this pull request premature?
>>
>> So should I apply this, or not?
> 
> I have not found how to translate a python 'buffer' to a bytes string
> in 2.6. For now, I think we should go with this patch, it's already an
> improvement..

Argument in favor of applying: dump-guest-memory.py is not run as part
of the build process, nor during 'make check'; rather, it is an add-on
script for developer convenience after installation.  If we apply the
patch, we break developers on machines using python 2.6, but fix things
for developers on machines with python 3 - and as time (and Fedora
rawhide) march on, the balance swings in favor of the latter.

I personally am not enough of a python expert to propose a fix that
works across all versions supported by configure, but it was Marc-Andre
reminding me on IRC that this is not a build script, so it can have
different standards than our build when it comes to portability.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Peter Maydell]

On 19 January 2018 at 14:35, Marc-Andre Lureau <mlureau@redhat.com> wrote:
> I have not found how to translate a python 'buffer' to a bytes string
> in 2.6.

A local python expert suggests that "bytes(buffer)" should work.

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Peter Maydell]

On 19 January 2018 at 15:24, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 19 January 2018 at 14:35, Marc-Andre Lureau <mlureau@redhat.com> wrote:
>> I have not found how to translate a python 'buffer' to a bytes string
>> in 2.6.
>
> A local python expert suggests that "bytes(buffer)" should work.

...and that it ought to work if handed a memoryview too, so do we
just want

   self.elf.add_vmcoreinfo_note(bytes(vmcoreinfo))

?

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Marc-Andre Lureau]

Hi

On Fri, Jan 19, 2018 at 4:29 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 19 January 2018 at 15:24, Peter Maydell <peter.maydell@linaro.org> wrote:
>> On 19 January 2018 at 14:35, Marc-Andre Lureau <mlureau@redhat.com> wrote:
>>> I have not found how to translate a python 'buffer' to a bytes string
>>> in 2.6.
>>
>> A local python expert suggests that "bytes(buffer)" should work.
>
> ...and that it ought to work if handed a memoryview too, so do we
> just want
>
>    self.elf.add_vmcoreinfo_note(bytes(vmcoreinfo))
>

Yes, I tested on 2.6 and 3.6, it works. I'll send a new patch.

Thanks!

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Peter Maydell]

On 19 January 2018 at 16:08, Marc-Andre Lureau <mlureau@redhat.com> wrote:
> Hi
>
> On Fri, Jan 19, 2018 at 4:29 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
>> On 19 January 2018 at 15:24, Peter Maydell <peter.maydell@linaro.org> wrote:
>>> On 19 January 2018 at 14:35, Marc-Andre Lureau <mlureau@redhat.com> wrote:
>>>> I have not found how to translate a python 'buffer' to a bytes string
>>>> in 2.6.
>>>
>>> A local python expert suggests that "bytes(buffer)" should work.
>>
>> ...and that it ought to work if handed a memoryview too, so do we
>> just want
>>
>>    self.elf.add_vmcoreinfo_note(bytes(vmcoreinfo))
>>
>
> Yes, I tested on 2.6 and 3.6, it works. I'll send a new patch.

Testing 2.7 as well would probably not be a bad plan. Apparently
this works because:
 * on python 3, bytes(memoryview) and memoryview.to_bytes() are the same
 * gdb gives us a memoryview only if python 3
 * so we don't have to handle the case of getting a memoryview and
   being python 2 (in which case we would need to use memoryview.to_bytes()
   as bytes() would do the wrong thing)

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Marc-Andre Lureau]

On Fri, Jan 19, 2018 at 5:21 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 19 January 2018 at 16:08, Marc-Andre Lureau <mlureau@redhat.com> wrote:
>> Hi
>>
>> On Fri, Jan 19, 2018 at 4:29 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
>>> On 19 January 2018 at 15:24, Peter Maydell <peter.maydell@linaro.org> wrote:
>>>> On 19 January 2018 at 14:35, Marc-Andre Lureau <mlureau@redhat.com> wrote:
>>>>> I have not found how to translate a python 'buffer' to a bytes string
>>>>> in 2.6.
>>>>
>>>> A local python expert suggests that "bytes(buffer)" should work.
>>>
>>> ...and that it ought to work if handed a memoryview too, so do we
>>> just want
>>>
>>>    self.elf.add_vmcoreinfo_note(bytes(vmcoreinfo))
>>>
>>
>> Yes, I tested on 2.6 and 3.6, it works. I'll send a new patch.
>
> Testing 2.7 as well would probably not be a bad plan. Apparently
> this works because:
>  * on python 3, bytes(memoryview) and memoryview.to_bytes() are the same
>  * gdb gives us a memoryview only if python 3
>  * so we don't have to handle the case of getting a memoryview and
>    being python 2 (in which case we would need to use memoryview.to_bytes()
>    as bytes() would do the wrong thing)

I just tested with 2.7 as well, works fine too.

Updated patch sent.

[Qemu-devel] [PULL 0/1] Dump patches

[Marc-André Lureau]

The following changes since commit b384cd95eb9c6f73ad84ed1bb0717a26e29cc78f:

  Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2018-01-19 16:35:25 +0000)

are available in the Git repository at:

  https://github.com/elmarco/qemu.git tags/dump-pull-request

for you to fetch changes up to 6f49ec4034e55dfb675a56a62c9579384f7fb8cc:

  dump-guest-memory.py: fix python 2 support (2018-01-20 20:59:00 +0100)

----------------------------------------------------------------

----------------------------------------------------------------

Marc-André Lureau (1):
  dump-guest-memory.py: fix python 2 support

 scripts/dump-guest-memory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.16.0.rc1.1.gef27df75a1

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Peter Maydell]

On 20 January 2018 at 20:03, Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
> The following changes since commit b384cd95eb9c6f73ad84ed1bb0717a26e29cc78f:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2018-01-19 16:35:25 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/elmarco/qemu.git tags/dump-pull-request
>
> for you to fetch changes up to 6f49ec4034e55dfb675a56a62c9579384f7fb8cc:
>
>   dump-guest-memory.py: fix python 2 support (2018-01-20 20:59:00 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Marc-André Lureau (1):
>   dump-guest-memory.py: fix python 2 support
>
>  scripts/dump-guest-memory.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/1] Dump patches

[Marc-André Lureau]

The following changes since commit b05631954d6dfe93340d516660397e2c1a2a5dd6:

  Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180131' into staging (2018-01-31 15:50:29 +0000)

are available in the Git repository at:

  https://github.com/elmarco/qemu.git tags/dump-pull-request

for you to fetch changes up to ce6b9e421a9ab45d7e6c97af092a07c049954444:

  dump-guest-memory.py: skip vmcoreinfo section if not available (2018-02-01 12:13:52 +0100)

----------------------------------------------------------------

----------------------------------------------------------------

Marc-André Lureau (1):
  dump-guest-memory.py: skip vmcoreinfo section if not available

 scripts/dump-guest-memory.py | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.16.0.rc1.1.gef27df75a1

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Peter Maydell]

On 1 February 2018 at 11:16, Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
> The following changes since commit b05631954d6dfe93340d516660397e2c1a2a5dd6:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180131' into staging (2018-01-31 15:50:29 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/elmarco/qemu.git tags/dump-pull-request
>
> for you to fetch changes up to ce6b9e421a9ab45d7e6c97af092a07c049954444:
>
>   dump-guest-memory.py: skip vmcoreinfo section if not available (2018-02-01 12:13:52 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Marc-André Lureau (1):
>   dump-guest-memory.py: skip vmcoreinfo section if not available
>
>  scripts/dump-guest-memory.py | 2 ++
>  1 file changed, 2 insertions(+)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/1] Dump patches

[Marc-André Lureau]

The following changes since commit 47994e16b1d66411953623e7c0bf0cdcd50bd507:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190205' into staging (2019-02-05 18:25:07 +0000)

are available in the Git repository at:

  https://github.com/elmarco/qemu.git tags/dump-pull-request

for you to fetch changes up to e17bebd049d78f489c2cff755e2b66a0536a156e:

  dump: Set correct vaddr for ELF dump (2019-02-06 15:51:12 +0100)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Jon Doron (1):
  dump: Set correct vaddr for ELF dump

 scripts/dump-guest-memory.py | 1 +
 dump.c                       | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

-- 
2.20.1.98.gecbdaf0899

Re: [Qemu-devel] [PULL 0/1] Dump patches

[Peter Maydell]

On Wed, 6 Feb 2019 at 14:58, Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
>
> The following changes since commit 47994e16b1d66411953623e7c0bf0cdcd50bd507:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190205' into staging (2019-02-05 18:25:07 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/elmarco/qemu.git tags/dump-pull-request
>
> for you to fetch changes up to e17bebd049d78f489c2cff755e2b66a0536a156e:
>
>   dump: Set correct vaddr for ELF dump (2019-02-06 15:51:12 +0100)
>
> ----------------------------------------------------------------
> Pull request
>

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.

-- PMM

Re: [Qemu-devel] [PULL 0/1] Dump patches

[no-reply]

Patchew URL: https://patchew.org/QEMU/20190206145831.656-1-marcandre.lureau@redhat.com/



Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14
=== TEST SCRIPT END ===




The full log is available at
http://patchew.org/logs/20190206145831.656-1-marcandre.lureau@redhat.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com