From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08CECC04AB4 for ; Tue, 21 May 2019 08:41:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D56102173C for ; Tue, 21 May 2019 08:41:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D56102173C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:48960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hT0Ko-0002cy-6D for qemu-devel@archiver.kernel.org; Tue, 21 May 2019 04:41:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hT0JX-0001o0-LG for qemu-devel@nongnu.org; Tue, 21 May 2019 04:40:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hT0JW-00085R-Dm for qemu-devel@nongnu.org; Tue, 21 May 2019 04:40:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44278) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hT0JV-000835-LK; Tue, 21 May 2019 04:40:01 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F376D3092676; Tue, 21 May 2019 08:39:57 +0000 (UTC) Received: from gondolin (ovpn-204-120.brq.redhat.com [10.40.204.120]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CA94100200D; Tue, 21 May 2019 08:39:55 +0000 (UTC) Date: Tue, 21 May 2019 10:39:51 +0200 From: Cornelia Huck To: Christian Borntraeger Message-ID: <20190521103951.1464e2c2.cohuck@redhat.com> In-Reply-To: <204b779b-7c9a-4fe1-3923-5ffa100c623b@de.ibm.com> References: <20190520170302.13643-1-cohuck@redhat.com> <20190520210018.6c4491b3.cohuck@redhat.com> <204b779b-7c9a-4fe1-3923-5ffa100c623b@de.ibm.com> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 21 May 2019 08:39:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [qemu-s390x] [PULL 00/54] s390x update X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-s390x , QEMU Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 21 May 2019 09:20:15 +0200 Christian Borntraeger wrote: > On 20.05.19 21:00, Cornelia Huck wrote: > > On Mon, 20 May 2019 18:30:46 +0100 > > Peter Maydell wrote: > > > >> On Mon, 20 May 2019 at 18:03, Cornelia Huck 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 > >> ^ > >> 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/" > Yes, but needs to go under arm64 (not arm). Could find no other instances of new includes, hopefully we're all fine with that (currently building, but don't have an arm machine for build testing handy.)