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>
This commit is contained in:
Eric Blake 2016-02-08 08:36:46 -07:00 committed by Peter Maydell
parent 681c28a33e
commit 9167ebd98f
5 changed files with 6 additions and 3 deletions

View File

@ -297,6 +297,7 @@ h_comment = '''
c_comment, h_comment) c_comment, h_comment)
fdef.write(mcgen(''' fdef.write(mcgen('''
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qapi/qmp/types.h" #include "qapi/qmp/types.h"

View File

@ -159,6 +159,7 @@ h_comment = '''
c_comment, h_comment) c_comment, h_comment)
fdef.write(mcgen(''' fdef.write(mcgen('''
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "%(prefix)sqapi-event.h" #include "%(prefix)sqapi-event.h"
#include "%(prefix)sqapi-visit.h" #include "%(prefix)sqapi-visit.h"

View File

@ -1,7 +1,7 @@
# #
# QAPI introspection generator # QAPI introspection generator
# #
# Copyright (C) 2015 Red Hat, Inc. # Copyright (C) 2015-2016 Red Hat, Inc.
# #
# Authors: # Authors:
# Markus Armbruster <armbru@redhat.com> # Markus Armbruster <armbru@redhat.com>
@ -204,6 +204,7 @@ h_comment = '''
c_comment, h_comment) c_comment, h_comment)
fdef.write(mcgen(''' fdef.write(mcgen('''
#include "qemu/osdep.h"
#include "%(prefix)sqmp-introspect.h" #include "%(prefix)sqmp-introspect.h"
''', ''',

View File

@ -279,6 +279,7 @@ h_comment = '''
c_comment, h_comment) c_comment, h_comment)
fdef.write(mcgen(''' fdef.write(mcgen('''
#include "qemu/osdep.h"
#include "qapi/dealloc-visitor.h" #include "qapi/dealloc-visitor.h"
#include "%(prefix)sqapi-types.h" #include "%(prefix)sqapi-types.h"
#include "%(prefix)sqapi-visit.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 # To avoid circular headers, use only typedefs.h here, not qobject.h
fdecl.write(mcgen(''' fdecl.write(mcgen('''
#include <stdbool.h>
#include <stdint.h>
#include "qemu/typedefs.h" #include "qemu/typedefs.h"
''')) '''))

View File

@ -435,6 +435,7 @@ h_comment = '''
c_comment, h_comment) c_comment, h_comment)
fdef.write(mcgen(''' fdef.write(mcgen('''
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "%(prefix)sqapi-visit.h" #include "%(prefix)sqapi-visit.h"
''', ''',