Re: [Qemu-devel] [PATCH 15/37] tcg: Clean up includes

[Richard Henderson]

On 01/27/2016 05:17 AM, Peter Maydell wrote:
> diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c
> index 0ed10a9..8467d5d 100644
> --- a/tcg/aarch64/tcg-target.c
> +++ b/tcg/aarch64/tcg-target.c
> @@ -10,6 +10,7 @@
>    * See the COPYING file in the top-level directory for details.
>    */
>
> +#include "qemu/osdep.h"
>   #include "tcg-be-ldst.h"
>   #include "qemu/bitops.h"
>
> diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
> index 3edf6a6..146ac00 100644
> --- a/tcg/arm/tcg-target.c
> +++ b/tcg/arm/tcg-target.c
> @@ -22,6 +22,7 @@
>    * THE SOFTWARE.
>    */
>
> +#include "qemu/osdep.h"
>   #include "elf.h"
>   #include "tcg-be-ldst.h"
>
> diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
> index 9187d34..d90636c 100644
> --- a/tcg/i386/tcg-target.c
> +++ b/tcg/i386/tcg-target.c
> @@ -22,6 +22,7 @@
>    * THE SOFTWARE.
>    */
>
> +#include "qemu/osdep.h"
>   #include "tcg-be-ldst.h"
>
>   #ifndef NDEBUG

Nack to these, and the others like them.
These files are not standalone, they are
included into tcg.c, so we ought not be
re-including qemu/osdep.h here.


> diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
> index 79e052f..2dc4998 100644
> --- a/tcg/mips/tcg-target.c
> +++ b/tcg/mips/tcg-target.c
> @@ -1735,7 +1736,6 @@ static int tcg_target_callee_save_regs[] = {
>   /* The Linux kernel doesn't provide any information about the available
>      instruction set. Probe it using a signal handler. */
>
> -#include <signal.h>
>
>   #ifndef use_movnz_instructions
>   bool use_movnz_instructions = false;

But this is good.

> diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c
> index 2c72565..c593344 100644
> --- a/tcg/ppc/tcg-target.c
> +++ b/tcg/ppc/tcg-target.c
> @@ -2725,8 +2726,6 @@ static void __attribute__((constructor)) 
> tcg_cache_init(void)
>   }
>
>   #elif defined __APPLE__
> -#include <stdio.h>
> -#include <sys/types.h>
>   #include <sys/sysctl.h>
>
>   static void __attribute__((constructor)) tcg_cache_init(void)
> @@ -2745,11 +2744,6 @@ static void __attribute__((constructor)) 
> tcg_cache_init(void)
>   }
>
>   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
> -#include <errno.h>
> -#include <stdio.h>
> -#include <stdlib.h>
> -#include <string.h>
> -#include <sys/types.h>
>   #include <sys/sysctl.h>
>
>   static void __attribute__((constructor)) tcg_cache_init(void)

And this.


r~