Re: [Xen-devel] [PATCH 1/5] x86: move definition of struct cpuid_leaf to cpuid.h

[Roger Pau Monné <roger.pau@xxxxxxxxxx>]

On Thu, May 24, 2018 at 05:05:18PM +0100, Wei Liu wrote:
> This is a step towards consolidating relevant data structures and
> defines to one location.
> 
> It then requires defining cpuid_leaf in user space harness headers to
> make them continue to compile.
> 
> No functional change.
> 
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
> Cc: Jan Beulich <jbeulich@xxxxxxxx>
> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> ---
>  tools/tests/x86_emulator/x86-emulate.h | 6 ++++++
>  xen/arch/x86/x86_emulate/x86_emulate.h | 6 +-----
>  xen/include/asm-x86/cpuid.h            | 4 ++++
>  3 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/tests/x86_emulator/x86-emulate.h 
> b/tools/tests/x86_emulator/x86-emulate.h
> index c5e85de3a2..8ae31a2f9a 100644
> --- a/tools/tests/x86_emulator/x86-emulate.h
> +++ b/tools/tests/x86_emulator/x86-emulate.h
> @@ -79,6 +79,12 @@ WRAP(puts);
>  
>  #undef WRAP
>  
> +#ifndef cpuid_leaf
> +struct cpuid_leaf {
> +    uint32_t a, b, c, d;
> +};
> +#endif

Do you really need the ifndef? AFAICT this header will always be
included from the test harness, which has no definition of cpuid_leaf.

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel