diff options
| author | Eric Blake <eblake@redhat.com> | 2016-02-08 08:36:46 -0700 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-16 14:29:27 +0000 |
| commit | 9167ebd98f97dee8afa3ee206f1f48244b8707d2 (patch) | |
| tree | f1a886bb90301366e32dd4d195e8f6379ebe3cb8 | |
| parent | 681c28a33e305923a717815808056d2d5a89c8f9 (diff) | |
qapi: Clean up includes in generated files
As a followup to commit cbf2115, clean up the includes in files
generated by QAPI so that osdep.h is included first in .c files,
and headers which it implies are not included manually. This
patch is done manually, since Coccinelle (and therefore
scripts/clean-includes) doesn't see into the generator scripts.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | scripts/qapi-commands.py | 1 | ||||
| -rw-r--r-- | scripts/qapi-event.py | 1 | ||||
| -rw-r--r-- | scripts/qapi-introspect.py | 3 | ||||
| -rw-r--r-- | scripts/qapi-types.py | 3 | ||||
| -rw-r--r-- | scripts/qapi-visit.py | 1 |
5 files changed, 6 insertions, 3 deletions
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 91c5a4e8cd..f831621843 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -297,6 +297,7 @@ h_comment = ''' c_comment, h_comment) fdef.write(mcgen(''' +#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/module.h" #include "qapi/qmp/types.h" diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index 07bcb73d3d..544ae1218d 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -159,6 +159,7 @@ h_comment = ''' c_comment, h_comment) fdef.write(mcgen(''' +#include "qemu/osdep.h" #include "qemu-common.h" #include "%(prefix)sqapi-event.h" #include "%(prefix)sqapi-visit.h" diff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py index 64f2cd0631..e0f926be04 100644 --- a/scripts/qapi-introspect.py +++ b/scripts/qapi-introspect.py @@ -1,7 +1,7 @@ # # QAPI introspection generator # -# Copyright (C) 2015 Red Hat, Inc. +# Copyright (C) 2015-2016 Red Hat, Inc. # # Authors: # Markus Armbruster <armbru@redhat.com> @@ -204,6 +204,7 @@ h_comment = ''' c_comment, h_comment) fdef.write(mcgen(''' +#include "qemu/osdep.h" #include "%(prefix)sqmp-introspect.h" ''', diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index d3f631a2f4..7b0dca8c72 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -279,6 +279,7 @@ h_comment = ''' c_comment, h_comment) fdef.write(mcgen(''' +#include "qemu/osdep.h" #include "qapi/dealloc-visitor.h" #include "%(prefix)sqapi-types.h" #include "%(prefix)sqapi-visit.h" @@ -287,8 +288,6 @@ fdef.write(mcgen(''' # To avoid circular headers, use only typedefs.h here, not qobject.h fdecl.write(mcgen(''' -#include <stdbool.h> -#include <stdint.h> #include "qemu/typedefs.h" ''')) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 0fdcebcca8..0cc9b08b14 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -435,6 +435,7 @@ h_comment = ''' c_comment, h_comment) fdef.write(mcgen(''' +#include "qemu/osdep.h" #include "qemu-common.h" #include "%(prefix)sqapi-visit.h" ''', |