diff options
| author | Markus Armbruster | 2019-08-12 07:23:37 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2019-08-16 13:31:52 +0200 |
| commit | 13d4ff07e8ce524ee0f7904b1f7d3a2fdb98b9c4 (patch) | |
| tree | d20b287db4580672eb5bb62bfcd95292b9892784 /block | |
| parent | trace: Eliminate use of TARGET_FMT_plx (diff) | |
| download | qemu-13d4ff07e8ce524ee0f7904b1f7d3a2fdb98b9c4.tar.gz qemu-13d4ff07e8ce524ee0f7904b1f7d3a2fdb98b9c4.tar.xz qemu-13d4ff07e8ce524ee0f7904b1f7d3a2fdb98b9c4.zip | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 0056b526b8..6aed80bf0b 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -15,6 +15,7 @@ #include "block/block_int.h" #include "block/blockjob.h" #include "block/throttle-groups.h" +#include "hw/qdev-core.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qapi/error.h" |