From nobody Fri May 17 06:43:16 2024 Delivered-To: importer@patchew.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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1712792880; cv=pass; d=zohomail.com; s=zohoarc; b=ma0RkS0MF7Q6ZxnElzEO7+bL58qQFM2H62lvSl7OTdN5xlYdZjtZnBbvL7ccZSKNbFdbHGVMfyqwKEyE6h/fJUMkfUjf40zmlwH9bQZt/IOIzCOB8jU1S0Ci59ISz7pnUdEOaDQFODZesBnBZeSMMa8YE+Nkd6d6ps+URHYND7g= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712792880; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ot1zIKwUZdXj/ZfNnzvk1/bHE2ALpacyHXmCky+ZK38=; b=NDnqpo9gi3XbjN5w/wV0oBjMxls7eMR6++jVwqB+kkspSL+cLS2E3HW7XsjzOsDQhLiTIISVOqQxEDDW10JWwxzvJQuj1PzpZwAfBDdUUsB1ClZ0AJOI3Gm+VIbkfik3p1HnfQmO9D+x7xwycIurrGqX4k3wk3e5pvhTqXUL0IU= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1712792880859757.1824140568588; Wed, 10 Apr 2024 16:48:00 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.703700.1099513 (Exim 4.92) (envelope-from ) id 1ruhfR-0008MG-RC; Wed, 10 Apr 2024 23:47:49 +0000 Received: by outflank-mailman (output) from mailman id 703700.1099513; Wed, 10 Apr 2024 23:47:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ruhfR-0008M9-Md; Wed, 10 Apr 2024 23:47:49 +0000 Received: by outflank-mailman (input) for mailman id 703700; Wed, 10 Apr 2024 23:47:48 +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 1ruhfQ-0007t7-GO for xen-devel@lists.xenproject.org; Wed, 10 Apr 2024 23:47:48 +0000 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20609.outbound.protection.outlook.com [2a01:111:f400:7e88::609]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id baa886fd-f794-11ee-94a3-07e782e9044d; Thu, 11 Apr 2024 01:47:46 +0200 (CEST) Received: from CH2PR18CA0040.namprd18.prod.outlook.com (2603:10b6:610:55::20) by CH2PR12MB4279.namprd12.prod.outlook.com (2603:10b6:610:af::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 23:47:43 +0000 Received: from CH2PEPF0000013E.namprd02.prod.outlook.com (2603:10b6:610:55:cafe::15) by CH2PR18CA0040.outlook.office365.com (2603:10b6:610:55::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.21 via Frontend Transport; Wed, 10 Apr 2024 23:47:43 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CH2PEPF0000013E.mail.protection.outlook.com (10.167.244.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Wed, 10 Apr 2024 23:47:42 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Apr 2024 18:47:42 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Apr 2024 18:47:42 -0500 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 10 Apr 2024 18:47:41 -0500 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: baa886fd-f794-11ee-94a3-07e782e9044d ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xz0aPTC7yJsBrSTqLXwv/Z94O00NmP8HaaJnsML+69f5Whu7Vg3cerIraViOU35SCkk+5Tlyt3C2tYhKCDgxTzrDzlcUMoQeQ3H6X4uGjnz7yXK/3QX6VORd9w2nPiV1v10Sf3A/VHpJR+D2LDjOkK5rhhCj/peKraxI7meVuD8eEQ8X14KeyKhDzrD/G5apNPGgOrH84yDXzNIlylqyElLXhbZ3wbzbGe8KSo/wOXSIQQ/zzOj4ksbHYrV6i3JUDqb+s40ISBwkJExQQXU7gl3FHW5ZExMN+slawp29N2sbv/+WCo20Cvxr2JpcxwLhDeRinoIiOo7shjKMLZASrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ot1zIKwUZdXj/ZfNnzvk1/bHE2ALpacyHXmCky+ZK38=; b=hZ59EtBCG3qm0fLNfZ9HtUV/PS4bt9dR+1oU8OlnNRmP6UNdkkDfQJfnJggmj41aj+1NyMkdCnf9r8ydumoAWwWTNpd+P44G2p071DF25YMThdajEoUEV6cVBm4rvUbM5m0Fw0bVmcawg2YchxAEj9LTNdYk0UAkz6jAC3AICeNPZ42z1PUR6PoTO5L5DNtadJ3r643Yxp93SsnE8A4qn0lHiOmSVJ0ZfbDQxMabKs/adISm72oKceU7k1A6nHGYhUuJFXuRnrqka1AUAqmVxbxAtzBzDePnMoUHv0nsVo7KwYy3QW3aIU2aB7v+HwhHvGAqNUvL79Tp2RvEZA+aaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ot1zIKwUZdXj/ZfNnzvk1/bHE2ALpacyHXmCky+ZK38=; b=Pb59rVsy8Hl9SXzfopfGZ89o7cJBf4E04Sb70Ra75zyWCDvTL0ObD2OrnDKwcXP46znhhu7py011uJmg1J/LuyA0blibdCBh2OCVcPq0HCIgN47rl+fJ4uYZKNcjQ+nMImt5fgpBJATCD1P0NSTRt/D2HP520J4AaQshbvk9dt4= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Stefano Stabellini To: CC: , , , , , , , , "Stefano Stabellini" Subject: [PATCH v2 1/4] docs: add xen_ulong_t to the documented integers sizes/alignments Date: Wed, 10 Apr 2024 16:47:37 -0700 Message-ID: <20240410234740.994001-1-stefano.stabellini@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB05.amd.com: stefano.stabellini@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF0000013E:EE_|CH2PR12MB4279:EE_ X-MS-Office365-Filtering-Correlation-Id: b697effd-5984-4c12-d294-08dc59b89d4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gy5hwsz4WKY/cBQVoPO+rpKWhrSDjr38t7GoJcjtVOTSPC53WGHg8l+EnEPCYtugw6eH4c739Qosq/EAdVOVrZEQZsjZLuTvFSk09E1ACozBrd682hhUxPpm8SWz0U9prtNmMmPiBjxuz9Jmf4YH92KzlEFmn9Y3y5uOI6qBZ1d6+LD1jLoWnvi4u34C17Cz9ybAUwqBtNdTQdl1CBT8Nd44eaYRVsDe+z5UIvKyRLqvfUhgCFsW99fCG/n8ahl/quInbBl7nIDXrpn/63JtP5tF023wYgDJPqrtY+5Qd5Xmi+7eJ0N4X6ySQYfOwDX0PXmFFsSXOZg6zDOsYlCPgJ0wXFqVGzs9egukvSKMlOj0gq28Qd28+y+JG7cZ+aG7Ol593x9Mr+pXcmJcU81NRndl0A9+7R1zvUzdOusyzGNNqv3Z/hHkHQYThm1UTbkDDwYLntCfjF/dLiHct7oi5X9VlqorNmSDLXKKu5d1zzMNYA7DcfDcdIQvC6QH0/yJa5SlhgvuzABqodHg+I12AarEIEhKuXdDD7eO6NxoHY2wah63Sc7pX4qdXj2+7JdZCOOYNn59Dbm+SY6aupbEfYnvO3rBfNjmk4vM0AtfW5EOmFMdlS/TnJd7B4exkXFJh/kiH67CDlALM5m/QVya12xY4yqg2my+LjiiuZ1iS6lQUiV2Gp4XXbkG4wKDOpB6oh7uyC0TIkuwcrKaSy/Nhfj1QnhI0+AV8iNB+/pW/ngjYg6pLm/djJs5XPp37XeU X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(82310400014)(1800799015)(376005)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 23:47:42.7054 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b697effd-5984-4c12-d294-08dc59b89d4c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF0000013E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4279 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1712792881878100001 Content-Type: text/plain; charset="utf-8" xen_ulong_t is widely used in public headers. Signed-off-by: Stefano Stabellini --- Given that xen_ulong_t is used in public headers there could be a better place for documenting it but this was the most straightforward to add. --- docs/misra/C-language-toolchain.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/misra/C-language-toolchain.rst b/docs/misra/C-language-to= olchain.rst index 5ddfe7bdbe..7a334260e6 100644 --- a/docs/misra/C-language-toolchain.rst +++ b/docs/misra/C-language-toolchain.rst @@ -531,6 +531,17 @@ A summary table of data types, sizes and alignment is = below: - 64 bits=20 - x86_64, ARMv8-A AArch64, RV64, PPC64 =20 + * - xen_ulong_t + - 32 bits + - 32 bits=20 + - x86_32 + + * - xen_ulong_t + - 64 bits + - 64 bits=20 + - x86_64, ARMv8-A AArch64, RV64, PPC64, ARMv8-A AArch32, ARMv8-R + AArch32, ARMv7-A + * - long long - 64-bit - 32-bit --=20 2.25.1 From nobody Fri May 17 06:43:16 2024 Delivered-To: importer@patchew.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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1712792887; cv=pass; d=zohomail.com; s=zohoarc; b=Do14hPe9UiWBalK2lHeaE5Nobj9FOJ/OImYMfiicnx1tzxl3eoHfGHt8iUsbEC/SKqxsdPsb4y4qICZXYFfuqfw1MFYBu/wYfOz2tTghEq1zSe2DWuKoEF/m2w8kYQajqxqT3eahlswvegur2qPLwd8Rk7HnGfvFybzY9XrStG0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712792887; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gaIg2vgRJkUNARF3tfFcTa4SSvAWBZd5C0EPMzdLi6I=; b=nyqLLosPDTQrZJLw1M9yVmzvS9E/dQACuAmj7pRsKOaWhIURrACjIo8TAdUsGjhalNPMS4HqnhV95MKrYF8Q7QtsTo+NcyxYaFequccSUZAJQv0vxL221yRJaxrmGuRS0AxECU+C7DUy1J3iXdBu9lrAA7IlO9DKViwMcV/vxAc= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1712792887412866.7701724877936; Wed, 10 Apr 2024 16:48:07 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.703701.1099523 (Exim 4.92) (envelope-from ) id 1ruhfT-00009f-0y; Wed, 10 Apr 2024 23:47:51 +0000 Received: by outflank-mailman (output) from mailman id 703701.1099523; Wed, 10 Apr 2024 23:47:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ruhfS-00009Y-UC; Wed, 10 Apr 2024 23:47:50 +0000 Received: by outflank-mailman (input) for mailman id 703701; Wed, 10 Apr 2024 23:47:49 +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 1ruhfR-0007t7-SC for xen-devel@lists.xenproject.org; Wed, 10 Apr 2024 23:47:49 +0000 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on20600.outbound.protection.outlook.com [2a01:111:f403:2009::600]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bbf7e741-f794-11ee-94a3-07e782e9044d; Thu, 11 Apr 2024 01:47:47 +0200 (CEST) Received: from MN2PR19CA0065.namprd19.prod.outlook.com (2603:10b6:208:19b::42) by BL3PR12MB6644.namprd12.prod.outlook.com (2603:10b6:208:3b1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 23:47:44 +0000 Received: from BL6PEPF0001AB55.namprd02.prod.outlook.com (2603:10b6:208:19b:cafe::74) by MN2PR19CA0065.outlook.office365.com (2603:10b6:208:19b::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.19 via Frontend Transport; Wed, 10 Apr 2024 23:47:43 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB55.mail.protection.outlook.com (10.167.241.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Wed, 10 Apr 2024 23:47:43 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Apr 2024 18:47:43 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Apr 2024 18:47:43 -0500 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 10 Apr 2024 18:47:42 -0500 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: bbf7e741-f794-11ee-94a3-07e782e9044d ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jv+eQzE59uYRpgDZQzo1+ss1Y0qMisSd39Ww/BsgrnY+1AEv9yyxXjJrAZFTRJ6xxx2kqgeMU4vTfyZ4VRSPjRvuuHNqlS3zASpXthtJO1SpuO7DsogJv3kXniIDaZup23m6mfBLp0Ocq6bWjWZ5BtNfsCYQeq5oj4cVi75CMyBRDeIGpdsfPXcpKQO8AetxyRA/WiW5zVTQPJ42lj/czyMfcDHSTWNi8dIhCqfgj76XkVIDJM1DCZh/tmHgykXP8hjZCOLlyHRYvhiJr9bqhlbnzxmiszX0Zp4vNhLyaQEDUIWvIZJHw2TK7fGwVbiIDcD5qNDf3Vh2yeVDHETwnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gaIg2vgRJkUNARF3tfFcTa4SSvAWBZd5C0EPMzdLi6I=; b=bqrrap8dSOgS+MjXXgsJ1gXeOtue+/0iObxFnetegAj3hRu/IegsDAsTgq3Z3GvoDfa6ehhUaYoyXYvA8BSa9eXg17eTQe8CLrtvWMOzAZWkcg6gDYalsKBRx5ZNEvavR82JQRUwAvY9m2UV5qAJvAOxPpQEFzFBMsNqWiaz82bXlu9XBN3RtUdDT+LT5zD9BcJouW8G4y6y0NJ6ZPqSQ/cBupdCSe7VXwIYzwu2pFDJLQK+BSF6Fp4ctfgX+EIybZQfDOSeLDg7tBV9FdJoa71EfvQgp2lMsJxNhUEoY3MZ+cbSnU14bUW3suZHLoai5Eo/UMui/1GKgWXE1IpHUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gaIg2vgRJkUNARF3tfFcTa4SSvAWBZd5C0EPMzdLi6I=; b=Vk+2zYhBNRmZ8/iIB13nP7MvN/Od8fwYUvrWHQ992zaSFThSznKX1ZTwbTJa8HoT6ODzVrUtSOGYaDRc/YgJ1O2WDHRo/mqb381eSq2iuQsd5wvMumgxGUrgMAp3F/bufYqyAwOwhuYC7e+V6X/5N+0kKckFRlEqjbMrZ8oOCUc= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Stefano Stabellini To: CC: , , , , , , , , "Stefano Stabellini" Subject: [PATCH v2 2/4] public: s/int/int32_t Date: Wed, 10 Apr 2024 16:47:38 -0700 Message-ID: <20240410234740.994001-2-stefano.stabellini@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB05.amd.com: stefano.stabellini@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB55:EE_|BL3PR12MB6644:EE_ X-MS-Office365-Filtering-Correlation-Id: 702328bc-c093-4e5c-ca80-08dc59b89dd1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h9Scw4j9GOPVcZg0lVjC4C1ncTKDm0fFAgXTSz1HYtVKG05QifkvYcSoI8/D0jA+SRGH9TQdi4gSn0ZYMFV7/FHfgYK6JovMaYuKVJQ7AlBN7c2237ii+1r+fVvziU529xasxISsLhM2j5vhLaAiuJjeLLFngnCUcNqMFRpHCRyRmQBuRjQ+XwIbYHeZHOVIMYPRUwkgfN8xzVQfSoZGvTNmP82/M8ImMPoOLNa9jR69hWhwwa6BsIjKM8ot0BNZPamBGrPHg06Zjv45ep52VbiH2E3VUgRZIFmTiFYoB5DMVHgxuF7zSsLxrh/YatB5Zj5Btn7EfzEGLqtsRZpm0V6BWldQ48Ugh3QsbNl2I1ab6TBY0HPciva4WkXW95LZhExSlFeRX0gQ77Jx1DsYuRC+sPly/h69XaFv/Xq+2wlQCPySWCu1yy1BuVzM1Uat9m/aDs2CGLLLnyeVNG480HPSQliDk7Wo8f8fbNFe+z24rK0+8bI8PBV+Le3jv5QsJXE2YHevr9SX0sgTTr3X+n9FzS/P/1XNAi7EJN1XlAVB/0Oq/TCP4N3xW75NLswRVbyBuyJyDGoh8z/KkM2SUdV3MJjKKEMUWG+e9gFd4MYd8bKAYBZ8qYWpFDqyksKq7SHsSaFCcYIg1fnQZ4KAdM4zJv3jEPUnsT+TbSlbRtFFWXw08wRucTXPu9sesm2ekDLmdLqVP1I1071ZGcyxGSZHS2zcl9r6SUzz/h/p80ZJJOIN8cpC/P0fSZiiNROb X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(82310400014)(376005)(36860700004)(1800799015);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 23:47:43.5926 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 702328bc-c093-4e5c-ca80-08dc59b89dd1 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB55.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6644 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1712792888020100001 Content-Type: text/plain; charset="utf-8" Straightforward int -> int32_t and unsigned int -> uint32_t replacements in public headers. No ABI or semantic changes intended. Signed-off-by: Stefano Stabellini --- Changes in v2: - avoid changes to GUEST_HANDLEs for now (there was one GUEST_HANDLE change in v1) --- xen/include/public/kexec.h | 8 ++++---- xen/include/public/memory.h | 22 +++++++++++----------- xen/include/public/physdev.h | 18 +++++++++--------- xen/include/public/sched.h | 6 +++--- xen/include/public/vcpu.h | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/xen/include/public/kexec.h b/xen/include/public/kexec.h index 40d79e936b..8d2a0ef697 100644 --- a/xen/include/public/kexec.h +++ b/xen/include/public/kexec.h @@ -105,7 +105,7 @@ typedef struct xen_kexec_image { */ #define KEXEC_CMD_kexec 0 typedef struct xen_kexec_exec { - int type; + int32_t type; } xen_kexec_exec_t; =20 /* @@ -116,7 +116,7 @@ typedef struct xen_kexec_exec { #define KEXEC_CMD_kexec_load_v1 1 /* obsolete since 0x00040400 */ #define KEXEC_CMD_kexec_unload_v1 2 /* obsolete since 0x00040400 */ typedef struct xen_kexec_load_v1 { - int type; + int32_t type; xen_kexec_image_t image; } xen_kexec_load_v1_t; =20 @@ -143,8 +143,8 @@ typedef struct xen_kexec_load_v1 { */ #define KEXEC_CMD_kexec_get_range 3 typedef struct xen_kexec_range { - int range; - int nr; + int32_t range; + int32_t nr; unsigned long size; unsigned long start; } xen_kexec_range_t; diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 5e545ae9a4..ae4a71268f 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -61,13 +61,13 @@ struct xen_memory_reservation { =20 /* Number of extents, and size/alignment of each (2^extent_order pages= ). */ xen_ulong_t nr_extents; - unsigned int extent_order; + uint32_t extent_order; =20 #if __XEN_INTERFACE_VERSION__ >=3D 0x00030209 /* XENMEMF flags. */ - unsigned int mem_flags; + uint32_t mem_flags; #else - unsigned int address_bits; + uint32_t address_bits; #endif =20 /* @@ -163,7 +163,7 @@ struct xen_machphys_mfn_list { * Size of the 'extent_start' array. Fewer entries will be filled if t= he * machphys table is smaller than max_extents * 2MB. */ - unsigned int max_extents; + uint32_t max_extents; =20 /* * Pointer to buffer to fill with list of extent starts. If there are @@ -176,7 +176,7 @@ struct xen_machphys_mfn_list { * Number of extents written to the above array. This will be smaller * than 'max_extents' if the machphys table is smaller than max_e * 2M= B. */ - unsigned int nr_extents; + uint32_t nr_extents; }; typedef struct xen_machphys_mfn_list xen_machphys_mfn_list_t; DEFINE_XEN_GUEST_HANDLE(xen_machphys_mfn_list_t); @@ -232,7 +232,7 @@ struct xen_add_to_physmap { /* Number of pages to go through for gmfn_range */ uint16_t size; =20 - unsigned int space; /* =3D> enum phys_map_space */ + uint32_t space; /* =3D> enum phys_map_space */ =20 #define XENMAPIDX_grant_table_status 0x80000000U =20 @@ -317,7 +317,7 @@ struct xen_memory_map { * return the number of entries which have been stored in * buffer. */ - unsigned int nr_entries; + uint32_t nr_entries; =20 /* * Entries in the buffer are in the same format as returned by the @@ -591,7 +591,7 @@ struct xen_reserved_device_memory_map { * Gets set to the required number of entries when too low, * signaled by error code -ERANGE. */ - unsigned int nr_entries; + uint32_t nr_entries; /* OUT */ XEN_GUEST_HANDLE(xen_reserved_device_memory_t) buffer; /* IN */ @@ -711,9 +711,9 @@ struct xen_vnuma_topology_info { domid_t domid; uint16_t pad; /* IN/OUT */ - unsigned int nr_vnodes; - unsigned int nr_vcpus; - unsigned int nr_vmemranges; + uint32_t nr_vnodes; + uint32_t nr_vcpus; + uint32_t nr_vmemranges; /* OUT */ union { XEN_GUEST_HANDLE(uint) h; diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index f0c0d4727c..03ccf86618 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -142,17 +142,17 @@ DEFINE_XEN_GUEST_HANDLE(physdev_irq_t); struct physdev_map_pirq { domid_t domid; /* IN */ - int type; + int32_t type; /* IN (ignored for ..._MULTI_MSI) */ - int index; + int32_t index; /* IN or OUT */ - int pirq; + int32_t pirq; /* IN - high 16 bits hold segment for ..._MSI_SEG and ..._MULTI_MSI */ - int bus; + int32_t bus; /* IN */ - int devfn; + int32_t devfn; /* IN (also OUT for ..._MULTI_MSI) */ - int entry_nr; + int32_t entry_nr; /* IN */ uint64_t table_base; }; @@ -163,7 +163,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_map_pirq_t); struct physdev_unmap_pirq { domid_t domid; /* IN */ - int pirq; + int32_t pirq; }; =20 typedef struct physdev_unmap_pirq physdev_unmap_pirq_t; @@ -224,7 +224,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_op_t); =20 #define PHYSDEVOP_setup_gsi 21 struct physdev_setup_gsi { - int gsi; + int32_t gsi; /* IN */ uint8_t triggering; /* IN */ @@ -242,7 +242,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_setup_gsi_t); #define PHYSDEVOP_get_free_pirq 23 struct physdev_get_free_pirq { /* IN */ - int type; + int32_t type; /* OUT */ uint32_t pirq; }; diff --git a/xen/include/public/sched.h b/xen/include/public/sched.h index b4362c6a1d..57ac3df47b 100644 --- a/xen/include/public/sched.h +++ b/xen/include/public/sched.h @@ -116,14 +116,14 @@ /* ` } */ =20 struct sched_shutdown { - unsigned int reason; /* SHUTDOWN_* =3D> enum sched_shutdown_reason */ + uint32_t reason; /* SHUTDOWN_* =3D> enum sched_shutdown_reason */ }; typedef struct sched_shutdown sched_shutdown_t; DEFINE_XEN_GUEST_HANDLE(sched_shutdown_t); =20 struct sched_poll { XEN_GUEST_HANDLE(evtchn_port_t) ports; - unsigned int nr_ports; + uint32_t nr_ports; uint64_t timeout; }; typedef struct sched_poll sched_poll_t; @@ -131,7 +131,7 @@ DEFINE_XEN_GUEST_HANDLE(sched_poll_t); =20 struct sched_remote_shutdown { domid_t domain_id; /* Remote domain ID */ - unsigned int reason; /* SHUTDOWN_* =3D> enum sched_shutdown_reas= on */ + uint32_t reason; /* SHUTDOWN_* =3D> enum sched_shutdown_reas= on */ }; typedef struct sched_remote_shutdown sched_remote_shutdown_t; DEFINE_XEN_GUEST_HANDLE(sched_remote_shutdown_t); diff --git a/xen/include/public/vcpu.h b/xen/include/public/vcpu.h index f7445ac0b0..2b8df2b0da 100644 --- a/xen/include/public/vcpu.h +++ b/xen/include/public/vcpu.h @@ -63,7 +63,7 @@ #define VCPUOP_get_runstate_info 4 struct vcpu_runstate_info { /* VCPU's current state (RUNSTATE_*). */ - int state; + int32_t state; /* When was current state entered (system time, ns)? */ uint64_t state_entry_time; /* --=20 2.25.1 From nobody Fri May 17 06:43:16 2024 Delivered-To: importer@patchew.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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1712792888; cv=pass; d=zohomail.com; s=zohoarc; b=KQbPZ8bqdPNTq24++Ts7sCUim6GnOLXfbh3E62IwRr6u9T7bd/ghVi7FtIyYpZJtRfunxwWII531qG488/fSH7jXfTDH+XhyiqrJGB160uyAw/NICP17xHNFkfik1OkYOT46JW2xnvlDX8Tzjt2R1JI5KvYXCUQiCVT4yoVWuAg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712792888; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gjXObuSoQi0Mi/Diq12/QBuomsKSbc6r1oDEiMbK9vk=; b=jCf2rGX5X+bAHHnmixrF3tzCAQ2K3m9FUyVqTaCKct6XtRgdKBlOzAPE6afNSq/+nD3dSZYj5P1gP9seuT37JrNw8NYLlaRU2xX5UkWubWKekAM6iO24HAAocb6z2hr2oCqHVsn8zAng+ItXnOvP7zM9Nwo8af1zGfcrlS4wsvA= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1712792888159107.67964252880722; Wed, 10 Apr 2024 16:48:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.703702.1099533 (Exim 4.92) (envelope-from ) id 1ruhfV-0000Qz-Ck; Wed, 10 Apr 2024 23:47:53 +0000 Received: by outflank-mailman (output) from mailman id 703702.1099533; Wed, 10 Apr 2024 23:47:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ruhfV-0000Qs-8K; Wed, 10 Apr 2024 23:47:53 +0000 Received: by outflank-mailman (input) for mailman id 703702; Wed, 10 Apr 2024 23:47:51 +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 1ruhfT-0007t7-Kn for xen-devel@lists.xenproject.org; Wed, 10 Apr 2024 23:47:51 +0000 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20600.outbound.protection.outlook.com [2a01:111:f403:2416::600]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bd3430bf-f794-11ee-94a3-07e782e9044d; Thu, 11 Apr 2024 01:47:49 +0200 (CEST) Received: from CH2PR08CA0016.namprd08.prod.outlook.com (2603:10b6:610:5a::26) by BY5PR12MB4179.namprd12.prod.outlook.com (2603:10b6:a03:211::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 23:47:45 +0000 Received: from CH2PEPF00000141.namprd02.prod.outlook.com (2603:10b6:610:5a:cafe::99) by CH2PR08CA0016.outlook.office365.com (2603:10b6:610:5a::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.19 via Frontend Transport; Wed, 10 Apr 2024 23:47:45 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CH2PEPF00000141.mail.protection.outlook.com (10.167.244.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Wed, 10 Apr 2024 23:47:44 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Apr 2024 18:47:44 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Apr 2024 16:47:44 -0700 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 10 Apr 2024 18:47:43 -0500 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: bd3430bf-f794-11ee-94a3-07e782e9044d ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mkx5idiKwmP+0GweDu1YTBHzCHkqO/wiF3WavkELe4upegSJlqZYX5BCmEn/D1jcEiTBVXit69MZeN9jWj2GA7B2h93/nC7L7U+yepencwyv3U/uiD8EpZzb1SdKNzd70410jdVweXim3koSBJn2lsr9JLXutIC8bjxYFtEuZz8ipPBx5E9rmYlX9kMnTLXg5Y8lMj2eXjvS/KY+VDRDLcxDnoea9cr1gBwFcdte2eOdbNBZTKZ4mZuWpK9xtjLjQUMKna/nqFkNCHB2jxhB8OZWOTl+zxMSPU1shTNw25LCphCOdiRRnRbRKvsyZMJBONipBHZIFvrEbKntfH37mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gjXObuSoQi0Mi/Diq12/QBuomsKSbc6r1oDEiMbK9vk=; b=I6L8vm5mo/Xl4aNQHg/6NJHvPYE+pygsKlG+VSHl2lCQ8efJYESUTDbzsfaKi1J6EQ9GCj1xWX2mM8lZtIa1SX5BUuhr4pVvkHN0HwdvXgwzI+zJPEAOCRYSO7LUeaiXU8XidFPxU6cjCodvpiuUBq/FaJqHkSdw0L8AsW0/z4UTfbIFetSwAvZMf/S5DaCESw3auaJ6k1UTrBOg7l87JEI1nvTr3CCsavkFXorprXbX4+RqNgu2E7zo6VP1AAjUKlgs2Sw6c8bXR+MBfBeezVBmRzmegiSg8C9JV2R6ZIA92dhhYZdz0NschqAMBiflusEOscwjQrXe1m3hWOd51w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gjXObuSoQi0Mi/Diq12/QBuomsKSbc6r1oDEiMbK9vk=; b=es3hTMFov5ZMIHMGDSoXos8kcktB16wHQUMQjVROTw1/wZMOtfgYM+Ye+uLV1BCN6mEMOKXk2KOsO/PkW5RaV901JZQ4h/Q4WwfJHIyvsNGrEMAQSi6oM3kUyKWoUx9F2hzj8SOwC22fe3jUNmuRGPPnI41/PfTXH8G5ijI1/FM= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Stefano Stabellini To: CC: , , , , , , , , "Stefano Stabellini" Subject: [PATCH v2 3/4] xen/public: s/unsigned long/xen_ulong_t Date: Wed, 10 Apr 2024 16:47:39 -0700 Message-ID: <20240410234740.994001-3-stefano.stabellini@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000141:EE_|BY5PR12MB4179:EE_ X-MS-Office365-Filtering-Correlation-Id: 293d367a-adbf-428b-22a8-08dc59b89e74 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ogr6uBxTnxgTj99C/iDnAqFU0kbREFzKw4LECr69WNyoafHJYXOoA57svm3urbqif1nv2gog1LaiExvbwBx3/piJ9PswmoTQgnlq9rPdOaIKS4ue3T+QcGkHmiuetniCCzA97sgUaJMw7YjeHPIOKXJXyloDmvR1GYzfyrJ6MzysUf1nk6JdmfeMyAAN89wm0lWrRecfFctn2SVFCeDJhZ3SqqbTYlh4GFQJIhGo3534XDfHrEI8GTy19nxnVBRR+83RAYFrkwB6JION+MYAYK/qxayV6d4Zaw9GfKlTn/q92IZK4EB72butZiN34W25ONOcQLN678cEsPLW+kTTGgqGSm45CTr/gWHhu9pvoFwfB/hjKovJ8YpNiJnVVKez7VzKDWyRRjGaS+e+IdL/W6/99J/cJikLsCySyrKeV1dq2b5kNaJTQ8rAyy3CmP4bDVoFbERperaGdJadU/3ne1nNDIlMvlLskK/GxVPWnOLAfkM9rqPC2gQt/NHGxzr02J7hEW2yhIY4fvrIBdB4zftqfDDuwB8OAhwz3cYyyPtB02Ls0NFB8d31HJERv+kOZiPNsRegNfKio9SwTM0LMtFhm76AbftVHBrShN3hrueHucV5ooF/uaD8G7FOcd86sZTrUOkAIajcPhW5qZKgBJZayD10zI2Y17M8bN1oeG63S2x8MqtbMdyzt1FbhE5rHUznN8AsQEiwEcLmzijcogsnXSdgfnNv2BGMmOltQmXEYLob4KlNFJUirN2wEMm8 X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(82310400014)(376005)(36860700004)(1800799015);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 23:47:44.6408 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 293d367a-adbf-428b-22a8-08dc59b89e74 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF00000141.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4179 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1712792890065100003 Content-Type: text/plain; charset="utf-8" The goal is to use only fixed-size integers in public headers, such as uint32_t and uint64_t. However, there are cases where the ABI changes depending on the architecture. In those cases, adding #ifdefs might be the clearest solution but it is also cumbersome. We already define a xen_ulong_t type which is widely used in public headers and it is defined differently by architecture. Instead of unsigned long, use xen_ulong_t in public headers: - it makes it clearer that size might change by arch - it gets us closer to the goal of no unfixed-size integers in public headers Note that unsigned long and xen_ulong_t are the same thing on x86 (both 32-bit and 64-bit) but they differ on all other arches. However, all the interfaces with xen_ulong_t or unsigned long are x86-only interfaces today. Thus, this patch doesn't introduce any ABI or semantic changes. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/include/public/kexec.h | 10 +++++----- xen/include/public/nmi.h | 4 ++-- xen/include/public/physdev.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/include/public/kexec.h b/xen/include/public/kexec.h index 8d2a0ef697..89164094d9 100644 --- a/xen/include/public/kexec.h +++ b/xen/include/public/kexec.h @@ -78,10 +78,10 @@ =20 typedef struct xen_kexec_image { #if defined(__i386__) || defined(__x86_64__) - unsigned long page_list[KEXEC_XEN_NO_PAGES]; + xen_ulong_t page_list[KEXEC_XEN_NO_PAGES]; #endif - unsigned long indirection_page; - unsigned long start_address; + xen_ulong_t indirection_page; + xen_ulong_t start_address; } xen_kexec_image_t; =20 /* @@ -145,8 +145,8 @@ typedef struct xen_kexec_load_v1 { typedef struct xen_kexec_range { int32_t range; int32_t nr; - unsigned long size; - unsigned long start; + xen_ulong_t size; + xen_ulong_t start; } xen_kexec_range_t; =20 #if __XEN_INTERFACE_VERSION__ >=3D 0x00040400 diff --git a/xen/include/public/nmi.h b/xen/include/public/nmi.h index 5900703f5f..c8c0ddafc2 100644 --- a/xen/include/public/nmi.h +++ b/xen/include/public/nmi.h @@ -43,8 +43,8 @@ */ #define XENNMI_register_callback 0 struct xennmi_callback { - unsigned long handler_address; - unsigned long pad; + xen_ulong_t handler_address; + xen_ulong_t pad; }; typedef struct xennmi_callback xennmi_callback_t; DEFINE_XEN_GUEST_HANDLE(xennmi_callback_t); diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index 03ccf86618..5bbb809fae 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -109,7 +109,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_set_iobitmap_t); #define PHYSDEVOP_apic_write 9 struct physdev_apic { /* IN */ - unsigned long apic_physbase; + xen_ulong_t apic_physbase; uint32_t reg; /* IN or OUT */ uint32_t value; --=20 2.25.1 From nobody Fri May 17 06:43:16 2024 Delivered-To: importer@patchew.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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1712792891; cv=pass; d=zohomail.com; s=zohoarc; b=l4M4mE6hpo8TDtAVYNwtZQZXxo13LpVi8sJRn1wabFIIwim/1EyzHnjpzwCBhEzrl5kDv0JO+2BnElvAFnqNOAEFdeQ19Y9HOV7sOJ2eJvo8i3oExHy9Y4l/jkPf3Q8T93uhSLwSC3XR2exixBKY7nAdt5kahB+JwjN6tf6htY4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712792891; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FmOGjAB3JzSfwRzRe/4an+3+taCqNqKKqxNPitif1Ek=; b=CCsT22eIjpnmPDahgI9soDvsrOCjtzJQF7VjEFfJ1yrXr/v/dWQ45FQboICoDbS5PwwLtZhcjOPQa/QlS551md2yhuKwiqm/l5xbfO72I4KHAhmK8Vg9Z3AalHmYVwI0JfdS8P3cExYzjbGosw7+QV5Iwg8xn69EBHVs4NJQPNk= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1712792891731793.8725248287947; Wed, 10 Apr 2024 16:48:11 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.703703.1099540 (Exim 4.92) (envelope-from ) id 1ruhfV-0000UZ-Rl; Wed, 10 Apr 2024 23:47:53 +0000 Received: by outflank-mailman (output) from mailman id 703703.1099540; Wed, 10 Apr 2024 23:47:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ruhfV-0000U3-I6; Wed, 10 Apr 2024 23:47:53 +0000 Received: by outflank-mailman (input) for mailman id 703703; Wed, 10 Apr 2024 23:47:52 +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 1ruhfT-0007t7-Ri for xen-devel@lists.xenproject.org; Wed, 10 Apr 2024 23:47:51 +0000 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on20600.outbound.protection.outlook.com [2a01:111:f403:2009::600]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bccf6886-f794-11ee-94a3-07e782e9044d; Thu, 11 Apr 2024 01:47:49 +0200 (CEST) Received: from BL0PR02CA0130.namprd02.prod.outlook.com (2603:10b6:208:35::35) by IA1PR12MB6114.namprd12.prod.outlook.com (2603:10b6:208:3ea::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 23:47:46 +0000 Received: from BL6PEPF0001AB59.namprd02.prod.outlook.com (2603:10b6:208:35:cafe::25) by BL0PR02CA0130.outlook.office365.com (2603:10b6:208:35::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.19 via Frontend Transport; Wed, 10 Apr 2024 23:47:46 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB59.mail.protection.outlook.com (10.167.241.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Wed, 10 Apr 2024 23:47:46 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Apr 2024 18:47:45 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Apr 2024 16:47:44 -0700 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 10 Apr 2024 18:47:44 -0500 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: bccf6886-f794-11ee-94a3-07e782e9044d ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oCt2VsceRPGGwTVkv5rKIuNY22rB+tt+TW47EClnznBC3nOgzIsEYmXpp1sSjajBekJqfZt2uMAMJ+o03nrsvcjWTz0jS0mfvy96y9NeMcezhMHpeFtwvvjS/g5tfpgHccP/QQ16RECBWOvsGmFJL/GiSogqappvM/n9UdVC41nJIOnrGC6tnr2HwKiFlOS0DaU5aOrKS8VIDmmb3YO56N1BIiV+4nYQavTgUAH12eZ3qDKbXIGzKyAQkcLgMsRb8WMBO2e1+A7KDk4HVnTv0EwQ8eM0s01y3KDbu35lS+luU4ZBuijmdcta02K8Vysb6rJupwnQY46g317lto9Igw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FmOGjAB3JzSfwRzRe/4an+3+taCqNqKKqxNPitif1Ek=; b=S3u3WURuG7Kb0kcNbCDaty6TC4cFipGuG2ZXCIo3FBiAY2b7VMF0oPfrWM8zlFFd/hvxo4GojKy6SSEP3c7aFLm0zp0MGHKEpm9iFcGhqIYZ853ZLgb3sYj9exvtbLnBDNwdHBk1VMiGpO5qUqnTAWwsUwFSVqerEij8yzKkKk+EXQEyxO94SLyHyxu7g4uZWSdvyxg+z+wBwGR6R2gPG+Xe+tUU+wx81D/vPkipiY00cfo+WTDDqNh+BwMKufxAPc80/YYbU7JCBUBkDQpyU+Dq7wA+vQGRvi/6qtsT5zRevZVGA0GaFCdiy+MXFhEiHG6jMHR/6e1PSrxr9k+wag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FmOGjAB3JzSfwRzRe/4an+3+taCqNqKKqxNPitif1Ek=; b=K1SsA6JVEihBj3CrL87V2rq0ChTuMSYjOmKWIU1nwq6iRJjit75vpvEFIxYH38zN0OPo2mGP2N4Vyj4Pn73tuGMGat9TSU4znSKCWxGXsbInfiLI0yR2BgI1P2AXG8TAZzTYvhn7NVFEcZjaYTuGooXUy/vfVNLsLSqurN4MGaE= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Stefano Stabellini To: CC: , , , , , , , , "Stefano Stabellini" Subject: [PATCH v2 4/4] xen/public: replace remaining int and long Date: Wed, 10 Apr 2024 16:47:40 -0700 Message-ID: <20240410234740.994001-4-stefano.stabellini@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB59:EE_|IA1PR12MB6114:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f58f3be-e1b1-4b97-ab04-08dc59b89f7c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fr4CchXOYuS83nGdBpTLeun5R7IT8jLYTlZlxp9fvt+EYBTn/0ikTSHrpSnnnMVaony15D5rbhGvOHdK+TR4jEGcp4lZ4OrQ0wjZMpWd6HXbPycr1zFAxb/aMcT0/eba5hjI65cNqJemlBFe5hR/1dehY0aPkpKlRPpNm5Hn/8Fu2HMBaNGyJhsolMNJkhzogfi1hDM8QiihrZNa0tFZ/jnF3c1bZQ04HH6O+GPTA2lIV/Kmw+wgaquAZYI3EPBCEWHBuo6AMzmftpTijq+i8psKfVZkGTkPatcaC5nztyMF9dWgyqqXyIk8tAVd+gMmWxfx7WlKwz4LAVVCRREx7BCIkK0+KS7qXNmDNVIOrwX7TetjGpaUCoQkXXzcAQx8fHWi/jlLH5IV9ML7olDxLgBx2M2u+DBZSlqWk8Gc/+bKDbDYpQ+Wx67ejOP0jpkzzx5yhYWgs+2LKA6Atn4RyurExwDd//0R1qo+K2XpuP34CA/LyJ2UATPkjycBTv2M7YNY0Qp/9+NpX1cfn8aKgf1l0yKsnpgGzxR4R+J8UTGJ1WamaNv5xeBTwzyfgTDbRRjCUbrwY3k8kfGZ6/vRcqQdgh5mdUxDP+KGWNCsuAOm1wrCcmNo3P3kZRgQkPBq1ZDzD4WHFo8ZIPoydQSd4HvquQlm60LZZYToFhSF771RVhdlTqLkPuV+ELBT4b5bZERuF1Dcr/R91cC0pRYSfN4/IFlWKJXrCR8cyDOBAAV3D5jz1mrn/MWRiXqhn28R X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(36860700004)(1800799015)(82310400014)(376005);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 23:47:46.3901 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f58f3be-e1b1-4b97-ab04-08dc59b89f7c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB59.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6114 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1712792893997100001 Content-Type: text/plain; charset="utf-8" Replace all int and long in few remaining x86-specific headers and x86-specific hypercalls. Signed-off-by: Stefano Stabellini --- xen/include/public/arch-x86/hvm/save.h | 4 +- xen/include/public/arch-x86/xen-x86_32.h | 10 ++--- xen/include/public/arch-x86/xen-x86_64.h | 10 ++--- xen/include/public/arch-x86/xen.h | 50 ++++++++++++------------ xen/include/public/xen.h | 24 ++++++------ 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/xen/include/public/arch-x86/hvm/save.h b/xen/include/public/ar= ch-x86/hvm/save.h index 7ecacadde1..8e3dfcf439 100644 --- a/xen/include/public/arch-x86/hvm/save.h +++ b/xen/include/public/arch-x86/hvm/save.h @@ -415,7 +415,7 @@ struct hvm_hw_pci_irqs { * Indexed by: device*4 + INTx#. */ union { - unsigned long i[16 / sizeof (unsigned long)]; /* DECLARE_BITMAP(i,= 32*4); */ + xen_ulong_t i[16 / sizeof (xen_ulong_t)]; /* DECLARE_BITMAP(i, 32*= 4); */ uint64_t pad[2]; }; }; @@ -428,7 +428,7 @@ struct hvm_hw_isa_irqs { * Indexed by ISA IRQ (assumes no ISA-device IRQ sharing). */ union { - unsigned long i[1]; /* DECLARE_BITMAP(i, 16); */ + xen_ulong_t i[1]; /* DECLARE_BITMAP(i, 16); */ uint64_t pad[1]; }; }; diff --git a/xen/include/public/arch-x86/xen-x86_32.h b/xen/include/public/= arch-x86/xen-x86_32.h index 9e3bf06b12..0b2671ab65 100644 --- a/xen/include/public/arch-x86/xen-x86_32.h +++ b/xen/include/public/arch-x86/xen-x86_32.h @@ -68,7 +68,7 @@ #define MACH2PHYS_VIRT_END xen_mk_ulong(__MACH2PHYS_VIRT_END) #define MACH2PHYS_NR_ENTRIES ((MACH2PHYS_VIRT_END-MACH2PHYS_VIRT_START)>>= 2) #ifndef machine_to_phys_mapping -#define machine_to_phys_mapping ((unsigned long *)MACH2PHYS_VIRT_START) +#define machine_to_phys_mapping ((xen_ulong_t *)MACH2PHYS_VIRT_START) #endif =20 /* 32-/64-bit invariability for control interfaces (domctl/sysctl). */ @@ -151,14 +151,14 @@ DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); #define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) <<= 20)) =20 struct arch_vcpu_info { - unsigned long cr2; - unsigned long pad[5]; /* sizeof(vcpu_info_t) =3D=3D 64 */ + xen_ulong_t cr2; + xen_ulong_t pad[5]; /* sizeof(vcpu_info_t) =3D=3D 64 */ }; typedef struct arch_vcpu_info arch_vcpu_info_t; =20 struct xen_callback { - unsigned long cs; - unsigned long eip; + xen_ulong_t cs; + xen_ulong_t eip; }; typedef struct xen_callback xen_callback_t; =20 diff --git a/xen/include/public/arch-x86/xen-x86_64.h b/xen/include/public/= arch-x86/xen-x86_64.h index 43f6e3d220..bd27fc59fe 100644 --- a/xen/include/public/arch-x86/xen-x86_64.h +++ b/xen/include/public/arch-x86/xen-x86_64.h @@ -67,7 +67,7 @@ #define MACH2PHYS_VIRT_END xen_mk_ulong(__MACH2PHYS_VIRT_END) #define MACH2PHYS_NR_ENTRIES ((MACH2PHYS_VIRT_END-MACH2PHYS_VIRT_START)>>= 3) #ifndef machine_to_phys_mapping -#define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START) +#define machine_to_phys_mapping ((xen_ulong_t *)HYPERVISOR_VIRT_START) #endif =20 /* @@ -198,12 +198,12 @@ DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); #undef __DECL_REG_LO16 #undef __DECL_REG_HI =20 -#define xen_pfn_to_cr3(pfn) ((unsigned long)(pfn) << 12) -#define xen_cr3_to_pfn(cr3) ((unsigned long)(cr3) >> 12) +#define xen_pfn_to_cr3(pfn) ((xen_ulong_t)(pfn) << 12) +#define xen_cr3_to_pfn(cr3) ((xen_ulong_t)(cr3) >> 12) =20 struct arch_vcpu_info { - unsigned long cr2; - unsigned long pad; /* sizeof(vcpu_info_t) =3D=3D 64 */ + xen_ulong_t cr2; + xen_ulong_t pad; /* sizeof(vcpu_info_t) =3D=3D 64 */ }; typedef struct arch_vcpu_info arch_vcpu_info_t; =20 diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x8= 6/xen.h index a9a87d9b50..90710c1230 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -141,7 +141,7 @@ struct trap_info { uint8_t vector; /* exception vector = */ uint8_t flags; /* 0-3: privilege level; 4: clear event enable?= */ uint16_t cs; /* code selector = */ - unsigned long address; /* code offset = */ + xen_ulong_t address; /* code offset = */ }; typedef struct trap_info trap_info_t; DEFINE_XEN_GUEST_HANDLE(trap_info_t); @@ -174,36 +174,36 @@ struct vcpu_guest_context { #define VGCF_syscall_disables_events (1<<_VGCF_syscall_disables_events) #define _VGCF_online 5 #define VGCF_online (1<<_VGCF_online) - unsigned long flags; /* VGCF_* flags = */ - struct cpu_user_regs user_regs; /* User-level CPU registers = */ - struct trap_info trap_ctxt[256]; /* Virtual IDT = */ - unsigned long ldt_base, ldt_ents; /* LDT (linear address, # ents= ) */ - unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents= ) */ - unsigned long kernel_ss, kernel_sp; /* Virtual TSS (only SS1/SP1) = */ + xen_ulong_t flags; /* VGCF_* flags = */ + struct cpu_user_regs user_regs; /* User-level CPU registers = */ + struct trap_info trap_ctxt[256]; /* Virtual IDT = */ + xen_ulong_t ldt_base, ldt_ents; /* LDT (linear address, # ents) = */ + xen_ulong_t gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) = */ + xen_ulong_t kernel_ss, kernel_sp; /* Virtual TSS (only SS1/SP1) = */ /* NB. User pagetable on x86/64 is placed in ctrlreg[1]. */ - unsigned long ctrlreg[8]; /* CR0-CR7 (control registers)= */ - unsigned long debugreg[8]; /* DB0-DB7 (debug registers) = */ + xen_ulong_t ctrlreg[8]; /* CR0-CR7 (control registers) = */ + xen_ulong_t debugreg[8]; /* DB0-DB7 (debug registers) = */ #ifdef __i386__ - unsigned long event_callback_cs; /* CS:EIP of event callback = */ - unsigned long event_callback_eip; - unsigned long failsafe_callback_cs; /* CS:EIP of failsafe callback= */ - unsigned long failsafe_callback_eip; + xen_ulong_t event_callback_cs; /* CS:EIP of event callback = */ + xen_ulong_t event_callback_eip; + xen_ulong_t failsafe_callback_cs; /* CS:EIP of failsafe callback = */ + xen_ulong_t failsafe_callback_eip; #else - unsigned long event_callback_eip; - unsigned long failsafe_callback_eip; + xen_ulong_t event_callback_eip; + xen_ulong_t failsafe_callback_eip; #ifdef __XEN__ union { - unsigned long syscall_callback_eip; + xen_ulong_t syscall_callback_eip; struct { - unsigned int event_callback_cs; /* compat CS of event cb = */ - unsigned int failsafe_callback_cs; /* compat CS of failsafe cb= */ + uint32_t event_callback_cs; /* compat CS of event cb */ + uint32_t failsafe_callback_cs; /* compat CS of failsafe cb */ }; }; #else - unsigned long syscall_callback_eip; + xen_ulong_t syscall_callback_eip; #endif #endif - unsigned long vm_assist; /* VMASST_TYPE_* bitmap */ + xen_ulong_t vm_assist; /* VMASST_TYPE_* bitmap */ #ifdef __x86_64__ /* Segment base addresses. */ uint64_t fs_base; @@ -219,7 +219,7 @@ struct arch_shared_info { * Number of valid entries in the p2m table(s) anchored at * pfn_to_mfn_frame_list_list and/or p2m_vaddr. */ - unsigned long max_pfn; + xen_ulong_t max_pfn; /* * Frame containing list of mfns containing list of mfns containing p2= m. * A value of 0 indicates it has not yet been set up, ~0 indicates it = has @@ -228,7 +228,7 @@ struct arch_shared_info { * is to be used. */ xen_pfn_t pfn_to_mfn_frame_list_list; - unsigned long nmi_reason; + xen_ulong_t nmi_reason; /* * Following three fields are valid if p2m_cr3 contains a value differ= ent * from 0. @@ -247,9 +247,9 @@ struct arch_shared_info { * Modifying a p2m element in the linear p2m list is allowed via an at= omic * write only. */ - unsigned long p2m_cr3; /* cr3 value of the p2m address space */ - unsigned long p2m_vaddr; /* virtual address of the p2m list */ - unsigned long p2m_generation; /* generation count of p2m mapping */ + xen_ulong_t p2m_cr3; /* cr3 value of the p2m address space */ + xen_ulong_t p2m_vaddr; /* virtual address of the p2m list */ + xen_ulong_t p2m_generation; /* generation count of p2m mapping */ #ifdef __i386__ /* There's no room for this field in the generic structure. */ uint32_t wc_sec_hi; diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index b47d48d0e2..2444e752ab 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -430,17 +430,17 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); =20 #ifndef __ASSEMBLY__ struct mmuext_op { - unsigned int cmd; /* =3D> enum mmuext_cmd */ + uint32_t cmd; /* =3D> enum mmuext_cmd */ union { /* [UN]PIN_TABLE, NEW_BASEPTR, NEW_USER_BASEPTR * CLEAR_PAGE, COPY_PAGE, [UN]MARK_SUPER */ xen_pfn_t mfn; /* INVLPG_LOCAL, INVLPG_ALL, SET_LDT */ - unsigned long linear_addr; + xen_ulong_t linear_addr; } arg1; union { /* SET_LDT */ - unsigned int nr_ents; + uint32_t nr_ents; /* TLB_FLUSH_MULTI, INVLPG_MULTI */ #if __XEN_INTERFACE_VERSION__ >=3D 0x00030205 XEN_GUEST_HANDLE(const_void) vcpumask; @@ -832,8 +832,8 @@ typedef struct shared_info shared_info_t; struct start_info { /* THE FOLLOWING ARE FILLED IN BOTH ON INITIAL BOOT AND ON RESUME. = */ char magic[32]; /* "xen--". = */ - unsigned long nr_pages; /* Total pages allocated to this domain. = */ - unsigned long shared_info; /* MACHINE address of shared info struct. = */ + xen_ulong_t nr_pages; /* Total pages allocated to this domain. */ + xen_ulong_t shared_info; /* MACHINE address of shared info struct. */ uint32_t flags; /* SIF_xxx flags. = */ xen_pfn_t store_mfn; /* MACHINE page number of shared page. = */ uint32_t store_evtchn; /* Event channel for store communication. = */ @@ -848,18 +848,18 @@ struct start_info { } dom0; } console; /* THE FOLLOWING ARE ONLY FILLED IN ON INITIAL BOOT (NOT RESUME). = */ - unsigned long pt_base; /* VIRTUAL address of page directory. = */ - unsigned long nr_pt_frames; /* Number of bootstrap p.t. frames. = */ - unsigned long mfn_list; /* VIRTUAL address of page-frame list. = */ - unsigned long mod_start; /* VIRTUAL address of pre-loaded module = */ + xen_ulong_t pt_base; /* VIRTUAL address of page directory. */ + xen_ulong_t nr_pt_frames; /* Number of bootstrap p.t. frames. */ + xen_ulong_t mfn_list; /* VIRTUAL address of page-frame list. */ + xen_ulong_t mod_start; /* VIRTUAL address of pre-loaded module */ /* (PFN of pre-loaded module if = */ /* SIF_MOD_START_PFN set in flags). = */ - unsigned long mod_len; /* Size (bytes) of pre-loaded module. = */ + xen_ulong_t mod_len; /* Size (bytes) of pre-loaded module. */ #define MAX_GUEST_CMDLINE 1024 int8_t cmd_line[MAX_GUEST_CMDLINE]; /* The pfn range here covers both page table and p->m table frames. = */ - unsigned long first_p2m_pfn;/* 1st pfn forming initial P->M table. = */ - unsigned long nr_p2m_frames;/* # of pfns forming initial P->M table. = */ + xen_ulong_t first_p2m_pfn;/* 1st pfn forming initial P->M table. */ + xen_ulong_t nr_p2m_frames;/* # of pfns forming initial P->M table. */ }; typedef struct start_info start_info_t; =20 --=20 2.25.1