Re: [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories

[Jan Kiszka <jan.kiszka@web.de>]

[-- Attachment #1: Type: text/plain, Size: 1527 bytes --]

On 2012-10-30 10:48, Peter Maydell wrote:
> Ping?
> 
> (patchwork url http://patchwork.ozlabs.org/patch/193125/)

Should obviously go in soon.

Jan

> 
> thanks
> -- PMM
> 
> On 22 October 2012 13:54, Peter Maydell <peter.maydell@linaro.org> wrote:
>> Recent kernels have moved to keeping the userspace headers
>> in uapi/ subdirectories. This breaks the detection of whether an
>> architecture has KVM support in the kernel because kvm.h has
>> moved in the kernel source tree. Update the check to support
>> both the old and new locations.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> This would otherwise cause us to ignore the architectures which
>> have moved over to uapi/ (which for QEMU's purposes means "everything
>> but x86"...)
>>
>>  scripts/update-linux-headers.sh |    3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
>> index 67be2ef..4c7b566 100755
>> --- a/scripts/update-linux-headers.sh
>> +++ b/scripts/update-linux-headers.sh
>> @@ -34,7 +34,8 @@ ARCHLIST=$(cd "$linux/arch" && echo *)
>>
>>  for arch in $ARCHLIST; do
>>      # Discard anything which isn't a KVM-supporting architecture
>> -    if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ]; then
>> +    if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ] &&
>> +        ! [ -e "$linux/arch/$arch/include/uapi/asm/kvm.h" ] ; then
>>          continue
>>      fi
>>
>> --
>> 1.7.9.5



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]