]> git.ipfire.org Git - thirdparty/qemu.git/commit
trace: Do not include qom/cpu.h into generated trace.h
authorMarkus Armbruster <armbru@redhat.com>
Mon, 12 Aug 2019 05:23:37 +0000 (07:23 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Fri, 16 Aug 2019 11:31:52 +0000 (13:31 +0200)
commit13d4ff07e8ce524ee0f7904b1f7d3a2fdb98b9c4
treed20b287db4580672eb5bb62bfcd95292b9892784
parent988fa1030401b9cec82d26ec7a01f2df7326dde5
trace: Do not include qom/cpu.h into generated trace.h

docs/devel/tracing.txt explains "since many source files include
trace.h, [the generated trace.h use] a minimum of types and other
header files included to keep the namespace clean and compile times
and dependencies down."

Commit 4815185902 "trace: Add per-vCPU tracing states for events with
the 'vcpu' property" made them all include qom/cpu.h via
control-internal.h.  qom/cpu.h in turn includes about thirty headers.
Ouch.

Per-vCPU tracing is currently not supported in sub-directories'
trace-events.  In other words, qom/cpu.h can only be used in
trace-root.h, not in any trace.h.

Split trace/control-vcpu.h off trace/control.h and
trace/control-internal.h.  Have the generated trace.h include
trace/control.h (which no longer includes qom/cpu.h), and trace-root.h
include trace/control-vcpu.h (which includes it).

The resulting improvement is a bit disappointing: in my "build
everything" tree, some 1100 out of 6600 objects (not counting tests
and objects that don't depend on qemu/osdep.h) depend on a trace.h,
and about 600 of them no longer depend on qom/cpu.h.  But more than
1300 others depend on trace-root.h.  More work is clearly needed.
Left for another day.

Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190812052359.30071-8-armbru@redhat.com>
block/block-backend.c
qom/object.c
scripts/tracetool/format/c.py
scripts/tracetool/format/h.py
trace/control-internal.h
trace/control-vcpu.h [new file with mode: 0644]
trace/control.h
trace/qmp.c
ui/vnc.c