Re: [Qemu-devel] [PULL v3 00/52] NEED_CPU_H cleanups.

[Peter Maydell]

On 19 May 2016 at 14:39, Paolo Bonzini <address@hidden> wrote:
> The following changes since commit 8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3:
>
>   Merge remote-tracking branch 
> 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging (2016-05-19 
> 09:27:28 +0100)
>
> are available in the git repository at:
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 9c3ed8e80344fe7d63e9d61e25bb941e0c8ea2ab:
>
>   hw: clean up hw/hw.h includes (2016-05-19 15:37:15 +0200)
>
> ----------------------------------------------------------------
> NEED_CPU_H cleanups, big enough to deserve their own pull request.


/home/petmay01/linaro/qemu-for-merges/target-ppc/cpu.h:220:28: error:
redefinition of ty
pedef 'CPUPPCState' is a C11 feature [-Werror,-Wtypedef-redefinition]
typedef struct CPUPPCState CPUPPCState;
                           ^
/home/petmay01/linaro/qemu-for-merges/target-ppc/cpu-qom.h:41:28:
note: previous definit
ion is here
typedef struct CPUPPCState CPUPPCState;
                           ^

/home/petmay01/linaro/qemu-for-merges/target-xtensa/cpu.h:333:3:
error: redefinition of typedef 'XtensaConfig' is a C11 feature
[-Werror,-Wtypedef-redefinition]
} XtensaConfig;
  ^
/home/petmay01/linaro/qemu-for-merges/target-xtensa/cpu-qom.h:43:29:
note: previous definition is here
typedef struct XtensaConfig XtensaConfig;
                            ^
1 error generated.

I did a -k build with clang and I think these are the last two.

thanks
-- PMM