Re: [Qemu-devel] [Qemu-ppc] [RFC PATCH 2/9] Update headers using update-linux-headers.sh

[Thomas Huth]

On 09.02.2017 05:53, Sam Bobroff wrote:
> On Tue, Feb 07, 2017 at 01:59:52PM +0100, Thomas Huth wrote:
>> On 07.02.2017 03:56, Sam Bobroff wrote:
>>> This provides some new definitions needed by ISA 3.00 guests.
>>>
>>> It is a large change because this is the first import since
>>> some kernel header files have become autogenerated.
>>>
>>> Note: update-linux-headers.sh currently generates a change that
>>> (incorrectly) removes virtio_mmio.h and the change has been manually
>>> adjusted to prevent that.
>>>
>>> Signed-off-by: Sam Bobroff <address@hidden>
>>> ---
>>>  include/standard-headers/linux/input-event-codes.h |   2 +-
>>>  include/standard-headers/linux/pci_regs.h          |   8 +
>>>  include/standard-headers/linux/virtio_ids.h        |   1 +
>>>  linux-headers/asm-arm/kvm.h                        |   2 +
>>>  linux-headers/asm-arm/unistd.h                     | 419 
>>> +--------------------
>>>  linux-headers/asm-powerpc/kvm.h                    |  25 ++
>>>  linux-headers/asm-powerpc/unistd.h                 |   1 +
>>>  linux-headers/asm-x86/kvm_para.h                   |   4 +-
>>>  linux-headers/linux/kvm.h                          |  11 +-
>>>  linux-headers/linux/vfio.h                         |  10 +
>>>  10 files changed, 63 insertions(+), 420 deletions(-)
>> [...]
>>> diff --git a/linux-headers/asm-arm/unistd.h b/linux-headers/asm-arm/unistd.h
>>> index ceb5450c81..155571b874 100644
>>> --- a/linux-headers/asm-arm/unistd.h
>>> +++ b/linux-headers/asm-arm/unistd.h
>>> @@ -17,409 +17,14 @@
>>>  
>>>  #if defined(__thumb__) || defined(__ARM_EABI__)
>>>  #define __NR_SYSCALL_BASE  0
>>> +#include <asm/unistd-eabi.h>
>>>  #else
>>>  #define __NR_SYSCALL_BASE  __NR_OABI_SYSCALL_BASE
>>> +#include <asm/unistd-oabi.h>
>>>  #endif
>>>  
>>> -/*
>>> - * This file contains the system call numbers.
>>> - */
>> [...]
>>
>> Looks like the contents of asm-arm/unistd.h has been moved to two new
>> files, unistd-eabi.h and unistd-oabi.h, but they are not part of your
>> patch. I guess update-linux-headers.sh needs a fix for that?
>>
>>  Thomas
> 
> Ah thanks! I'll look at it.
> 
> Should I try to fix the other problem with update-linux-headers.sh at
> the same time? (I'm referring to the issue I noted in the commit
> message, about virtio_mmio.h)

Yes, please!

 Thomas