From nobody Mon May 13 01:33:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1687852629; cv=none; d=zohomail.com; s=zohoarc; b=EX/CDgqzgRERqJhiyXdadEIit4vtcIdo+iWKLzlgRwJbcg1AioJ38eAP8+yzDJAGr7ghcG/JIZ/r0SShXFhZdeFCk75ssOo4tVCHfWAmqGXLaspTqfMAn1PCJuckj/Q6HiCzEy+kA5c9KndlK92ykIL5xlAC/uiMM0wUhel+u4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687852629; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y2eBeNrI+GlU4nUbbRHGIPs1QQNm4UhqTlsvWT4y7CY=; b=GfNLwt37nLlSOL+Se0E1xKXoZsw+6p+iQNteM0YYFlqwH3ybQ7f3rWq3+Aa3sOjqy9Vk3wIvikVybCTf1jX453pD81heIMaYskAw78oDbum1AsLpwf+hxVb+PrecKYztbVh1WGHkqpXj+7FkdR7YCpLvujyH5jOfwfnQYBd8GNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1687852628998302.4392539523054; Tue, 27 Jun 2023 00:57:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.555902.868105 (Exim 4.92) (envelope-from ) id 1qE3Z2-0000RP-Ix; Tue, 27 Jun 2023 07:56:40 +0000 Received: by outflank-mailman (output) from mailman id 555902.868105; Tue, 27 Jun 2023 07:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qE3Z2-0000PY-Ea; Tue, 27 Jun 2023 07:56:40 +0000 Received: by outflank-mailman (input) for mailman id 555902; Tue, 27 Jun 2023 07:56:39 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qE3Z1-0008Ub-7a for xen-devel@lists.xenproject.org; Tue, 27 Jun 2023 07:56:39 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 23ce6c26-14c0-11ee-b237-6b7b168915f2; Tue, 27 Jun 2023 09:56:37 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 23ce6c26-14c0-11ee-b237-6b7b168915f2 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1687852598; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=k1fxdFveWZOwPq//vleO1HJJOO6CSm3z/ztSLPP21Wo=; b=YyvF46bSiDdKRMk+88YQjFJdS1ersHFXC9YoYTu/T39oc+F6nGovFhUU uHywfmdfGV9FX9sYaq9Z4I/Pll0HxHlqmhxrqEDhwhx1tTyg21XfPcsr1 EKDF5ejNTxA8WYZSwpR+aU+fbdijn/PlAP2j2kQzno0z4eI+XEH0DO8oG g=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 4.0 X-MesageID: 113007171 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.123 X-Policy: $RELAYED IronPort-Data: A9a23:ocFjo6ATnRO1ZBVW/ynkw5YqxClBgxIJ4kV8jS/XYbTApGlz1DRTy mNOXWjVO/rbYWTzKdwlaNu3/BkFuZTUzdNrQQY4rX1jcSlH+JHPbTi7wuUcHAvJd5GeExg3h yk6QoOdRCzhZiaE/n9BCpC48T8nk/nOHuGmYAL9EngZbRd+Tys8gg5Ulec8g4p56fC0GArIs t7pyyHlEAbNNwVcbCRMsspvlDs15K6p4G1C4QRnDRx2lAS2e0c9Xcp3yZ6ZdxMUcqEMdsamS uDKyq2O/2+x13/B3fv8z94X2mVTKlLjFVDmZkh+AsBOsTAbzsAG6Y4pNeJ0VKtio27hc+ada jl6ncfYpQ8BZsUgkQmGOvVSO3kW0aZuoNcrLZUj2CA6IoKvn3bEmp1T4E8K0YIw1LpuGn9P/ KwkAykqTA2vi8K5+6KbVbw57igjBJGD0II3v3hhyXfSDOo8QICFSKLPjTNa9G5u3IYUR6+YP pdHL2M1N3wsYDUWUrsTILs4kP2lmT/UdDpApUjOjaE2/3LS3Ep6172F3N/9I4XRHZ0KxxnBz o7A12/nWygbBeWd8xGqtXSGl8HklyrHVLtHQdVU8dY12QbOlwT/EiY+RVa95PW0lEO6c9ZeM FAPvDojq7Ao806mRcW7WAe3yFaNuh8HR9NRCas08giLwavPyxmVDS4PSTspQN4sudIyRDcq/ kSUhN6vDjtq2JWOUm6U/LqQqTK0OAAWIHUEaCtCShEKi/H8pKkjgxSJScxseIa3k9n0FDfY0 z2M6i8kiN07s8kP0Kmq+EHdtBilrJPJUw0d6x3eWySu6QYRTISofZCy4F7Xq/NJNp+ET0Kpt WIB3cOZ6YgmB5aHnj2AW+UJEbSg4d6KNTTdhRhkGJxJ3z+q/Xikf4xZ/jBlDEhsO8cAPzTuZ Sf7vgdc54RSPT2pcLVwaIKyDOwlyKHhEZLuUfW8RsFHZJFqaAac/SZGf0eIw2f3nU4jkKcyN I2ad8nqBnEfYYx71De/Xfwa15cxzzgiwnneQ5/6yRmqy7uYazieTrJtDbeVRrlntuXe+lyTq osBcZLQkH2zTdESfAH5rZcIM1EDfUQQHLfUtuBbVuG4Mip5TTRJ5+Dq/V8xR2B0t/0LxriYo yjtABEwJEnX3iOed1jTApx3QPa2BMsk8ypmVcA5FQzws0XPd7pD+0v2m3EfWbA8vNJuwvdvJ xXuU5XRW68fItgrFtl0UHUckGCBXE7x7e52F3D5CAXThrY5L+AzxvfqfxH06A4FBTetuM01r tWIj12LHspbG1g7XZmONppDKm9dWlBHwopPs7bgeIEPKC0ADqA0Q8AOshPHC55VckiSrtdr/ w2XHQ0ZtYHwT3wdqbH0aVS/h97xSYNWRxMKd1Q3GJ7qbUE2CEL/m94fOAtJFBiBPF7JFFKKP 7oJlKCta6RXwT6nceNUSt5W8E733PO3z5cy8+iuNCyjg4iDYl+4HkS74A== IronPort-HdrOrdr: A9a23:Kijq1KzoqX54I12jwYdiKrPwFr1zdoMgy1knxilNoHtuA6+lfq GV/MjzsCWetN9/Yh4dcLy7VJVoIkm8yXcW2/h1AV7KZmCP0gaVxepZg7cKrQeQfBHWx6pw0r phbrg7KPCYNykdsS+D2njbLz/4+qjizJyV X-Talos-CUID: =?us-ascii?q?9a23=3AoupztWkRvEPokZWYViDHhtJ4QSTXOVOB1WzOIkb?= =?us-ascii?q?oNU1wb5+IZVOw95h0s9U7zg=3D=3D?= X-Talos-MUID: 9a23:YvC48AR42OW4cmeXRXTnmmhbNfZR4Z6FJwcLu4QokMONCSBJbmI= X-IronPort-AV: E=Sophos;i="6.01,161,1684814400"; d="scan'208";a="113007171" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , Alistair Francis , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Bertrand Marquis , Bob Eshleman , Connor Davis , Oleksii Kurochko , Shawn Anastasio , Timothy Pearson Subject: [PATCH v2 1/3] xen/types: Drop #ifdefary for __{SIZE,PTRDIFF}_TYPE__ Date: Tue, 27 Jun 2023 08:56:16 +0100 Message-ID: <20230627075618.1180248-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230627075618.1180248-1-andrew.cooper3@citrix.com> References: <20230627075618.1180248-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1687852630924100003 All supported compilers have these types. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Alistair Francis Acked-by: Julien Grall Reviewed-by: Oleksii Kurochko --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Bob Eshleman CC: Alistair Francis CC: Connor Davis CC: Oleksii Kurochko CC: Shawn Anastasio CC: Timothy Pearson https://godbolt.org/z/Y6PWcd6js --- xen/include/xen/types.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h index 6aba80500aaf..8b22a02eeaa4 100644 --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -5,18 +5,11 @@ =20 #include =20 -#if defined(__SIZE_TYPE__) typedef __SIZE_TYPE__ size_t; -#else -typedef unsigned long size_t; -#endif + typedef signed long ssize_t; =20 -#if defined(__PTRDIFF_TYPE__) typedef __PTRDIFF_TYPE__ ptrdiff_t; -#else -typedef signed long ptrdiff_t; -#endif =20 #define BITS_TO_LONGS(bits) \ (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) --=20 2.30.2 From nobody Mon May 13 01:33:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1687852627; cv=none; d=zohomail.com; s=zohoarc; b=AhbMXxgGsy/eQgFrefNJQiFRebxnmarQIaecsAfDDaNrU32tJYQBUqjxd6UpqEk02bfj5a3iT4CxwOoz+ItpcsuVZZRjpZXwGgnu1ixE29ek+se5mGtNhXCjyWUbJUMEKYx+UK6xEA0WhsYSGY8crDuH1EM2CDh9qnXDxtXgLqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687852627; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K0UFIVF0hJ47L6+qurR0uhRBSacepJDirT6vmcCKsLI=; b=BWksZGLwGMPW/EmssTKYTv9FAKfqWuexN5Kdxtyp5wqFYGJ20dlHGbao/nVS4WZ/b9NCsrjT5jmGsGJtXQM0FUvwsH8e8eCZV3lgWVBy5DYuUEWVjN7AOmibMtKLMEEQIGi8/24dwHPX98L32XCvnCDDaUypp1frCFh1ObLowl4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1687852627716344.1661319686276; Tue, 27 Jun 2023 00:57:07 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.555900.868088 (Exim 4.92) (envelope-from ) id 1qE3Z0-0008TW-QN; Tue, 27 Jun 2023 07:56:38 +0000 Received: by outflank-mailman (output) from mailman id 555900.868088; Tue, 27 Jun 2023 07:56:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qE3Z0-0008TP-MV; Tue, 27 Jun 2023 07:56:38 +0000 Received: by outflank-mailman (input) for mailman id 555900; Tue, 27 Jun 2023 07:56:37 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qE3Yz-0008EH-3z for xen-devel@lists.xenproject.org; Tue, 27 Jun 2023 07:56:37 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2149129d-14c0-11ee-8611-37d641c3527e; Tue, 27 Jun 2023 09:56:34 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2149129d-14c0-11ee-8611-37d641c3527e DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1687852594; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rEzOoITBgpwDiJCCnFkjnD9qLBpCoNJN36r0v427lIA=; b=fTjuJmOv38lw2906L0YVrn6/PdXBh6z/rWCbpVl1x86dMVdv5BVaflu3 NGYtDBGONqHBiu5SHsblhQzOTog43oLqVBTrKLyJW5Za+1XeedWsMBk7a 0O/+KR5FoanQhfhRGA1di3o/XyRjkrbJZFGXvCvFzP9ib6ilZPwvBTJNl c=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 4.0 X-MesageID: 116835822 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.123 X-Policy: $RELAYED IronPort-Data: A9a23:YpLqrqjc6qMw0z17sc7c9YAuX161YBcKZh0ujC45NGQN5FlHY01je htvWWqHbPneYDHwet52PYm2oUkG78LdnNMxTgU5qX9hQyob9cadCdqndUqhZCn6wu8v7q5Ex 55HNoSfdpBcolv0/ErF3m3J9CEkvU2wbuOgTrWCYmYpHlUMpB4J0XpLg/Q+jpNjne+3CgaMv cKai8DEMRqu1iUc3lg8sspvkzsx+qyr0N8klgZmP6sT4gWBzyB94K83fsldEVOpGuG4IcbiL wrz5OnR1n/U+R4rFuSknt7TGqHdauePVeQmoiM+t5mK2nCulARrukoIHKN0hXNsoyeIh7hMJ OBl7vRcf+uL0prkw4zxWzEAe8130DYvFLXveRBTuuTLp6HKnueFL1yDwyjaMKVBktubD12i+ tQUMRMEbDuNpNi3xbKWGuhHnN8NFNvSadZ3VnFIlVk1DN4jSJHHBa7L+cVZzHE7gcUm8fT2P pRDL2A1NVKZPkMJYw1MYH49tL7Aan3XWjtUsl+K44Ew5HDe1ldZ27nxKtvFPNeNQK25m27B/ zyWpDmpWEty2Nq3+Dq3tUyllLLztyq4Qp4gNpizzvI7uQjGroAUIEJPDgbqyRWjsWauVtQaJ 0EK9y4Gqakp6FftXtT7Rwe/onOPolgbQdU4O88Q5RyJy6HUyx2EHWVCRTlEAPQ9r9M/TzEu0 l6PnvvqCCZpvbnTTmiSnp+LqRuiNC5TKnUNDQcGUA8E7t/LsIw1yBXVQb5LLqmxidHkHCDq9 BqDpiM+mrY7gNYC0uOw+lWvqzihvITTRwg5oADeRHu47xhRbZSgIYev7DDz5PJBN5qQT0PHs mINncOf98gRAZrLnyuIKM0HG7uj9vueMDnRhFdpN5Yk/jWpvXWkeOh46zZ4IkBrPs8aeCTBb 0rauAcX75hWVFOtaaJ0eIOwTcc316/rFdfifv/RZ9tKJJN2cWev5yhobFWM1nvsl2A2mLkjP o2Wd8mtC3sXE6Vhw3y9QOJ1+aMzyykk3mTVbYry1wigy7eYa3+TRLofMV2BKOs+6cu5TB79q ogFcZHQklMGDbO4O3OMmWIOEbwUBXQiJpn0gMJ0TO+GIic2GUo7ENHp04p0LuSJgJ9pevf0E mCVAxEIlwqi3C2dd21meVg4NuqxAM8XQWYTeHV1YA32gyVLjZOHtv93SnchQVUwGAWPJ9ZQR uJNRciPC+8npt/vq2VENsmVQGCPmX2WaeOy08mNOmJXk2ZIHVChxzMdVlKHGNMyJiS2r9Aih LaryxnWR5EOLyw7UpaJOKrzkwrg4iBD8A6XY6cvCoMJEHgADaAwc3Ch5hPJC59kxer/Ksuyi F/NXEZwSRjlqI4p6tjZ7Z1oXK/we9aS6nFyRjGBhZ7vbHmyw4ZW6dMYOAp+VWyHBTycFWTLT bk98swQx9VdwwoR4tsnSuY2pU/8jvO2z4JnIs1fNC2jRzyW5nlIeBFqAeEnWnVx+4Jk IronPort-HdrOrdr: A9a23:GoMyK6vWN7l6iQQ81LNKJ8rN7skDYdV00zEX/kB9WHVpm6uj9/ xG/c576faQsl16ZJhOo6HjBED+ewK4yXcY2+Qs1NSZMjUO2lHYT72KhLGKqwEIcBeQygcy78 tdmqFFebnNMWQ= X-Talos-CUID: 9a23:bInOcWC/HH6s1u36EyV+10cWMc4GSHzYzFqAImSiEkhRWoTAHA== X-Talos-MUID: 9a23:alGz8grotK85Rv15lTcezwBiBoBW6rbzNGoE0o8aieuhPhR8ag7I2Q== X-IronPort-AV: E=Sophos;i="6.01,161,1684814400"; d="scan'208";a="116835822" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Bertrand Marquis , Bob Eshleman , Alistair Francis , Connor Davis , "Oleksii Kurochko" , Shawn Anastasio , Timothy Pearson Subject: [PATCH v2 2/3] treewide: Avoid including asm/types.h Date: Tue, 27 Jun 2023 08:56:17 +0100 Message-ID: <20230627075618.1180248-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230627075618.1180248-1-andrew.cooper3@citrix.com> References: <20230627075618.1180248-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1687852629039100001 We're about to rearrange the common and arch types.h split. While most users already include , a few do not and some files fail to compile as a result. Almost all logic is going to have types very early in the include chain. D= rop the include entirely from C files, and swap to the common types.h in header= s. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Julien Grall --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Bob Eshleman CC: Alistair Francis CC: Connor Davis CC: Oleksii Kurochko CC: Shawn Anastasio CC: Timothy Pearson --- v2: New xen/arch/arm/arm64/lib/find_next_bit.c | 2 +- xen/arch/x86/cpu/mcheck/mce.h | 1 - xen/arch/x86/cpu/vpmu.c | 1 - xen/arch/x86/cpu/vpmu_intel.c | 1 - xen/arch/x86/hvm/hvm.c | 1 - xen/arch/x86/hvm/vmx/vvmx.c | 1 - xen/arch/x86/include/asm/byteorder.h | 2 +- xen/arch/x86/include/asm/hvm/svm/svmdebug.h | 2 +- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 3 ++- xen/arch/x86/include/asm/io_apic.h | 3 ++- xen/arch/x86/include/asm/page.h | 2 +- xen/arch/x86/include/asm/processor.h | 1 - xen/arch/x86/include/asm/x86_64/page.h | 2 +- xen/arch/x86/mm/p2m-ept.c | 1 - xen/common/trace.c | 1 - xen/drivers/char/arm-uart.c | 2 +- xen/include/xen/bitops.h | 2 +- xen/include/xen/spinlock.h | 3 ++- 18 files changed, 13 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/arm64/lib/find_next_bit.c b/xen/arch/arm/arm64/li= b/find_next_bit.c index 8ebf8bfe973c..ca6f82277e77 100644 --- a/xen/arch/arm/arm64/lib/find_next_bit.c +++ b/xen/arch/arm/arm64/lib/find_next_bit.c @@ -9,7 +9,7 @@ * 2 of the License, or (at your option) any later version. */ #include -#include + #include =20 #ifndef find_next_bit diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index bea08bdc7464..dd5d258362e6 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -7,7 +7,6 @@ #include #include =20 -#include #include #include =20 diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index f31c32bcf3a6..a022126f18fd 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index 35e350578b84..ab122b22f3ac 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a67ef79dc003..57363c2ae124 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 1034534c977b..16b0ef82b6c8 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -10,7 +10,6 @@ =20 #include =20 -#include #include #include #include diff --git a/xen/arch/x86/include/asm/byteorder.h b/xen/arch/x86/include/as= m/byteorder.h index 1f77e502a528..e935f7b2b03b 100644 --- a/xen/arch/x86/include/asm/byteorder.h +++ b/xen/arch/x86/include/asm/byteorder.h @@ -1,7 +1,7 @@ #ifndef __ASM_X86_BYTEORDER_H__ #define __ASM_X86_BYTEORDER_H__ =20 -#include +#include #include =20 static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) diff --git a/xen/arch/x86/include/asm/hvm/svm/svmdebug.h b/xen/arch/x86/inc= lude/asm/hvm/svm/svmdebug.h index f1cde676dca1..2fb76ec24c76 100644 --- a/xen/arch/x86/include/asm/hvm/svm/svmdebug.h +++ b/xen/arch/x86/include/asm/hvm/svm/svmdebug.h @@ -8,7 +8,7 @@ #ifndef __ASM_X86_HVM_SVM_SVMDEBUG_H__ #define __ASM_X86_HVM_SVM_SVMDEBUG_H__ =20 -#include +#include #include =20 void svm_sync_vmcb(struct vcpu *v, enum vmcb_sync_state new_state); diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/= asm/hvm/vmx/vmx.h index 36c108d8797d..c84acc221daa 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -8,7 +8,8 @@ #define __ASM_X86_HVM_VMX_VMX_H__ =20 #include -#include +#include + #include #include #include diff --git a/xen/arch/x86/include/asm/io_apic.h b/xen/arch/x86/include/asm/= io_apic.h index ef0878b09e24..bd8cb95f46b1 100644 --- a/xen/arch/x86/include/asm/io_apic.h +++ b/xen/arch/x86/include/asm/io_apic.h @@ -1,7 +1,8 @@ #ifndef __ASM_IO_APIC_H #define __ASM_IO_APIC_H =20 -#include +#include + #include #include #include diff --git a/xen/arch/x86/include/asm/page.h b/xen/arch/x86/include/asm/pag= e.h index b585235d064a..3647bb1260c2 100644 --- a/xen/arch/x86/include/asm/page.h +++ b/xen/arch/x86/include/asm/page.h @@ -9,7 +9,7 @@ #define PAGE_ORDER_1G 18 =20 #ifndef __ASSEMBLY__ -# include +# include # include #endif =20 diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/as= m/processor.h index f983ff501d95..3b3cf51814f8 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #endif diff --git a/xen/arch/x86/include/asm/x86_64/page.h b/xen/arch/x86/include/= asm/x86_64/page.h index 26bdb4b19bb9..53faa7875baf 100644 --- a/xen/arch/x86/include/asm/x86_64/page.h +++ b/xen/arch/x86/include/asm/x86_64/page.h @@ -19,7 +19,7 @@ static inline unsigned long canonicalise_addr(unsigned lo= ng addr) return addr & ~CANONICAL_MASK; } =20 -#include +#include =20 #include =20 diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index ffd34a1cc65f..85c4e8e54f66 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/common/trace.c b/xen/common/trace.c index df4a719e4b43..17d62f70561f 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -16,7 +16,6 @@ * it's possible to reconstruct a chronological record of trace events. */ =20 -#include #include #include #include diff --git a/xen/drivers/char/arm-uart.c b/xen/drivers/char/arm-uart.c index eeb9ceefc06a..8098a968c285 100644 --- a/xen/drivers/char/arm-uart.c +++ b/xen/drivers/char/arm-uart.c @@ -18,7 +18,7 @@ */ =20 #include -#include + #include #include #include diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 33619a0873fe..4cd0310789b5 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -1,6 +1,6 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H -#include +#include =20 /* * Create a contiguous bitmask starting at bit position @l and ending at diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index ca40c71c88f9..0a02a527dc59 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -2,9 +2,10 @@ #define __SPINLOCK_H__ =20 #include +#include + #include #include -#include =20 #define SPINLOCK_CPU_BITS 12 =20 --=20 2.30.2 From nobody Mon May 13 01:33:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1687852622; cv=none; d=zohomail.com; s=zohoarc; b=W1KZzWBnF/WZM01ufXAul35zMEZfrnJlA041ibxwexSMf3i6DlZ+gsI8jAmG/TUpCjhJWM2nOEUkJL6d2qLUHwPsJkc1/gZxkmcjKrTKe4ikv1V6B7m+Muollq44lNrsFb3qq5Zr87rQ94QrAaeR3f2/LBi/j4SWGJUgNbQz2xg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687852622; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9Uota2q+nRr4qj1/SxF419YsyoY1simC68MTutrTpXw=; b=U3X7fqzLym/wU1G2oN95kg4AWx229+8nBMW3vP8WZqTRY1PhzHYE3PS3eMzGB5GyWc8ROSnltb5ttQ+ShAKOa9Y87ymhYRSfCVqtkBFQrEszcYi6sORMsXbcBWvrcpEhEQZR8Us+xZdF+171DcEUjG6v08NDY5uvhNX5QZsaD8s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1687852622481954.4442512204846; Tue, 27 Jun 2023 00:57:02 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.555901.868098 (Exim 4.92) (envelope-from ) id 1qE3Z2-0000IM-1i; Tue, 27 Jun 2023 07:56:40 +0000 Received: by outflank-mailman (output) from mailman id 555901.868098; Tue, 27 Jun 2023 07:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qE3Z1-0000I6-Ue; Tue, 27 Jun 2023 07:56:39 +0000 Received: by outflank-mailman (input) for mailman id 555901; Tue, 27 Jun 2023 07:56:38 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qE3Z0-0008EH-Bw for xen-devel@lists.xenproject.org; Tue, 27 Jun 2023 07:56:38 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2351cd2f-14c0-11ee-8611-37d641c3527e; Tue, 27 Jun 2023 09:56:35 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2351cd2f-14c0-11ee-8611-37d641c3527e DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1687852596; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WF6+MO8uRCqSL2DrFswTeiveqvFOb1H6UCIU4GeCi+k=; b=ID0vt8raTQrK7znBArIqamxjI2dz+ivQuK1r4OxRFDCNJNf81eoruraf fjO4sqaJTzYOP+5dVG0Q36lt1s4v+KCYznoA4OI2lwsyYvPjnBqocyl+U mudhIXa9cyjIpV6kawKkm6G7yZZ5c8jCYlBDyR/q60gD4KBpjvp9ez1Cb 4=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 4.0 X-MesageID: 113007169 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.123 X-Policy: $RELAYED IronPort-Data: A9a23:dl2UWqAVKAkIVRVW/w7kw5YqxClBgxIJ4kV8jS/XYbTApDgn02QBz 2AXUT3UP/eLZGX2Kd13aIu/9U1XvpXQn4M1QQY4rX1jcSlH+JHPbTi7wuUcHAvJd5GeExg3h yk6QoOdRCzhZiaE/n9BCpC48T8nk/nOHuGmYAL9EngZbRd+Tys8gg5Ulec8g4p56fC0GArIs t7pyyHlEAbNNwVcbCRMsspvlDs15K6p4G1C4QRnDRx2lAS2e0c9Xcp3yZ6ZdxMUcqEMdsamS uDKyq2O/2+x13/B3fv8z94X2mVTKlLjFVDmZkh+AsBOsTAbzsAG6Y4pNeJ0VKtio27hc+ada jl6ncfYpQ8BZsUgkQmGOvVSO3kW0aZuoNcrLZUj2CA6IoKvn3bEmp1T4E8K0YIwyLwtB2gXr /0idhc1Zwusnfnn+7zmY7w57igjBJGD0II3v3hhyXfSDOo8QICFSKLPjTNa9G5u3IYUR6+YP pdHL2M1N3wsYDUWUrsTILs4kP2lmT/UdDpApUjOjaE2/3LS3Ep6172F3N/9I4XRHZ0KxxjJz o7A133WXxEkLsCw8jrf1Cnro6jGtCjBXp1HQdVU8dY12QbOlwT/EiY+RVa95PW0lEO6c9ZeM FAPvDojq7Ao806mRcW7WAe3yFamlBMBX9tbE8Uh9RqAjKHT5m6xHXMYRzRMbNgnss4eRjEw0 FKN2dTzClRHr7m9WX+bsLCOoluaOzURLGIETT8JS00C+daLiL80ihXDX9NyCpmfh9f+GSzz6 z2SpS14jLIW5eYB2r+n51nBj3Spr4LQUw8uzgzNWySu6QYRTIehZpe04FnBq/haJYCST0Kpo 3QP3cOZ6YgmB5aHnj2AW+UJEbSg4d6KNTTdhRhkGJxJ3z+q/Xikf4xZ/jBlDEhsO8cAPzTuZ Sf7vgdc54RSPT2pcLVwaIKyDOwlyKHhEZLuUfW8RsFHZJFqaAac/SZGf0eIw2f3nU4jkKcyN I2ad8nqBnEfYYx71De/Xfwa15cxzzgiwnneQ5/6yRmqy7uYazieTrJtGEGJZO0j8KTCqgza9 d9FPuOA1hpEXevxJCLQ9OYuwUsidCZhQ8qs8ooOK7DFe1A9cI08NxPP6YF7IYpsxv5UrLnvx nimdVVDmWHx2FSSfG1mdUtfhKPTsYdX9CxrYnxxZAbyhRDPcq70sv5BKsJfka0PsbU6kKUqF 6Rtl9CoWKwnd9jRx9gKgXARRqRGfQ/juw+BNjHNjNMXL885HFyhFjMJk2LSGMgy4smf75FWT 0WIjF+zfHb6b10K4DzqQPyu1UitmnMWhfh/WUDFSvEKJhWzoNA2d3Wg0adpSy3pFfkk7mHAv zt6/D9C/bWdy2PL2IehaV+4Q3eBTLIlQxsy85jz5reqLyjKlldPMqcZONtkiQv1DTuukI37P LU98h0JGKFf9Lq8m9YmQukDIGNXz4eHmoK2OSw+QymQPgXwU+M9SpREtOEW3pBwKnZikVPec iqyFhNyZd1l5OuN/IYtGTcY IronPort-HdrOrdr: A9a23:S+hlBa4Sx2du2tLjMwPXwPLXdLJyesId70hD6qkXc203TiX4ra CTdZEgviMc5wx/ZJhNo7y90cq7IE80l6QFhLX5VI3KNGOKhILCFu9fBOXZslrdMhy72ulB1b pxN4hSYeeAa2SS9fyKgjVQyuxQpOW6zA== X-Talos-CUID: 9a23:DWPtTm+/WLEwxpVg8uKVv3xOQMYsKyfc9in3G0ajJnxyGYabFHbFrQ== X-Talos-MUID: 9a23:/EgCkwvHh68B5MyQoM2nnR4/NPly/4uVCBorytIj/MCtPhZ2JGLI X-IronPort-AV: E=Sophos;i="6.01,161,1684814400"; d="scan'208";a="113007169" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Bertrand Marquis , Bob Eshleman , Alistair Francis , Connor Davis , "Oleksii Kurochko" , Shawn Anastasio , Timothy Pearson , Roberto Bagnara Subject: [PATCH v2 3/3] xen/types: Rework stdint vs __{u,s}$N types Date: Tue, 27 Jun 2023 08:56:18 +0100 Message-ID: <20230627075618.1180248-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230627075618.1180248-1-andrew.cooper3@citrix.com> References: <20230627075618.1180248-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1687852624266100003 Xen uses the stdint types. Rearrange the types headers to define the compatibility __{u,s}$N types in terms of the stdint types, not the other w= ay around. All all supported compilers on architectures other than x86 support the std= int __*_TYPE__ macros. Move these into a new xen/stdint.h to avoid them being duplicated in each architecture. For the compilers which don't support the __*_TYPE__ macros, synthesize appropriate alternatives. This cleanup has the side effect of removing all use of the undocumented __signed__ GCC keyword. This is a vestigial remnant of `gcc -traditional` mode for dialetcs of C prior to the introduction of the signed keyword. No functional change. Signed-off-by: Andrew Cooper Acked-by: Julien Grall Reviewed-by: Oleksii Kurochko --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Bob Eshleman CC: Alistair Francis CC: Connor Davis CC: Oleksii Kurochko CC: Shawn Anastasio CC: Timothy Pearson CC: Roberto Bagnara v2: * Introduce xen/stdint.h as discussed at XenSummit --- xen/arch/arm/include/asm/types.h | 19 ----------------- xen/arch/riscv/include/asm/types.h | 19 ----------------- xen/arch/x86/include/asm/types.h | 14 ------------- xen/include/xen/stdint.h | 33 ++++++++++++++++++++++++++++++ xen/include/xen/types.h | 20 ++++++++---------- 5 files changed, 42 insertions(+), 63 deletions(-) create mode 100644 xen/include/xen/stdint.h diff --git a/xen/arch/arm/include/asm/types.h b/xen/arch/arm/include/asm/ty= pes.h index fb6618ef247f..545a5e9d1175 100644 --- a/xen/arch/arm/include/asm/types.h +++ b/xen/arch/arm/include/asm/types.h @@ -1,25 +1,6 @@ #ifndef __ARM_TYPES_H__ #define __ARM_TYPES_H__ =20 -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -#if defined(CONFIG_ARM_32) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#elif defined (CONFIG_ARM_64) -typedef __signed__ long __s64; -typedef unsigned long __u64; -#endif -#endif - typedef signed char s8; typedef unsigned char u8; =20 diff --git a/xen/arch/riscv/include/asm/types.h b/xen/arch/riscv/include/as= m/types.h index 0c0ce78c8f6e..93a680a8f323 100644 --- a/xen/arch/riscv/include/asm/types.h +++ b/xen/arch/riscv/include/asm/types.h @@ -1,25 +1,6 @@ #ifndef __RISCV_TYPES_H__ #define __RISCV_TYPES_H__ =20 -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -#if defined(CONFIG_RISCV_32) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#elif defined (CONFIG_RISCV_64) -typedef __signed__ long __s64; -typedef unsigned long __u64; -#endif -#endif - typedef signed char s8; typedef unsigned char u8; =20 diff --git a/xen/arch/x86/include/asm/types.h b/xen/arch/x86/include/asm/ty= pes.h index 2d56aed66782..c9d257716551 100644 --- a/xen/arch/x86/include/asm/types.h +++ b/xen/arch/x86/include/asm/types.h @@ -1,20 +1,6 @@ #ifndef __X86_TYPES_H__ #define __X86_TYPES_H__ =20 -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -typedef __signed__ long __s64; -typedef unsigned long __u64; -#endif - typedef signed char s8; typedef unsigned char u8; =20 diff --git a/xen/include/xen/stdint.h b/xen/include/xen/stdint.h new file mode 100644 index 000000000000..4cf82790f196 --- /dev/null +++ b/xen/include/xen/stdint.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __XEN_STDINT_H__ +#define __XEN_STDINT_H__ + +#ifndef __INT8_TYPE__ /* GCC <=3D 4.4 */ + +typedef __INT8_TYPE__ int8_t; +typedef __UINT8_TYPE__ uint8_t; +typedef __INT16_TYPE__ int16_t; +typedef __UINT16_TYPE__ uint16_t; +typedef __INT32_TYPE__ int32_t; +typedef __UINT32_TYPE__ uint32_t; +typedef __INT64_TYPE__ int64_t; +typedef __UINT64_TYPE__ uint64_t; + +#else + +/* + * Define the types using GCC internal notation. Clang understands this t= oo. + * https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html + */ +typedef signed __attribute__((__mode__(QI))) int8_t; +typedef unsigned __attribute__((__mode__(QI))) uint8_t; +typedef signed __attribute__((__mode__(HI))) int16_t; +typedef unsigned __attribute__((__mode__(HI))) uint16_t; +typedef signed __attribute__((__mode__(SI))) int32_t; +typedef unsigned __attribute__((__mode__(SI))) uint32_t; +typedef signed __attribute__((__mode__(DI))) int64_t; +typedef unsigned __attribute__((__mode__(DI))) uint64_t; + +#endif + +#endif /* __XEN_STDINT_H__ */ diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h index 8b22a02eeaa4..c873c81ccf06 100644 --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -2,6 +2,7 @@ #define __TYPES_H__ =20 #include +#include =20 #include =20 @@ -39,17 +40,14 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; #define LONG_MIN (-LONG_MAX - 1) #define ULONG_MAX (~0UL) =20 -typedef __u8 uint8_t; -typedef __s8 int8_t; - -typedef __u16 uint16_t; -typedef __s16 int16_t; - -typedef __u32 uint32_t; -typedef __s32 int32_t; - -typedef __u64 uint64_t; -typedef __s64 int64_t; +typedef uint8_t __u8; +typedef int8_t __s8; +typedef uint16_t __u16; +typedef int16_t __s16; +typedef uint32_t __u32; +typedef int32_t __s32; +typedef uint64_t __u64; +typedef int64_t __s64; =20 typedef __u16 __le16; typedef __u16 __be16; --=20 2.30.2