[PULL 0/2] Tracing patches

[PULL 0/2] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 98b2e3c9ab3abfe476a2b02f8f51813edb90e72d:

  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-10-08 16:08:35 +0100)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to a1f4fc951a277c49a25418cafb028ec5529707fa:

  trace: avoid "is" with a literal Python 3.8 warnings (2019-10-14 09:54:46 +0100)

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

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

Stefan Hajnoczi (2):
  trace: add --group=all to tracing.txt
  trace: avoid "is" with a literal Python 3.8 warnings

 docs/devel/tracing.txt        | 3 ++-
 scripts/tracetool/__init__.py | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
2.21.0

[PULL 1/2] trace: add --group=all to tracing.txt

[Stefan Hajnoczi]

tracetool needs to know the group name ("all", "root", or a specific
subdirectory).  Also remove the stdin redirection because tracetool.py
needs the path to the trace-events file.  Update the documentation.

Fixes: 2098c56a9bc5901e145fa5d4759f075808811685
       ("trace: move setting of group name into Makefiles")
Launchpad: https://bugs.launchpad.net/bugs/1844814
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20191009135154.10970-1-stefanha@redhat.com>
---
 docs/devel/tracing.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt
index 8231bbf5d1..8c0376fefa 100644
--- a/docs/devel/tracing.txt
+++ b/docs/devel/tracing.txt
@@ -317,7 +317,8 @@ probes:
                          --binary path/to/qemu-binary \
                          --target-type system \
                          --target-name x86_64 \
-                         <trace-events-all >qemu.stp
+                         --group=all \
+                         trace-events-all >qemu.stp
 
 To facilitate simple usage of systemtap where there merely needs to be printf
 logging of certain probes, a helper script "qemu-trace-stap" is provided.
-- 
2.21.0

[PULL 2/2] trace: avoid "is" with a literal Python 3.8 warnings

[Stefan Hajnoczi]

The following statement produces a SyntaxWarning with Python 3.8:

  if len(format) is 0:
  scripts/tracetool/__init__.py:459: SyntaxWarning: "is" with a literal. Did you mean "=="?

Use the conventional len(x) == 0 syntax instead.

Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191010122154.10553-1-stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/tracetool/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 04279fa62e..44c118bc2a 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -456,12 +456,12 @@ def generate(events, group, format, backends,
     import tracetool
 
     format = str(format)
-    if len(format) is 0:
+    if len(format) == 0:
         raise TracetoolError("format not set")
     if not tracetool.format.exists(format):
         raise TracetoolError("unknown format: %s" % format)
 
-    if len(backends) is 0:
+    if len(backends) == 0:
         raise TracetoolError("no backends specified")
     for backend in backends:
         if not tracetool.backend.exists(backend):
-- 
2.21.0

Re: [PULL 1/2] trace: add --group=all to tracing.txt

[Philippe Mathieu-Daudé]

Hi Stefan,

On 10/14/19 10:57 AM, Stefan Hajnoczi wrote:
> tracetool needs to know the group name ("all", "root", or a specific
> subdirectory).  Also remove the stdin redirection because tracetool.py
> needs the path to the trace-events file.  Update the documentation.
> 
> Fixes: 2098c56a9bc5901e145fa5d4759f075808811685
>         ("trace: move setting of group name into Makefiles")
> Launchpad: https://bugs.launchpad.net/bugs/1844814

Sorry I didn't noticed that earlier, but on 
https://wiki.qemu.org/Contribute/SubmitAPatch#Write_a_meaningful_commit_message 
we recommend using the 'Buglink' tag.
Not sure it's worth resending another pull request...

> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> Message-Id: <20191009135154.10970-1-stefanha@redhat.com>
> ---
>   docs/devel/tracing.txt | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt
> index 8231bbf5d1..8c0376fefa 100644
> --- a/docs/devel/tracing.txt
> +++ b/docs/devel/tracing.txt
> @@ -317,7 +317,8 @@ probes:
>                            --binary path/to/qemu-binary \
>                            --target-type system \
>                            --target-name x86_64 \
> -                         <trace-events-all >qemu.stp
> +                         --group=all \
> +                         trace-events-all >qemu.stp
>   
>   To facilitate simple usage of systemtap where there merely needs to be printf
>   logging of certain probes, a helper script "qemu-trace-stap" is provided.
> 

Re: [PULL 1/2] trace: add --group=all to tracing.txt

[Stefan Hajnoczi]

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

On Mon, Oct 14, 2019 at 11:08:25AM +0200, Philippe Mathieu-Daudé wrote:
> Hi Stefan,
> 
> On 10/14/19 10:57 AM, Stefan Hajnoczi wrote:
> > tracetool needs to know the group name ("all", "root", or a specific
> > subdirectory).  Also remove the stdin redirection because tracetool.py
> > needs the path to the trace-events file.  Update the documentation.
> > 
> > Fixes: 2098c56a9bc5901e145fa5d4759f075808811685
> >         ("trace: move setting of group name into Makefiles")
> > Launchpad: https://bugs.launchpad.net/bugs/1844814
> 
> Sorry I didn't noticed that earlier, but on https://wiki.qemu.org/Contribute/SubmitAPatch#Write_a_meaningful_commit_message
> we recommend using the 'Buglink' tag.
> Not sure it's worth resending another pull request...

Sure, it hasn't been merged yet so I can send a v2.

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL 0/2] Tracing patches

[Peter Maydell]

On Mon, 14 Oct 2019 at 09:57, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 98b2e3c9ab3abfe476a2b02f8f51813edb90e72d:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-10-08 16:08:35 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to a1f4fc951a277c49a25418cafb028ec5529707fa:
>
>   trace: avoid "is" with a literal Python 3.8 warnings (2019-10-14 09:54:46 +0100)
>
> ----------------------------------------------------------------
> Pull request
>
> ----------------------------------------------------------------
>
> Stefan Hajnoczi (2):
>   trace: add --group=all to tracing.txt
>   trace: avoid "is" with a literal Python 3.8 warnings
>


Applied, thanks.

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

-- PMM

Re: [PULL 0/2] Tracing patches

[Philippe Mathieu-Daudé]

On 10/15/19 2:24 PM, Peter Maydell wrote:
> On Mon, 14 Oct 2019 at 09:57, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>>
>> The following changes since commit 98b2e3c9ab3abfe476a2b02f8f51813edb90e72d:
>>
>>    Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-10-08 16:08:35 +0100)
>>
>> are available in the Git repository at:
>>
>>    https://github.com/stefanha/qemu.git tags/tracing-pull-request
>>
>> for you to fetch changes up to a1f4fc951a277c49a25418cafb028ec5529707fa:
>>
>>    trace: avoid "is" with a literal Python 3.8 warnings (2019-10-14 09:54:46 +0100)
>>
>> ----------------------------------------------------------------
>> Pull request
>>
>> ----------------------------------------------------------------
>>
>> Stefan Hajnoczi (2):
>>    trace: add --group=all to tracing.txt
>>    trace: avoid "is" with a literal Python 3.8 warnings
>>
> 
> 
> Applied, thanks.

Buh, v2 missed :(

Re: [PULL 0/2] Tracing patches

[Peter Maydell]

On Tue, 15 Oct 2019 at 16:38, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> On 10/15/19 2:24 PM, Peter Maydell wrote:
> > On Mon, 14 Oct 2019 at 09:57, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >>
> >> The following changes since commit 98b2e3c9ab3abfe476a2b02f8f51813edb90e72d:
> >>
> >>    Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-10-08 16:08:35 +0100)
> >>
> >> are available in the Git repository at:
> >>
> >>    https://github.com/stefanha/qemu.git tags/tracing-pull-request
> >>
> >> for you to fetch changes up to a1f4fc951a277c49a25418cafb028ec5529707fa:
> >>
> >>    trace: avoid "is" with a literal Python 3.8 warnings (2019-10-14 09:54:46 +0100)
> >>
> >> ----------------------------------------------------------------
> >> Pull request
> >>
> >> ----------------------------------------------------------------
> >>
> >> Stefan Hajnoczi (2):
> >>    trace: add --group=all to tracing.txt
> >>    trace: avoid "is" with a literal Python 3.8 warnings
> >>
> >
> >
> > Applied, thanks.
>
> Buh, v2 missed :(

Oops. I don't necessarily notice updated pullreq versions unless
somebody follows up to the v1 coverletter to say the pull is out of date.

thanks
-- PMM