Re: [Qemu-devel] [PATCH v4 3/4] linux-headers: update to pre 4.15-rc0

[Auger Eric]

Hi Peter,

On 24/11/17 14:38, Peter Maydell wrote:
> On 24 November 2017 at 13:30, Eric Auger <address@hidden> wrote:
>> Update headers against post v4.14 and pre v4.15-rc0.
>>
>> Signed-off-by: Eric Auger <address@hidden>
>> ---
>>  include/standard-headers/asm-s390/virtio-ccw.h     |   1 +
>>  include/standard-headers/asm-x86/hyperv.h          | 394 
>> +--------------------
>>  include/standard-headers/linux/input-event-codes.h |   2 +
>>  include/standard-headers/linux/input.h             |   1 +
>>  include/standard-headers/linux/pci_regs.h          |  45 ++-
>>  linux-headers/asm-arm/kvm.h                        |   8 +
>>  linux-headers/asm-arm/kvm_para.h                   |   1 +
>>  linux-headers/asm-arm/unistd.h                     |   2 +
>>  linux-headers/asm-arm64/kvm.h                      |   8 +
>>  linux-headers/asm-arm64/unistd.h                   |   1 +
>>  linux-headers/asm-powerpc/epapr_hcalls.h           |   1 +
>>  linux-headers/asm-powerpc/kvm.h                    |   1 +
>>  linux-headers/asm-powerpc/kvm_para.h               |   1 +
>>  linux-headers/asm-powerpc/unistd.h                 |   1 +
>>  linux-headers/asm-s390/kvm.h                       |   1 +
>>  linux-headers/asm-s390/kvm_para.h                  |   1 +
>>  linux-headers/asm-s390/unistd.h                    |   4 +-
>>  linux-headers/asm-x86/kvm.h                        |   1 +
>>  linux-headers/asm-x86/kvm_para.h                   |   2 +-
>>  linux-headers/asm-x86/unistd.h                     |   1 +
>>  linux-headers/linux/kvm.h                          |   2 +
>>  linux-headers/linux/kvm_para.h                     |   1 +
>>  linux-headers/linux/psci.h                         |   1 +
>>  linux-headers/linux/userfaultfd.h                  |   1 +
>>  linux-headers/linux/vfio.h                         |   1 +
>>  linux-headers/linux/vfio_ccw.h                     |   1 +
>>  linux-headers/linux/vhost.h                        |   1 +
> 
>> --- a/include/standard-headers/asm-x86/hyperv.h
>> +++ b/include/standard-headers/asm-x86/hyperv.h
>> @@ -1,393 +1 @@
>> -#ifndef _ASM_X86_HYPERV_H
>> -#define _ASM_X86_HYPERV_H
>> -
>> -#include "standard-headers/linux/types.h"
>> -
>> -/*
>> - * The below CPUID leaves are present if 
>> VersionAndFeatures.HypervisorPresent
>> - * is set by CPUID(HvCpuIdFunctionVersionAndFeatures).
>> - */
>> -#define HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS  0x40000000
>> -#define HYPERV_CPUID_INTERFACE                 0x40000001
>> -#define HYPERV_CPUID_VERSION                   0x40000002
>> -#define HYPERV_CPUID_FEATURES                  0x40000003
>> -#define HYPERV_CPUID_ENLIGHTMENT_INFO          0x40000004
>> -#define HYPERV_CPUID_IMPLEMENT_LIMITS          0x40000005
>> -
>> -#define HYPERV_HYPERVISOR_PRESENT_BIT          0x80000000
>> -#define HYPERV_CPUID_MIN                       0x40000005
>> -#define HYPERV_CPUID_MAX                       0x4000ffff
> 
> Did you test building on x86 host? It's hard to see how the
> code in QEMU that uses these HYPERV #defines will still compile.

Just test built with

./configure --target-list="aarch64-softmmu arm-softmmu arm-linux-user
x86_64-softmmu i386-softmmu" --enable-kvm --enable-trace-backends=log

and it looks OK.

Thanks

Eric
> 
> thanks
> -- PMM
>