[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 8/8] qapi: generate trace events by default
From: |
Markus Armbruster |
Subject: |
[PULL v2 8/8] qapi: generate trace events by default |
Date: |
Thu, 27 Jan 2022 15:22:02 +0100 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
We don't generate trace events for tests/ and qga/ because that it is
not simple and not necessary. We have corresponding comments in both
tests/meson.build and qga/meson.build.
Still to not miss possible future qapi code generation call, and not to
forget to enable trace events generation, let's enable it by default.
So, turn option --gen-trace into opposite --no-trace-events and use new
option only in tests/ and qga/ where we already have good comments why
we don't generate trace events code.
Note that this commit enables trace-events generation for qapi-gen.py
call from tests/qapi-schema/meson.build and storage-daemon/meson.build.
Still, both are kind of noop: tests/qapi-schema/ doesn't seem to
generate any QMP command code and no .trace-events files anyway,
storage-daemon/ uses common QMP command implementations and just
generate empty .trace-events
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20220126161130.3240892-8-vsementsov@virtuozzo.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qapi/meson.build | 2 +-
qga/meson.build | 3 ++-
scripts/qapi/main.py | 8 ++++----
tests/meson.build | 3 ++-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/qapi/meson.build b/qapi/meson.build
index b22558ca73..656ef0e039 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -127,7 +127,7 @@ endforeach
qapi_files = custom_target('shared QAPI source files',
output: qapi_util_outputs + qapi_specific_outputs + qapi_nonmodule_outputs,
input: [ files('qapi-schema.json') ],
- command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@', '--gen-trace' ],
+ command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@' ],
depend_files: [ qapi_inputs, qapi_gen_depends ])
# Now go through all the outputs and add them to the right sourceset.
diff --git a/qga/meson.build b/qga/meson.build
index 724d5a667b..f06b726ad3 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -25,7 +25,8 @@ qga_qapi_outputs = [
qga_qapi_files = custom_target('QGA QAPI files',
output: qga_qapi_outputs,
input: 'qapi-schema.json',
- command: [ qapi_gen, '-o', 'qga', '-p', 'qga-',
'@INPUT0@' ],
+ command: [ qapi_gen, '-o', 'qga', '-p', 'qga-',
'@INPUT0@',
+ '--suppress-tracing' ],
depend_files: qapi_gen_depends)
qga_ss = ss.source_set()
diff --git a/scripts/qapi/main.py b/scripts/qapi/main.py
index 687d408aba..fc216a53d3 100644
--- a/scripts/qapi/main.py
+++ b/scripts/qapi/main.py
@@ -76,10 +76,10 @@ def main() -> int:
dest='unmask',
help="expose non-ABI names in introspection")
- # Option --gen-trace exists so we can avoid solving build system
+ # Option --suppress-tracing exists so we can avoid solving build system
# problems. TODO Drop it when we no longer need it.
- parser.add_argument('--gen-trace', action='store_true',
- help="add trace events to qmp marshals")
+ parser.add_argument('--suppress-tracing', action='store_true',
+ help="suppress adding trace events to qmp marshals")
parser.add_argument('schema', action='store')
args = parser.parse_args()
@@ -96,7 +96,7 @@ def main() -> int:
prefix=args.prefix,
unmask=args.unmask,
builtins=args.builtins,
- gen_tracing=args.gen_trace)
+ gen_tracing=not args.suppress_tracing)
except QAPIError as err:
print(f"{sys.argv[0]}: {str(err)}", file=sys.stderr)
return 1
diff --git a/tests/meson.build b/tests/meson.build
index c8ab6272d1..94a425d94a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -44,7 +44,8 @@ test_qapi_files = custom_target('Test QAPI files',
'qapi-schema/include/sub-module.json',
'qapi-schema/sub-sub-module.json'),
command: [ qapi_gen, '-o',
meson.current_build_dir(),
- '-b', '-p', 'test-', '@INPUT0@' ],
+ '-b', '-p', 'test-', '@INPUT0@',
+ '--suppress-tracing' ],
depend_files: qapi_gen_depends)
# meson doesn't like generated output in other directories
--
2.31.1
- [PULL v2 0/8] QAPI patches patches for 2022-01-27, Markus Armbruster, 2022/01/27
- [PULL v2 2/8] qapi/gen: Add FOO.trace-events output module, Markus Armbruster, 2022/01/27
- [PULL v2 7/8] meson: document why we don't generate trace events for tests/ and qga/, Markus Armbruster, 2022/01/27
- [PULL v2 4/8] qapi/commands: Optionally generate trace for QMP commands, Markus Armbruster, 2022/01/27
- [PULL v2 5/8] meson: generate trace events for qmp commands, Markus Armbruster, 2022/01/27
- [PULL v2 8/8] qapi: generate trace events by default,
Markus Armbruster <=
- [PULL v2 1/8] schemas: add missing vim modeline, Markus Armbruster, 2022/01/27
- [PULL v2 6/8] docs/qapi-code-gen: update to cover trace events code generation, Markus Armbruster, 2022/01/27
- [PULL v2 3/8] qapi/commands: refactor error handling code, Markus Armbruster, 2022/01/27
- Re: [PULL v2 0/8] QAPI patches patches for 2022-01-27, Peter Maydell, 2022/01/27