From patchwork Thu May 31 17:15:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 137435 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp6879149lji; Thu, 31 May 2018 10:46:49 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKFyiMQkhNqq2TxXZPqPTp7etWw2/6d3F3CfSBAbzPY3VuOunKSQuwi7+qL68K5LEemKbDa X-Received: by 2002:ac8:24d4:: with SMTP id t20-v6mr7508610qtt.30.1527788809310; Thu, 31 May 2018 10:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527788809; cv=none; d=google.com; s=arc-20160816; b=ziRYXD1Y2+qxtlswGwavVTR+cO/DLmy6tAkLiIu2PyR7seI3KINAt87RZzZxZGCFj3 ojlx0c2cJrJqjqIhQfIixZ87J8IAIEWDZcOeTYOiyNym6hN499lu0NVuRFxhnGUxH8Mt tOYg+fdYr1TIiEdU32+vOlxSrbwV466f2qDO7bQfumGnsKdPqN+z1IzFDydiPkxhmxLj iD/EjGcTlkWk8mky1jim8StkqeuypXmGplScLyz4yYm9gAJu+1e7AgIT5pUtzDIwjjWn AIi4FFkQhyzijMF07WNnIl7cDrJITrvRqVhap4Vg0yfm9v+cvdYclqE1mDIGfszsEiq0 07YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=uLvsx62C8Bit896F8pyQetaWiHpLckyusaHZOA/rEOo=; b=BSmZrChtCqiLD3O19d23X5R1beTZ4WpFvnn89fwCAHKgPslx1Ars89vtdRLe/h/7hX o+BPk246TItS5FD5AxeA/Hujfb5rh7r9b28V5oIT2q9cZBGKiSdmHmpHgUnGTyUyeJTx ccTHLx6siTktg4hJDBwXHD9QC3aCIStRBQs7weIMcYpSJ9sBORKlRZe6XPl7OMCz1kQz DMIYtlX8PfI8Z7Ve++ulF7zOk0m3cJb+pyQFNCoLWXaf185kSlDq7ZxrRP3sINgsrn2P 74AjI/AZTyQ+ewOKPvnoZ/y8tg0oDKyBAaPjbV+NS8oT2IcaCSww+f0Mxa6sprLkGnV+ OA3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q15-v6si307919qtn.118.2018.05.31.10.46.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 31 May 2018 10:46:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:45441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fORey-0004Az-Q8 for patch@linaro.org; Thu, 31 May 2018 13:46:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fORBQ-0006Ha-IS for qemu-devel@nongnu.org; Thu, 31 May 2018 13:16:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fORBP-0003yz-LE for qemu-devel@nongnu.org; Thu, 31 May 2018 13:16:16 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57506 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 1fORBP-0003xS-Fs for qemu-devel@nongnu.org; Thu, 31 May 2018 13:16:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2F3837D83A for ; Thu, 31 May 2018 17:16:15 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-47.ams2.redhat.com [10.36.117.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id B597539D63 for ; Thu, 31 May 2018 17:16:14 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 31 May 2018 19:15:56 +0200 Message-Id: <20180531171606.21604-5-pbonzini@redhat.com> In-Reply-To: <20180531171606.21604-1-pbonzini@redhat.com> References: <20180531171253.21012-1-pbonzini@redhat.com> <20180531171606.21604-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 31 May 2018 17:16:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 31 May 2018 17:16:15 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@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] [PULL 43/53] scripts/update-linux-headers: Handle __aligned_u64 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell We'll currently replace any 'u64' with a 'uint64_t' including when it's embedded in an '__aligned_u64', creating a '__aligned_uint64_t' which doesn't exist. We need to instead expand out the kernel's definition of __aligned_u64: #define __aligned_u64 __u64 __attribute__((aligned(8))) before we convert the __u64 to uint64_t. Signed-off-by: Peter Maydell Message-Id: <20180525132755.21839-3-peter.maydell@linaro.org> Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- scripts/update-linux-headers.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.0 diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 947dec2852..1fe54f8ab1 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -51,7 +51,8 @@ cp_portable() { fi header=$(basename "$f"); - sed -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \ + sed -e 's/__aligned_u64/__u64 __attribute__((aligned(8)))/g' \ + -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \ -e 's/u\([0-9][0-9]*\)/uint\1_t/g' \ -e 's/__s\([0-9][0-9]*\)/int\1_t/g' \ -e 's/__le\([0-9][0-9]*\)/uint\1_t/g' \