On 19 January 2016 at 14:50, Kevin Wolf <kw...@redhat.com> wrote: > Am 18.01.2016 um 19:01 hat Peter Maydell geschrieben: >> Clean up includes so that osdep.h is included first and headers >> which it implies are not included manually. >> >> This commit was created with scripts/clean-includes. >> >> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> > >> --- a/block/archipelago.c >> +++ b/block/archipelago.c >> @@ -50,6 +50,7 @@ >> * >> */ >> >> +#include "qemu/osdep.h" >> #include "qemu-common.h" >> #include "block/block_int.h" >> #include "qemu/error-report.h" > > qemu/osdep.h is already included by qemu-common.h. Do you intend to > remove all qemu/osdep.h includes from all header files (and possibly > error out if it hasn't been included before) as soon as most/all .c > files include it explicitly?
Yes, for suitable values of "as soon as". > This is what git grep says on include/: > > include/exec/cpu-defs.h:#include "qemu/osdep.h" > include/exec/helper-head.h:#include "qemu/osdep.h" > include/fpu/softfloat.h:#include "qemu/osdep.h" > include/qemu-common.h:#include "qemu/osdep.h" > include/qemu/bitmap.h:#include "qemu/osdep.h" > include/qemu/module.h:#include "qemu/osdep.h" > include/sysemu/seccomp.h:#include "qemu/osdep.h" We can't get rid of these until all C files include osdep.h as their first include. Hence these patches... thanks -- PMM
