5e7477bc82
dtrace on macOS complains that CPUState * is used for a few probes:
dtrace: failed to compile script trace-dtrace-root.dtrace: line 130: syntax error near "CPUState"
A comment in scripts/tracetool/__init__.py mentions that:
We only want to allow standard C types or fixed sized
integer types. We don't want QEMU specific types
as we can't assume trace backends can resolve all the
typedefs
Fixes: 3d211d9f4dbee ("trace: Add 'vcpu' event property to trace guest vCPU")
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Message-id: 20200717093517.73397-3-r.bolshakov@yadro.com
Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
70 lines
2.0 KiB
Python
70 lines
2.0 KiB
Python
# -*- 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:
|
|
# events with 'tcg-trans' and 'tcg-exec' are auto-generated from
|
|
# already-patched events
|
|
assert "tcg-trans" not in event.properties
|
|
assert "tcg-exec" not in event.properties
|
|
|
|
event.args = Arguments([("void *", "__cpu"), event.args])
|
|
if "tcg" in event.properties:
|
|
fmt = "\"cpu=%p \""
|
|
event.fmt = [fmt + event.fmt[0],
|
|
fmt + event.fmt[1]]
|
|
else:
|
|
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
|