| Message ID | 20240606102631.78152-1-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | tracetool: Remove unused vcpu.py script | expand |
On Thu, Jun 06, 2024 at 12:26:31PM +0200, Philippe Mathieu-Daudé wrote: > vcpu.py is pointless since commit 89aafcf2a7 ("trace: > remove code that depends on setting vcpu"), remote it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > meson.build | 1 - > scripts/tracetool/__init__.py | 8 +---- > scripts/tracetool/vcpu.py | 59 ----------------------------------- > 3 files changed, 1 insertion(+), 67 deletions(-) > delete mode 100644 scripts/tracetool/vcpu.py Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
On Thu, Jun 06, 2024 at 12:26:31PM +0200, Philippe Mathieu-Daudé wrote: > Date: Thu, 6 Jun 2024 12:26:31 +0200 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH] tracetool: Remove unused vcpu.py script > X-Mailer: git-send-email 2.41.0 > > vcpu.py is pointless since commit 89aafcf2a7 ("trace: > remove code that depends on setting vcpu"), remote it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > meson.build | 1 - > scripts/tracetool/__init__.py | 8 +---- > scripts/tracetool/vcpu.py | 59 ----------------------------------- > 3 files changed, 1 insertion(+), 67 deletions(-) > delete mode 100644 scripts/tracetool/vcpu.py Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
On Thu, Jun 06, 2024 at 12:26:31PM +0200, Philippe Mathieu-Daudé wrote: > vcpu.py is pointless since commit 89aafcf2a7 ("trace: > remove code that depends on setting vcpu"), remote it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > meson.build | 1 - > scripts/tracetool/__init__.py | 8 +---- > scripts/tracetool/vcpu.py | 59 ----------------------------------- > 3 files changed, 1 insertion(+), 67 deletions(-) > delete mode 100644 scripts/tracetool/vcpu.py Thanks, applied to my tracing tree: https://gitlab.com/stefanha/qemu/commits/tracing Stefan
diff --git a/meson.build b/meson.build index d80203f1cd..0c45c948d0 100644 --- a/meson.build +++ b/meson.build @@ -3226,7 +3226,6 @@ tracetool_depends = files( 'scripts/tracetool/format/log_stap.py', 'scripts/tracetool/format/stap.py', 'scripts/tracetool/__init__.py', - 'scripts/tracetool/vcpu.py' ) qemu_version_cmd = [find_program('scripts/qemu-version.sh'), diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index b887540a55..7237abe0e8 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -306,13 +306,7 @@ def build(line_str, lineno, filename): fmt = [fmt_trans, fmt] args = Arguments.build(groups["args"]) - event = Event(name, props, fmt, args, lineno, filename) - - # add implicit arguments when using the 'vcpu' property - import tracetool.vcpu - event = tracetool.vcpu.transform_event(event) - - return event + return Event(name, props, fmt, args, lineno, filename) def __repr__(self): """Evaluable string representation for this object.""" diff --git a/scripts/tracetool/vcpu.py b/scripts/tracetool/vcpu.py deleted file mode 100644 index d232cb1d06..0000000000 --- a/scripts/tracetool/vcpu.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -Generic management for the 'vcpu' property. - -""" - -__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>" -__copyright__ = "Copyright 2016, Lluís Vilanova <vilanova@ac.upc.edu>" -__license__ = "GPL version 2 or (at your option) any later version" - -__maintainer__ = "Stefan Hajnoczi" -__email__ = "stefanha@redhat.com" - - -from tracetool import Arguments, try_import - - -def transform_event(event): - """Transform event to comply with the 'vcpu' property (if present).""" - if "vcpu" in event.properties: - event.args = Arguments([("void *", "__cpu"), event.args]) - fmt = "\"cpu=%p \"" - event.fmt = fmt + event.fmt - return event - - -def transform_args(format, event, *args, **kwargs): - """Transforms the arguments to suit the specified format. - - The format module must implement function 'vcpu_args', which receives the - implicit arguments added by the 'vcpu' property, and must return suitable - arguments for the given format. - - The function is only called for events with the 'vcpu' property. - - Parameters - ========== - format : str - Format module name. - event : Event - args, kwargs - Passed to 'vcpu_transform_args'. - - Returns - ======= - Arguments - The transformed arguments, including the non-implicit ones. - - """ - if "vcpu" in event.properties: - ok, func = try_import("tracetool.format." + format, - "vcpu_transform_args") - assert ok - assert func - return Arguments([func(event.args[:1], *args, **kwargs), - event.args[1:]]) - else: - return event.args
vcpu.py is pointless since commit 89aafcf2a7 ("trace: remove code that depends on setting vcpu"), remote it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- meson.build | 1 - scripts/tracetool/__init__.py | 8 +---- scripts/tracetool/vcpu.py | 59 ----------------------------------- 3 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 scripts/tracetool/vcpu.py