From patchwork Wed Apr 27 11:11:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 8955011 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 948F0BF440 for ; Wed, 27 Apr 2016 11:14:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C87F52022A for ; Wed, 27 Apr 2016 11:14:28 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EEE03200F0 for ; Wed, 27 Apr 2016 11:14:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1avNOE-0003Ia-B5; Wed, 27 Apr 2016 11:12:18 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1avNOD-0003HD-6a for xen-devel@lists.xenproject.org; Wed, 27 Apr 2016 11:12:17 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 98/BA-09532-09E90275; Wed, 27 Apr 2016 11:12:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRWlGSWpSXmKPExsXitHRDpO6EeQr hBo3LuSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozuJ5sYC87xVVzZ2sTcwNjM08XIySEh4C/x +/BnFhCbTUBH4uLcnWxdjBwcIgIqErf3GoCEmQWKJb6u6mMFsYUFMiWaVn8CK2cRUJXY2/yMD cTmFXCRWP+8lxFipK7Eyd2b2EFsTgFXibamCWD1QkA1T2/fYYWoF5Q4OfMJC8R8TYnW7b/ZIW x5ieats5kh6hUl+uc9YIOYyS1x+/RU5gmM/LOQtM9C0j4LSfsCRuZVjOrFqUVlqUW6hnpJRZn pGSW5iZk5uoYGZnq5qcXFiempOYlJxXrJ+bmbGIEByAAEOxh3Pnc6xCjJwaQkyruwXSFciC8p P6UyI7E4I76oNCe1+BCjDAeHkgRv+FygnGBRanpqRVpmDjAWYNISHDxKIrz1c4DSvMUFibnFm ekQqVOMilLivIkgfQIgiYzSPLg2WPxdYpSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjDvAZApPJ l5JXDTXwEtZgJafPmQLMjikkSElFQDI5fhBkmO1TPDcnayT5ay31p+Y9qlqiuNMq0tDy+LdHA yObSpXAn7MP+p9pLjTP7O3p9fxzI5/2OSSCu0fnipxsfqTthGvt1MCvP7l3He7C8OS7vF+9jO dPuObP8PV67PLPqc++1Cvc7UhyFHtnxR2qV4nCFd7kD03Fc2or0vy41ELrbsl+CrVWIpzkg01 GIuKk4EANTWN1e6AgAA X-Env-Sender: prvs=918322aae=roger.pau@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1461755531!11621047!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30122 invoked from network); 27 Apr 2016 11:12:15 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 27 Apr 2016 11:12:15 -0000 X-IronPort-AV: E=Sophos;i="5.24,541,1454976000"; d="scan'208";a="350092147" From: Roger Pau Monne To: Date: Wed, 27 Apr 2016 13:11:43 +0200 Message-ID: <1461755514-23754-6-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 2.6.4 (Apple Git-63) In-Reply-To: <1461755514-23754-1-git-send-email-roger.pau@citrix.com> References: <1461755514-23754-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Wei Liu , Ian Jackson , Roger Pau Monne Subject: [Xen-devel] [PATCH v3 for-4.7 05/16] tools/headers: prevent adding two __align8__ to uint64_t in ARM headers X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Due to the fact that on ARM headers types are substituted to uint64_t and then uint64_t is also substituted to contain the aligment, this would lead to some types containing two __align8__ directives. Fix this by first expanding Xen specific types to uint64_t only, and then replacing all the uint64_t types to __align8__ uint64_t. This relies on the fact that all Xen-specific types will have longer names, so they will always be replaced first. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper Acked-by: Wei Liu Reviewed-by: Doug Goldstein --- Cc: Ian Jackson Cc: Wei Liu --- tools/include/xen-foreign/mkheader.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/include/xen-foreign/mkheader.py b/tools/include/xen-foreign/mkheader.py index 0504cb8..0e42e14 100644 --- a/tools/include/xen-foreign/mkheader.py +++ b/tools/include/xen-foreign/mkheader.py @@ -20,8 +20,8 @@ footer = {}; inttypes["arm32"] = { "unsigned long" : "__danger_unsigned_long_on_arm32", "long" : "__danger_long_on_arm32", - "xen_pfn_t" : "__align8__ uint64_t", - "xen_ulong_t" : "__align8__ uint64_t", + "xen_pfn_t" : "uint64_t", + "xen_ulong_t" : "uint64_t", "uint64_t" : "__align8__ uint64_t", }; header["arm32"] = """ @@ -41,8 +41,8 @@ footer["arm32"] = """ inttypes["arm64"] = { "unsigned long" : "__danger_unsigned_long_on_arm64", "long" : "__danger_long_on_arm64", - "xen_pfn_t" : "__align8__ uint64_t", - "xen_ulong_t" : "__align8__ uint64_t", + "xen_pfn_t" : "uint64_t", + "xen_ulong_t" : "uint64_t", "uint64_t" : "__align8__ uint64_t", }; header["arm64"] = """