From 452fcdbc49c59884c8c284268d64baa24fea11e1 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 1 Feb 2018 12:18:39 +0100 Subject: Include qapi/qmp/qdict.h exactly where needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This cleanup makes the number of objects depending on qapi/qmp/qdict.h drop from 4550 (out of 4743) to 368 in my "build everything" tree. For qapi/qmp/qobject.h, the number drops from 4552 to 390. While there, separate #include from file comment with a blank line. Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Markus Armbruster Message-Id: <20180201111846.21846-13-armbru@redhat.com> --- scripts/qapi-commands.py | 2 +- scripts/qapi-event.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 26c56c5..f89d748 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -294,6 +294,7 @@ fdef.write(mcgen(''' #include "qemu-common.h" #include "qemu/module.h" #include "qapi/visitor.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/dealloc-visitor.h" @@ -307,7 +308,6 @@ fdef.write(mcgen(''' fdecl.write(mcgen(''' #include "%(prefix)sqapi-types.h" -#include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index 9d71346..c710968 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -210,6 +210,7 @@ fdef.write(mcgen(''' #include "%(prefix)sqapi-event.h" #include "%(prefix)sqapi-visit.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp-event.h" @@ -218,7 +219,6 @@ fdef.write(mcgen(''' fdecl.write(mcgen(''' #include "qapi/util.h" -#include "qapi/qmp/qdict.h" #include "%(prefix)sqapi-types.h" ''', -- cgit v1.1