aboutsummaryrefslogtreecommitdiff
path: root/nbd/common.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-03-14 09:01:28 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2016-03-22 22:20:15 +0100
commitda34e65cb4025728566d6504a99916f6e7e1dd6a (patch)
tree79cc0f5cfc5b02ead1a6730a3c568a5fd00b6dac /nbd/common.c
parent4829e0378dfb91d55af9dfd741bd09e8f2c4f91a (diff)
downloadqemu-da34e65cb4025728566d6504a99916f6e7e1dd6a.zip
qemu-da34e65cb4025728566d6504a99916f6e7e1dd6a.tar.gz
qemu-da34e65cb4025728566d6504a99916f6e7e1dd6a.tar.bz2
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 'nbd/common.c')
-rw-r--r--nbd/common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/nbd/common.c b/nbd/common.c
index bde673a..a44718c 100644
--- a/nbd/common.c
+++ b/nbd/common.c
@@ -17,6 +17,7 @@
*/
#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "nbd-internal.h"
ssize_t nbd_wr_syncv(QIOChannel *ioc,