Browse Source

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>
pull/36/head
Eric Blake 11 years ago
committed by Peter Maydell
parent
commit
9167ebd98f
  1. 1
      scripts/qapi-commands.py
  2. 1
      scripts/qapi-event.py
  3. 3
      scripts/qapi-introspect.py
  4. 3
      scripts/qapi-types.py
  5. 1
      scripts/qapi-visit.py

1
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"

1
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"

3
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"
''',

3
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"
'''))

1
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"
''',

Loading…
Cancel
Save