summaryrefslogtreecommitdiffstats
path: root/block/cloop.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-03-14 09:01:28 +0100
committerTimothy Pearson <tpearson@raptorengineering.com>2019-11-29 19:52:21 -0600
commitd21475e3cc38b9c88900c722fe4b3bcd4926a917 (patch)
tree40ddf1bdb024cbe259990868b4d733c209cf9c25 /block/cloop.c
parent712fdfc8cf68efe0e170143fdfc5988c0e97579f (diff)
downloadhqemu-d21475e3cc38b9c88900c722fe4b3bcd4926a917.zip
hqemu-d21475e3cc38b9c88900c722fe4b3bcd4926a917.tar.gz
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the Error typedef. Since then, we've moved to include qemu/osdep.h everywhere. Its file comment explains: "To avoid getting into possible circular include dependencies, this file should not include any other QEMU headers, with the exceptions of config-host.h, compiler.h, os-posix.h and os-win32.h, all of which are doing a similar job to this file and are under similar constraints." qapi/error.h doesn't do a similar job, and it doesn't adhere to similar constraints: it includes qapi-types.h. That's in excess of 100KiB of crap most .c files don't actually need. Add the typedef to qemu/typedefs.h, and include that instead of qapi/error.h. Include qapi/error.h in .c files that need it and don't get it now. Include qapi-types.h in qom/object.h for uint16List. Update scripts/clean-includes accordingly. Update it further to match reality: replace config.h by config-target.h, add sysemu/os-posix.h, sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h comment quoted above similarly. This reduces the number of objects depending on qapi/error.h from "all of them" to less than a third. Unfortunately, the number depending on qapi-types.h shrinks only a little. More work is needed for that one. Signed-off-by: Markus Armbruster <armbru@redhat.com> [Fix compilation without the spice devel packages. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'block/cloop.c')
-rw-r--r--block/cloop.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/cloop.c b/block/cloop.c
index 41bdee8..a84f140 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "qemu-common.h"
#include "block/block_int.h"
#include "qemu/module.h"
OpenPOWER on IntegriCloud