tracetool: cleanup "if(true)" check from trace_foo()

[PATCH v2 1/3] tracetool: removed the unused vcpu property

Posted by Tanish Desai 4 months, 4 weeks ago

The vcpu property is no longer used in these backends. Removing it avoids
unnecessary checks and simplifies the code generation for these trace
backends.

Signed-off-by: Tanish Desai <tanishdesai37@gmail.com>
---
 scripts/tracetool/__init__.py       | 6 +++---
 scripts/tracetool/backend/log.py    | 6 +-----
 scripts/tracetool/backend/simple.py | 6 +-----
 scripts/tracetool/backend/syslog.py | 6 +-----
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index bc03238c0f..e86c898a1e 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -216,9 +216,9 @@ class Event(object):
                       r"\s*"
                       r"(?:(?:(?P<fmt_trans>\".+),)?\s*(?P<fmt>\".+))?"
                       r"\s*")
-
-    _VALID_PROPS = set(["disable", "vcpu"])
-
+    
+    _VALID_PROPS = set(["disable"])
+    
     def __init__(self, name, props, fmt, args, lineno, filename, orig=None,
                  event_trans=None, event_exec=None):
         """
diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
index de27b7e62e..f24acad74c 100644
--- a/scripts/tracetool/backend/log.py
+++ b/scripts/tracetool/backend/log.py
@@ -31,11 +31,7 @@ def generate_h(event, group):
     if len(event.args) > 0:
         argnames = ", " + argnames
 
-    if "vcpu" in event.properties:
-        # already checked on the generic format code
-        cond = "true"
-    else:
-        cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
+    cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
 
     out('    if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {',
         '        if (message_with_timestamp) {',
diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py
index 2688d4b64b..7c84c06b20 100644
--- a/scripts/tracetool/backend/simple.py
+++ b/scripts/tracetool/backend/simple.py
@@ -37,11 +37,7 @@ def generate_h_begin(events, group):
 
 def generate_h(event, group):
     event_id = 'TRACE_' + event.name.upper()
-    if "vcpu" in event.properties:
-        # already checked on the generic format code
-        cond = "true"
-    else:
-        cond = "trace_event_get_state(%s)" % event_id
+    cond = "trace_event_get_state(%s)" % event_id
     out('    if (%(cond)s) {',
         '        _simple_%(api)s(%(args)s);',
         '    }',
diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py
index 012970f6cc..6fdc1142fb 100644
--- a/scripts/tracetool/backend/syslog.py
+++ b/scripts/tracetool/backend/syslog.py
@@ -30,11 +30,7 @@ def generate_h(event, group):
     if len(event.args) > 0:
         argnames = ", " + argnames
 
-    if "vcpu" in event.properties:
-        # already checked on the generic format code
-        cond = "true"
-    else:
-        cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
+    cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
 
     out('    if (%(cond)s) {',
         '#line %(event_lineno)d "%(event_filename)s"',
-- 
2.34.1

Re: [PATCH v2 1/3] tracetool: removed the unused vcpu property

Posted by Alex Bennée 4 months, 3 weeks ago

Tanish Desai <tanishdesai37@gmail.com> writes:

> The vcpu property is no longer used in these backends. Removing it avoids
> unnecessary checks and simplifies the code generation for these trace
> backends.
>
> Signed-off-by: Tanish Desai <tanishdesai37@gmail.com>

I think you forgot to collect the r-b tags from v1, see:

  https://qemu.readthedocs.io/en/master/devel/submitting-a-patch.html#proper-use-of-reviewed-by-tags-can-aid-review

> ---
>  scripts/tracetool/__init__.py       | 6 +++---
>  scripts/tracetool/backend/log.py    | 6 +-----
>  scripts/tracetool/backend/simple.py | 6 +-----
>  scripts/tracetool/backend/syslog.py | 6 +-----
>  4 files changed, 6 insertions(+), 18 deletions(-)
>
> diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
> index bc03238c0f..e86c898a1e 100644
> --- a/scripts/tracetool/__init__.py
> +++ b/scripts/tracetool/__init__.py
> @@ -216,9 +216,9 @@ class Event(object):
>                        r"\s*"
>                        r"(?:(?:(?P<fmt_trans>\".+),)?\s*(?P<fmt>\".+))?"
>                        r"\s*")
> -
> -    _VALID_PROPS = set(["disable", "vcpu"])
> -
> +    
> +    _VALID_PROPS = set(["disable"])
> +    
>      def __init__(self, name, props, fmt, args, lineno, filename, orig=None,
>                   event_trans=None, event_exec=None):
>          """
> diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
> index de27b7e62e..f24acad74c 100644
> --- a/scripts/tracetool/backend/log.py
> +++ b/scripts/tracetool/backend/log.py
> @@ -31,11 +31,7 @@ def generate_h(event, group):
>      if len(event.args) > 0:
>          argnames = ", " + argnames
>  
> -    if "vcpu" in event.properties:
> -        # already checked on the generic format code
> -        cond = "true"
> -    else:
> -        cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
> +    cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
>  
>      out('    if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {',
>          '        if (message_with_timestamp) {',
> diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py
> index 2688d4b64b..7c84c06b20 100644
> --- a/scripts/tracetool/backend/simple.py
> +++ b/scripts/tracetool/backend/simple.py
> @@ -37,11 +37,7 @@ def generate_h_begin(events, group):
>  
>  def generate_h(event, group):
>      event_id = 'TRACE_' + event.name.upper()
> -    if "vcpu" in event.properties:
> -        # already checked on the generic format code
> -        cond = "true"
> -    else:
> -        cond = "trace_event_get_state(%s)" % event_id
> +    cond = "trace_event_get_state(%s)" % event_id
>      out('    if (%(cond)s) {',
>          '        _simple_%(api)s(%(args)s);',
>          '    }',
> diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py
> index 012970f6cc..6fdc1142fb 100644
> --- a/scripts/tracetool/backend/syslog.py
> +++ b/scripts/tracetool/backend/syslog.py
> @@ -30,11 +30,7 @@ def generate_h(event, group):
>      if len(event.args) > 0:
>          argnames = ", " + argnames
>  
> -    if "vcpu" in event.properties:
> -        # already checked on the generic format code
> -        cond = "true"
> -    else:
> -        cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
> +    cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
>  
>      out('    if (%(cond)s) {',
>          '#line %(event_lineno)d "%(event_filename)s"',

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH v2 1/3] tracetool: removed the unused vcpu property

Posted by Tanish Desai 4 months, 3 weeks ago

Noted will take care for all upcoming patches.
For this patch should I resend it with r-b tags from v1 or this patch it’s
fine for now?


On Fri, 20 Jun 2025 at 9:43 PM, Alex Bennée <alex.bennee@linaro.org> wrote:

> Tanish Desai <tanishdesai37@gmail.com> writes:
>
> > The vcpu property is no longer used in these backends. Removing it avoids
> > unnecessary checks and simplifies the code generation for these trace
> > backends.
> >
> > Signed-off-by: Tanish Desai <tanishdesai37@gmail.com>
>
> I think you forgot to collect the r-b tags from v1, see:
>
>
> https://qemu.readthedocs.io/en/master/devel/submitting-a-patch.html#proper-use-of-reviewed-by-tags-can-aid-review
>
> > ---
> >  scripts/tracetool/__init__.py       | 6 +++---
> >  scripts/tracetool/backend/log.py    | 6 +-----
> >  scripts/tracetool/backend/simple.py | 6 +-----
> >  scripts/tracetool/backend/syslog.py | 6 +-----
> >  4 files changed, 6 insertions(+), 18 deletions(-)
> >
> > diff --git a/scripts/tracetool/__init__.py
> b/scripts/tracetool/__init__.py
> > index bc03238c0f..e86c898a1e 100644
> > --- a/scripts/tracetool/__init__.py
> > +++ b/scripts/tracetool/__init__.py
> > @@ -216,9 +216,9 @@ class Event(object):
> >                        r"\s*"
> >                        r"(?:(?:(?P<fmt_trans>\".+),)?\s*(?P<fmt>\".+))?"
> >                        r"\s*")
> > -
> > -    _VALID_PROPS = set(["disable", "vcpu"])
> > -
> > +
> > +    _VALID_PROPS = set(["disable"])
> > +
> >      def __init__(self, name, props, fmt, args, lineno, filename,
> orig=None,
> >                   event_trans=None, event_exec=None):
> >          """
> > diff --git a/scripts/tracetool/backend/log.py
> b/scripts/tracetool/backend/log.py
> > index de27b7e62e..f24acad74c 100644
> > --- a/scripts/tracetool/backend/log.py
> > +++ b/scripts/tracetool/backend/log.py
> > @@ -31,11 +31,7 @@ def generate_h(event, group):
> >      if len(event.args) > 0:
> >          argnames = ", " + argnames
> >
> > -    if "vcpu" in event.properties:
> > -        # already checked on the generic format code
> > -        cond = "true"
> > -    else:
> > -        cond = "trace_event_get_state(%s)" % ("TRACE_" +
> event.name.upper())
> > +    cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
> >
> >      out('    if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {',
> >          '        if (message_with_timestamp) {',
> > diff --git a/scripts/tracetool/backend/simple.py
> b/scripts/tracetool/backend/simple.py
> > index 2688d4b64b..7c84c06b20 100644
> > --- a/scripts/tracetool/backend/simple.py
> > +++ b/scripts/tracetool/backend/simple.py
> > @@ -37,11 +37,7 @@ def generate_h_begin(events, group):
> >
> >  def generate_h(event, group):
> >      event_id = 'TRACE_' + event.name.upper()
> > -    if "vcpu" in event.properties:
> > -        # already checked on the generic format code
> > -        cond = "true"
> > -    else:
> > -        cond = "trace_event_get_state(%s)" % event_id
> > +    cond = "trace_event_get_state(%s)" % event_id
> >      out('    if (%(cond)s) {',
> >          '        _simple_%(api)s(%(args)s);',
> >          '    }',
> > diff --git a/scripts/tracetool/backend/syslog.py
> b/scripts/tracetool/backend/syslog.py
> > index 012970f6cc..6fdc1142fb 100644
> > --- a/scripts/tracetool/backend/syslog.py
> > +++ b/scripts/tracetool/backend/syslog.py
> > @@ -30,11 +30,7 @@ def generate_h(event, group):
> >      if len(event.args) > 0:
> >          argnames = ", " + argnames
> >
> > -    if "vcpu" in event.properties:
> > -        # already checked on the generic format code
> > -        cond = "true"
> > -    else:
> > -        cond = "trace_event_get_state(%s)" % ("TRACE_" +
> event.name.upper())
> > +    cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
> >
> >      out('    if (%(cond)s) {',
> >          '#line %(event_lineno)d "%(event_filename)s"',
>
> --
> Alex Bennée
> Virtualisation Tech Lead @ Linaro
>

[PATCH v2 1/3] tracetool: removed the unused vcpu property
[PATCH v2 2/3] tracetool: introduce generate_unconditional
[PATCH v2 3/3] tracetool: remove redundant event_get_state checks