Re: [Qemu-devel] [qemu-s390x] [PULL 00/54] s390x update

[Christian Borntraeger]

On 20.05.19 21:00, Cornelia Huck wrote:
> On Mon, 20 May 2019 18:30:46 +0100
> Peter Maydell <address@hidden> wrote:
> 
>> On Mon, 20 May 2019 at 18:03, Cornelia Huck <address@hidden> wrote:
>>>
>>> The following changes since commit d8276573da58e8ce78dab8c46dd660efd664bcb7:
>>>
>>>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190510' into 
>>> staging (2019-05-16 13:15:08 +0100)
>>>
>>> are available in the Git repository at:
>>>
>>>   https://github.com/cohuck/qemu tags/s390x-20190520
>>>
>>> for you to fetch changes up to f9de88d07258b7288b59ebca77ff1da75b0e8e9f:
>>>
>>>   s390x/cpumodel: wire up 8561 and 8562 as gen15 machines (2019-05-20 
>>> 08:35:42 +0200)
>>>
>>> ----------------------------------------------------------------
>>> s390x update:
>>> - have the bios tolerate bootmap signature entries
>>> - next chunk of vector instruction support in tcg
>>> - a headers update against Linux 5.2-rc1
>>> - add more facilities and gen15 machines to the cpu model
>>>
>>> ----------------------------------------------------------------  
>>
>> Hi -- this fails to build on aarch64:
>>
>> In file included from /home/pm215/qemu/linux-headers/linux/kvm.h:14:0,
>>                  from /home/pm215/qemu/target/arm/kvm-consts.h:18,
>>                  from /home/pm215/qemu/target/arm/cpu.h:23,
>>                  from /home/pm215/qemu/disas.c:8:
>> /home/pm215/qemu/build/all/linux-headers/asm/kvm.h:38:29: fatal error:
>> asm/sve_context.h: No such file or directory
>>  #include <asm/sve_context.h>
>>                              ^
>> compilation terminated.
>>
>> Looks like we need to fix update-linux-headers.sh to account for
>> that new header file before we can do the header sync.
> 
> Ugh. I'll try to figure it out tomorrow.
>

Maybe something like the following?
 
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index c3819d2..67d4d2a 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -121,6 +121,7 @@ for arch in $ARCHLIST; do
         cp "$tmpdir/include/asm/unistd-eabi.h" "$output/linux-headers/asm-arm/"
         cp "$tmpdir/include/asm/unistd-oabi.h" "$output/linux-headers/asm-arm/"
         cp "$tmpdir/include/asm/unistd-common.h" 
"$output/linux-headers/asm-arm/"
+        cp "$tmpdir/include/asm/sve_context.h" "$output/linux-headers/asm-arm/"
     fi
     if [ $arch = x86 ]; then
         cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"