Re: [Qemu-devel] [PATCH v2 01/19] exec, dump, i386, ppc, s390x: don't include exec/cpu-all.h explicitly

[Cornelia Huck]

On Mon,  4 Sep 2017 17:42:58 +0200
David Hildenbrand <address@hidden> wrote:

> All but a handfull of filles include exec/cpu-all.h via cpu.h only.

You had some extra 'l's around? :)

s/handfull/handful/ and s/filles/files/

(I can fix while applying)

> As these files already include cpu.h, let's just drop the additional
> include.
> 
> Signed-off-by: David Hildenbrand <address@hidden>
> ---
>  dump.c                            | 1 -
>  exec.c                            | 2 --
>  target/i386/arch_dump.c           | 1 -
>  target/i386/arch_memory_mapping.c | 1 -
>  target/i386/svm_helper.c          | 1 -
>  target/ppc/arch_dump.c            | 1 -
>  target/s390x/arch_dump.c          | 1 -
>  7 files changed, 8 deletions(-)

This looks obviously correct; would not mind acks, though.

> 
> diff --git a/dump.c b/dump.c
> index a79773d0f7..2ef6a678e8 100644
> --- a/dump.c
> +++ b/dump.c
> @@ -15,7 +15,6 @@
>  #include "qemu/cutils.h"
>  #include "elf.h"
>  #include "cpu.h"
> -#include "exec/cpu-all.h"
>  #include "exec/hwaddr.h"
>  #include "monitor/monitor.h"
>  #include "sysemu/kvm.h"
> diff --git a/exec.c b/exec.c
> index d20c34ca83..d109de2014 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -23,7 +23,6 @@
>  
>  #include "qemu/cutils.h"
>  #include "cpu.h"
> -#include "exec/exec-all.h"
>  #include "exec/target_page.h"
>  #include "tcg.h"
>  #include "hw/qdev-core.h"
> @@ -56,7 +55,6 @@
>  #endif
>  
>  #endif
> -#include "exec/cpu-all.h"
>  #include "qemu/rcu_queue.h"
>  #include "qemu/main-loop.h"
>  #include "translate-all.h"
> diff --git a/target/i386/arch_dump.c b/target/i386/arch_dump.c
> index e682904052..35b55fc200 100644
> --- a/target/i386/arch_dump.c
> +++ b/target/i386/arch_dump.c
> @@ -13,7 +13,6 @@
>  
>  #include "qemu/osdep.h"
>  #include "cpu.h"
> -#include "exec/cpu-all.h"
>  #include "sysemu/dump.h"
>  #include "elf.h"
>  #include "sysemu/memory_mapping.h"
> diff --git a/target/i386/arch_memory_mapping.c 
> b/target/i386/arch_memory_mapping.c
> index 647cff2829..271cb5e41b 100644
> --- a/target/i386/arch_memory_mapping.c
> +++ b/target/i386/arch_memory_mapping.c
> @@ -13,7 +13,6 @@
>  
>  #include "qemu/osdep.h"
>  #include "cpu.h"
> -#include "exec/cpu-all.h"
>  #include "sysemu/memory_mapping.h"
>  
>  /* PAE Paging or IA-32e Paging */
> diff --git a/target/i386/svm_helper.c b/target/i386/svm_helper.c
> index 59e8b5091c..f479239875 100644
> --- a/target/i386/svm_helper.c
> +++ b/target/i386/svm_helper.c
> @@ -19,7 +19,6 @@
>  
>  #include "qemu/osdep.h"
>  #include "cpu.h"
> -#include "exec/cpu-all.h"
>  #include "exec/helper-proto.h"
>  #include "exec/exec-all.h"
>  #include "exec/cpu_ldst.h"
> diff --git a/target/ppc/arch_dump.c b/target/ppc/arch_dump.c
> index 8e9397aa58..beb7268e57 100644
> --- a/target/ppc/arch_dump.c
> +++ b/target/ppc/arch_dump.c
> @@ -15,7 +15,6 @@
>  #include "qemu/osdep.h"
>  #include "cpu.h"
>  #include "elf.h"
> -#include "exec/cpu-all.h"
>  #include "sysemu/dump.h"
>  #include "sysemu/kvm.h"
>  
> diff --git a/target/s390x/arch_dump.c b/target/s390x/arch_dump.c
> index 9b0bf92698..6f61ff95af 100644
> --- a/target/s390x/arch_dump.c
> +++ b/target/s390x/arch_dump.c
> @@ -15,7 +15,6 @@
>  #include "cpu.h"
>  #include "internal.h"
>  #include "elf.h"
> -#include "exec/cpu-all.h"
>  #include "sysemu/dump.h"
>  
>