diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-03-14 11:25:21 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-22 22:20:16 +0100 |
| commit | c80f6e9caa7647b576966534aaa0dc8f1b480f2b (patch) | |
| tree | 49621f641dc2e6f9a60dbc47677155210625b8a4 /scripts | |
| parent | 14b6d44d4720681a57b5d2c58cabdfc6364f8263 (diff) | |
| download | qemu-c80f6e9caa7647b576966534aaa0dc8f1b480f2b.zip qemu-c80f6e9caa7647b576966534aaa0dc8f1b480f2b.tar.gz qemu-c80f6e9caa7647b576966534aaa0dc8f1b480f2b.tar.bz2 | |
Clean up includes some more
Manually drop redundant includes that scripts/clean-includes misses,
e.g. because they're hidden in generator programs, or they use the
wrong kind of delimiter.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi-types.py | 5 | ||||
| -rw-r--r-- | scripts/tracetool/backend/log.py | 6 | ||||
| -rw-r--r-- | scripts/tracetool/format/events_h.py | 2 | ||||
| -rw-r--r-- | scripts/tracetool/format/h.py | 1 | ||||
| -rw-r--r-- | scripts/tracetool/format/tcg_h.py | 2 | ||||
| -rw-r--r-- | scripts/tracetool/format/ust_events_c.py | 1 |
6 files changed, 1 insertions, 16 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index e09c875..437cf6c 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -294,11 +294,6 @@ fdef.write(mcgen(''' ''', prefix=prefix)) -# To avoid circular headers, use only typedefs.h here, not qobject.h -fdecl.write(mcgen(''' -#include "qemu/typedefs.h" -''')) - schema = QAPISchema(input_file) gen = QAPISchemaGenTypeVisitor() schema.visit(gen) diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py index a62c310..e409b73 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -20,11 +20,7 @@ PUBLIC = True def generate_h_begin(events): - out('#include <stdio.h>', - '#include <sys/time.h>', - '#include <sys/types.h>', - '#include <unistd.h>', - '#include "trace/control.h"', + out('#include "trace/control.h"', '#include "qemu/log.h"', '') diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py index bbfaa5b..4529263 100644 --- a/scripts/tracetool/format/events_h.py +++ b/scripts/tracetool/format/events_h.py @@ -21,8 +21,6 @@ def generate(events, backend): '', '#ifndef TRACE__GENERATED_EVENTS_H', '#define TRACE__GENERATED_EVENTS_H', - '', - '#include <stdbool.h>', '') # event identifiers diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index 2bd68a2..0835406 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -23,7 +23,6 @@ def generate(events, backend): '#define TRACE__GENERATED_TRACERS_H', '', '#include "qemu-common.h"', - '#include "qemu/typedefs.h"', '') backend.generate_begin(events) diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py index 006eaa8..e2331f2 100644 --- a/scripts/tracetool/format/tcg_h.py +++ b/scripts/tracetool/format/tcg_h.py @@ -34,8 +34,6 @@ def generate(events, backend): '#ifndef TRACE__GENERATED_TCG_TRACERS_H', '#define TRACE__GENERATED_TCG_TRACERS_H', '', - '#include <stdint.h>', - '', '#include "trace.h"', '#include "exec/helper-proto.h"', '', diff --git a/scripts/tracetool/format/ust_events_c.py b/scripts/tracetool/format/ust_events_c.py index bf0b334..9967c7a 100644 --- a/scripts/tracetool/format/ust_events_c.py +++ b/scripts/tracetool/format/ust_events_c.py @@ -32,5 +32,4 @@ def generate(events, backend): ' */', '#pragma GCC diagnostic ignored "-Wredundant-decls"', '', - '#include "qemu/typedefs.h"', '#include "generated-ust-provider.h"') |