Re: [Qemu-devel] [PATCH] Clean up includes

[BALATON Zoltan]

On Wed, 13 Mar 2019, Markus Armbruster wrote:
> 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, with the changes
> to the following files manually reverted:
>
>    contrib/libvhost-user/libvhost-user-glib.h
>    contrib/libvhost-user/libvhost-user.c
>    contrib/libvhost-user/libvhost-user.h
>    linux-user/mips64/cpu_loop.c
>    linux-user/mips64/signal.c
>    linux-user/sparc64/cpu_loop.c
>    linux-user/sparc64/signal.c
>    linux-user/x86_64/cpu_loop.c
>    linux-user/x86_64/signal.c
>    slirp/src/*
>    target/s390x/gen-features.c
>    tests/migration/s390x/a-b-bios.c
>    tests/test-rcu-simpleq.c
>    tests/test-rcu-tailq.c
>    tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
>
> We're in the process of spinning out slirp/.  tests/uefi-test-tools/
> is guest software.  The remaining reverts are the same as in commit
> b7d89466dde.
>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> contrib/elf2dmp/main.c   | 3 +--
> contrib/elf2dmp/pdb.c    | 3 +--
> hw/display/ati.c         | 1 +
> hw/display/ati_2d.c      | 1 +
> hw/display/ati_dbg.c     | 1 +
> hw/display/ati_int.h     | 1 -
> include/hw/cpu/cluster.h | 1 -
> tests/fp/platform.h      | 1 -
> tests/libqos/qgraph.h    | 4 ----
> tests/qos-test.c         | 2 +-
> 10 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c
> index 1bfeb89ba7..9a2dbc2902 100644
> --- a/contrib/elf2dmp/main.c
> +++ b/contrib/elf2dmp/main.c
> @@ -5,9 +5,8 @@
>  *
>  */
>
> -#include <inttypes.h>
> -
> #include "qemu/osdep.h"
> +
> #include "err.h"
> #include "addrspace.h"
> #include "pe.h"
> diff --git a/contrib/elf2dmp/pdb.c b/contrib/elf2dmp/pdb.c
> index 64af20f584..a5bd40c99d 100644
> --- a/contrib/elf2dmp/pdb.c
> +++ b/contrib/elf2dmp/pdb.c
> @@ -18,9 +18,8 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
>  */
>
> -#include <inttypes.h>
> -
> #include "qemu/osdep.h"
> +
> #include "pdb.h"
> #include "err.h"
>
> diff --git a/hw/display/ati.c b/hw/display/ati.c
> index 8322f52aff..b06c4d571a 100644
> --- a/hw/display/ati.c
> +++ b/hw/display/ati.c
> @@ -16,6 +16,7 @@
>  * No 3D at all yet (maybe after 2D works, but feel free to improve it)
>  */
>
> +#include "qemu/osdep.h"
> #include "ati_int.h"
> #include "ati_regs.h"
> #include "vga_regs.h"
> diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c
> index bc98ba6eeb..f31b3c27c7 100644
> --- a/hw/display/ati_2d.c
> +++ b/hw/display/ati_2d.c
> @@ -7,6 +7,7 @@
>  * This work is licensed under the GNU GPL license version 2 or later.
>  */
>
> +#include "qemu/osdep.h"
> #include "ati_int.h"
> #include "ati_regs.h"
> #include "qemu/log.h"
> diff --git a/hw/display/ati_dbg.c b/hw/display/ati_dbg.c
> index 1e6c32624e..b045f81d06 100644
> --- a/hw/display/ati_dbg.c
> +++ b/hw/display/ati_dbg.c
> @@ -1,3 +1,4 @@
> +#include "qemu/osdep.h"
> #include "ati_int.h"
>
> #ifdef DEBUG_ATI
> diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h
> index a6f3e20e63..2f426064cf 100644
> --- a/hw/display/ati_int.h
> +++ b/hw/display/ati_int.h
> @@ -9,7 +9,6 @@
> #ifndef ATI_INT_H
> #define ATI_INT_H
>
> -#include "qemu/osdep.h"

What's wrong with ati_int.h including osdep.h first and everything else 
including ati_int.h first? I think it was OK that way so unless there's a 
good reason to explicitely include osdep in all files that also include 
ati_int.h I think these should not be changed. For the ati model we need 
ati_int.h included first so it's OK to include osdep.h from there.

Regards,
BALATON Zoltan