From nobody Sat Oct 25 23:33:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521579863441272.8852870321117; Tue, 20 Mar 2018 14:04:23 -0700 (PDT) Received: from localhost ([::1]:51728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyOQg-0006q3-Ny for importer@patchew.org; Tue, 20 Mar 2018 17:04:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyONa-0004wi-Rk for qemu-devel@nongnu.org; Tue, 20 Mar 2018 17:01:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyONW-0007Hh-2S for qemu-devel@nongnu.org; Tue, 20 Mar 2018 17:01:10 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34006 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eyONV-0007HK-UF for qemu-devel@nongnu.org; Tue, 20 Mar 2018 17:01:06 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 68F1FEB700; Tue, 20 Mar 2018 21:01:05 +0000 (UTC) Received: from redhat.com (ovpn-125-54.rdu2.redhat.com [10.10.125.54]) by smtp.corp.redhat.com (Postfix) with SMTP id EA4EC202322F; Tue, 20 Mar 2018 21:01:04 +0000 (UTC) Date: Tue, 20 Mar 2018 23:01:04 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1521579652-180248-2-git-send-email-mst@redhat.com> References: <1521579652-180248-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1521579652-180248-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 20 Mar 2018 21:01:05 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 20 Mar 2018 21:01:05 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mst@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v4 1/3] update-linux-headers.sh: add unistd.h and kvm on MIPS 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 , James Hogan , Cornelia Huck , Roman Kagan , Marcel Apfelbaum , Paolo Bonzini , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rework the update script slightly, add the unistd.h header and its dependencies on all architectures. This also removes the IA64 and MIPS from a KVM blacklist: Linux dropped IA64, and there was never a reason to exclude MIPS from kvm specifically - it was excluded due to dependency of its unistd.h on sgidefs.h, which we also import. Signed-off-by: Michael S. Tsirkin --- scripts/update-linux-headers.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers= .sh index d18e2f1..2a4dac8a 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -80,11 +80,6 @@ for arch in $ARCHLIST; do continue fi =20 - # Blacklist architectures which have KVM headers but are actually dead - if [ "$arch" =3D "ia64" -o "$arch" =3D "mips" ]; then - continue - fi - if [ "$arch" =3D x86 ]; then arch_var=3DSRCARCH else @@ -95,9 +90,18 @@ for arch in $ARCHLIST; do =20 rm -rf "$output/linux-headers/asm-$arch" mkdir -p "$output/linux-headers/asm-$arch" - for header in kvm.h kvm_para.h unistd.h; do + for header in unistd.h bitsperlong.h; do + cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" + done + + for header in kvm.h kvm_para.h; do cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" done + + if [ $arch =3D mips ]; then + cp "$tmpdir/include/asm/sgidefs.h" "$output/linux-headers/asm-mips= /" + fi + if [ $arch =3D powerpc ]; then cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm= -powerpc/" fi @@ -120,6 +124,10 @@ EOF cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x= 86/" cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x8= 6/" fi + if [ $arch =3D s390 ]; then + cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-ar= m/" + cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-ar= m/" + fi done =20 rm -rf "$output/linux-headers/linux" @@ -130,7 +138,7 @@ for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.= h \ done rm -rf "$output/linux-headers/asm-generic" mkdir -p "$output/linux-headers/asm-generic" -for header in kvm_para.h; do +for header in kvm_para.h bitsperlong.h unistd.h; do cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-ge= neric" done if [ -L "$linux/source" ]; then --=20 MST