From nobody Fri Oct 31 09:55:31 2025 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=1747437723; cv=pass; d=zohomail.com; s=zohoarc; b=T1BgBvSGBnqwAjNzLnY+ChtQS7kAA+k/Ad7ojuvfo06IlkaXymHuYvfRQ0wX6c+4iUOW4IptmEAH+7C9bVlzEXawlOY6yR9M99GT/WKCOC8SSvMtd9VY5EfqbRsYVeM60H8s0qKhiU2QNKxTmxwVIt8xzEcLUjOb/NvobJ3sa6Y= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747437723; 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=uvsiHvmuEqOockd22z8vSZlAwyTxhLLN35xLes32HHk=; b=YZmMv+XScIVM/2k4azwLGTvGz989EtHald6q2MQarFsCTzAdA05uJnW+hoTKygmCC+sff5Av51+pgJJDeCjPsFFx04eeYTAn1eUpSaRZ2Qw+3tEfSKCozNW49t7Bo+c2U/ySDGPP3WjIlddiOyPCHEHtxp2rZsCi5bwn6/uH0eY= 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 1747437723761645.8228178943041; Fri, 16 May 2025 16:22:03 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.987713.1372929 (Exim 4.92) (envelope-from ) id 1uG4NE-0005zn-7O; Fri, 16 May 2025 23:21:52 +0000 Received: by outflank-mailman (output) from mailman id 987713.1372929; Fri, 16 May 2025 23:21:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4NE-0005zg-4O; Fri, 16 May 2025 23:21:52 +0000 Received: by outflank-mailman (input) for mailman id 987713; Fri, 16 May 2025 23:21:50 +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 1uG4NC-0005s2-9O for xen-devel@lists.xenproject.org; Fri, 16 May 2025 23:21:50 +0000 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on20600.outbound.protection.outlook.com [2a01:111:f403:2418::600]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8af95b2c-32ac-11f0-9eb6-5ba50f476ded; Sat, 17 May 2025 01:21:49 +0200 (CEST) Received: from CH0PR03CA0267.namprd03.prod.outlook.com (2603:10b6:610:e5::32) by IA0PPF4D923B935.namprd12.prod.outlook.com (2603:10b6:20f:fc04::bcd) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Fri, 16 May 2025 23:21:45 +0000 Received: from CH1PEPF0000A34A.namprd04.prod.outlook.com (2603:10b6:610:e5:cafe::a2) by CH0PR03CA0267.outlook.office365.com (2603:10b6:610:e5::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.20 via Frontend Transport; Fri, 16 May 2025 23:21:45 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CH1PEPF0000A34A.mail.protection.outlook.com (10.167.244.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8746.27 via Frontend Transport; Fri, 16 May 2025 23:21:45 +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.39; Fri, 16 May 2025 18:21:44 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.39; Fri, 16 May 2025 18:21:44 -0500 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Fri, 16 May 2025 18:21: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: 8af95b2c-32ac-11f0-9eb6-5ba50f476ded ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=miEQldNgMP2AiDsoajvZVOqjGMmV3UmyXf7RS86ZdeAQl89dQJvde7nuQlG/hrFs7O+mSgw2xZqoH2GCBdNxksZ7JAEJOdyL+5yvHZUf3F1A2CXthXcf7ZMJIQ2FCV5Xxt6Kwk+/tQTJKvlqNsb8t4x34VfiE2nwIhl3R0diDT90POQFyP6ueTXwlozkLYkv4s0/Iza65Vutg3vF7ANtdaPN8E47ZqlY3qW5rO2APkKOIlUeaj/9I7XT1TAdPOiHVdh/wG6xCIygSlYBz6nPIpj2yD9KsLYujCVqsEpdT5xSjJy8YQlzCWviLQImzo4gKWbB7R3cMYXSbt8p5dFYtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=uvsiHvmuEqOockd22z8vSZlAwyTxhLLN35xLes32HHk=; b=tp3TjxnJDa5NFFMpjApO5BICRidk54UBKfm/JSMzrJu5vtKlNjpW5swyLJo9Hii/kwPfAnMZ+YyckOvwREi7cxuMKvT1Ynk525VKUWEvTNWkeYpe120JSG3NveuxHVU1KdMTA2iSeRJ01pq2g1kDB2HpF0h2JC8upnwn16+5bLnucqOGD1LTHhnFl90uyqm9EU4eE5bu2nDMMPnCpTyG++6OAtf8O3KlrDdccQpyWQvCL2ijlU1YpV7upDr3utkbwyEtwaFjP+LOdgFEzxwfkz8zUhf7rR7ivJ59ee7aoGQv5KY+343anabbndFJ9RsTkptX2SSgcSQ4ZCUTKlWAoQ== 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=uvsiHvmuEqOockd22z8vSZlAwyTxhLLN35xLes32HHk=; b=mkQSTbJJh4SEWHJL4FG/Lqryi7CxDUN3ey0jCzmDXT7NBC7Ok4H7blEyS6lPf/uBAfbKORUnx9wMjmZon+KS5rBsjKeKDEGAYg1olXgeUtSAUJmrzJY0JIfvqoz/F8TQWZ9m8EPgf0wmnudwxxMTCXlYf8PMbKAks5ZTDUxleQ4= 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: , , , , , , , Federico Serafini , Stefano Stabellini Subject: [PATCH 1/6] xen/arm: add inclusion guards Date: Fri, 16 May 2025 16:21:25 -0700 Message-ID: <20250516232130.835779-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: CH1PEPF0000A34A:EE_|IA0PPF4D923B935:EE_ X-MS-Office365-Filtering-Correlation-Id: e201a081-0fcc-4e32-854d-08dd94d06c99 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?njfK6ToZIhyebKh+NzrMt0rs4rDwpbIMo3V+6Z7VsiESbOlsje71yRdOgiac?= =?us-ascii?Q?VB8cQF0XNCmp4tMTdNvs1JXylnc4+k+Nkvx7MuXLmOBk7zWzuCitV+bPcExk?= =?us-ascii?Q?27O5LO03487TpzL1R4Qm1Ix5FtHsLciO315VOhCtV+LAQqoTJqwXwu5so7wF?= =?us-ascii?Q?Fdjbk4wT5vvQ0Al+D19rrqUhLU/fp/lkIiS0XHed04Hob+22VGT69mapgxCw?= =?us-ascii?Q?BSb7UCfbQWHvbP7s0iK95kOECZzY5nkMXu2h+zDEkk1k8g5zrnN1tTR82YbU?= =?us-ascii?Q?4e6d6HiqNeVb0R2hLjr8Rgv4RBkBoglx6N2eh813Fadt+f4ArlRqAStFXy42?= =?us-ascii?Q?xas4Cf5LI0E8qdhg6MWf5ZuW1kV/PsY46VrCx1yV65MQQmcGmVGwtMotmAiG?= =?us-ascii?Q?TUFbvx6ccTc9V8izogs/UL0XHzi2q9F+dK90mDo6MEihxy/CV2ZGos8NY5QV?= =?us-ascii?Q?A2SQ6Uo4zj5JNcnPMPvwTuT9lrnlDBRWZgV90iHU5mQgIKrdrVQdY4C0i1Ew?= =?us-ascii?Q?wyFTEZY+Osgm6gr/lEMDivQnK6PVir3/+DjUGJ53ejyzquldShoZscBbJlmI?= =?us-ascii?Q?u2ZKnBNCsJ6vtPp2jXEVo99jn4T9BgAQH6m63Hb6ODRvhscq+I0cAZL8Gydl?= =?us-ascii?Q?hA2Mah8rsR37WfOQsrEHmmJAz/wDNu6uym4OJxIJQsSyB1CLGXlYEctUyTDE?= =?us-ascii?Q?P11A7BQ9OcTU31Z42KOaWnxK2hhE0/SoiSv11mnQUMbFt93OI3rN5WBwT1tI?= =?us-ascii?Q?OGetJ0RBh6E6a6DxZthsmOQ/Bi82JQ0fAK6tzc4UEDtnn4/6uZHx2Kp1uvbD?= =?us-ascii?Q?ocuGB7AlYq38izC7PxvhgIdHNGXb+gFbXPnCsE/RUeM4pLdef2TwWbM82PPH?= =?us-ascii?Q?fhxJRAULddX+/bsnKdMRSFc+N7n8caDgH06ivW4xrmNMKbya/PUBedQcSY97?= =?us-ascii?Q?f1PNmQAiE0oCqP4wXu2dPgzT7zrzekSPXP1Mg9iaShK6Cjkn5/jNTCBflTNA?= =?us-ascii?Q?CU8Kwr/Duhf0Rda+QgUjjk+HFyqBzMmKKS0Fo/SDEH3zSoIjcZzTDVKTo1By?= =?us-ascii?Q?SPM9Z9vy9zYrKtlsWYoCknlz1Y20HyPimpK4+pU4l1uADUtxabCByJiPorYx?= =?us-ascii?Q?2mimQQNMvMdTt0QDww9fTz6zBYsWdwbHI14KW5g0eyNR3TUlbddpi/p6fACU?= =?us-ascii?Q?+zGxiufLGC0z80C+V+kFLXLbM6z5727j+00kbH5yIfstbf21+ufZfSoJ72Ft?= =?us-ascii?Q?G/Zcz1M6ThXRmVHoqF9LUxihj+fOGTAa9iNrxdlLrJxHeoqnHlk8uYjNBqbS?= =?us-ascii?Q?ZonT3jG23beArVYVJP3M3J4tcydF47XOfwShP4QYMX3GsoC/owPWX18q+VKm?= =?us-ascii?Q?Q5rKb1LsVA8jK/Ht40ze4/9+O9hNrUpsUclwhZgjAM1sT83qAmsn2yIPozEX?= =?us-ascii?Q?RB0gIB1Jled/vi+sNXwHZpXU3TMeqhxLX+3ROPJVkE/Cf95kIxRhIpugayza?= =?us-ascii?Q?Ay4PcqL1TRZrVDuTtKyVjJKN5Mce+jAS5UUZ?= 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:(13230040)(376014)(36860700013)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2025 23:21:45.1635 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e201a081-0fcc-4e32-854d-08dd94d06c99 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: CH1PEPF0000A34A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPF4D923B935 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1747437725243116600 Content-Type: text/plain; charset="utf-8" From: Federico Serafini MISRA C Directive 4.10 states that: "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Add inclusion guards where missing to address violations of the guideline. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Reviewed-by: Andrew Cooper --- xen/arch/arm/efi/efi-boot.h | 6 ++++++ xen/arch/arm/include/asm/efibind.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index dcad46ca72..d2a09ad3a1 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -3,6 +3,10 @@ * is intended to be included by common/efi/boot.c _only_, and * therefore can define arch specific global variables. */ + +#ifndef ARM_EFI_BOOT_H +#define ARM_EFI_BOOT_H + #include #include #include @@ -1003,6 +1007,8 @@ static void __init efi_arch_flush_dcache_area(const v= oid *vaddr, UINTN size) __flush_dcache_area(vaddr, size); } =20 +#endif /* ARM_EFI_BOOT_H */ + /* * Local variables: * mode: C diff --git a/xen/arch/arm/include/asm/efibind.h b/xen/arch/arm/include/asm/= efibind.h index 09dca7a8c9..92b8bad0bb 100644 --- a/xen/arch/arm/include/asm/efibind.h +++ b/xen/arch/arm/include/asm/efibind.h @@ -1,2 +1,7 @@ +#ifndef ARM_EFIBIND_H +#define ARM_EFIBIND_H + #include #include + +#endif /* ARM_EFIBIND_H */ --=20 2.25.1 From nobody Fri Oct 31 09:55:31 2025 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=1747437728; cv=pass; d=zohomail.com; s=zohoarc; b=ZdIWu/bwDbRmp7mcakfzhV9fF/LcvqzDSffaXfd/eaedMpCd2+a9gvfDY60Jy7mlzi1QuPHClg6yb6paVO8rQ7XQd/hc/DWzG709AaWAViUiFGmfmnm365bAI40VXJIJps70bWnoUOHUTwCvFhmMN+KuoE03bz354zszH+Eoaso= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747437728; 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=hOfLncgDV8d5Q1wUOwc7gzU+soF9bg8LoZ3vX+hETX0=; b=P4TnY620SDYGFDhh16M17X06LG1v8/O2wkjT/FTw5a3xCJJqv0Esxghw4uctSkLVa8BR4qAhw1ge4b6ae+C1It+YuLs3ylxQx+NEUTUItipUhUxJgXtSgpzmjgVNZg7xkQGy6ZcEhmYG3mXts7dn7NX033Q6QbmJirUoi0Gt2mI= 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 1747437728520991.4968521093978; Fri, 16 May 2025 16:22:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.987715.1372939 (Exim 4.92) (envelope-from ) id 1uG4NH-0006HP-Dv; Fri, 16 May 2025 23:21:55 +0000 Received: by outflank-mailman (output) from mailman id 987715.1372939; Fri, 16 May 2025 23:21:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4NH-0006HI-AW; Fri, 16 May 2025 23:21:55 +0000 Received: by outflank-mailman (input) for mailman id 987715; Fri, 16 May 2025 23:21:53 +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 1uG4NF-0005s2-9h for xen-devel@lists.xenproject.org; Fri, 16 May 2025 23:21:53 +0000 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20624.outbound.protection.outlook.com [2a01:111:f403:2413::624]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8bf9804a-32ac-11f0-9eb6-5ba50f476ded; Sat, 17 May 2025 01:21:52 +0200 (CEST) Received: from CH0PR03CA0247.namprd03.prod.outlook.com (2603:10b6:610:e5::12) by MW4PR12MB5666.namprd12.prod.outlook.com (2603:10b6:303:188::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.30; Fri, 16 May 2025 23:21:47 +0000 Received: from CH1PEPF0000A34A.namprd04.prod.outlook.com (2603:10b6:610:e5:cafe::b5) by CH0PR03CA0247.outlook.office365.com (2603:10b6:610:e5::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.29 via Frontend Transport; Fri, 16 May 2025 23:21:46 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CH1PEPF0000A34A.mail.protection.outlook.com (10.167.244.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8746.27 via Frontend Transport; Fri, 16 May 2025 23:21:46 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.39; Fri, 16 May 2025 18:21:45 -0500 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Fri, 16 May 2025 18:21: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: 8bf9804a-32ac-11f0-9eb6-5ba50f476ded ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IPwM/EYi1QPTSXZ4KDn1/9i4Pd0LexesI1nf4/nfOpVDRFBO42NlwapMPWOBejXnRKeiAommHBjyTpWriTBS8XS9YrdI2zxOfbFjE5dCvQXSYNfbreMjepgrJH0FIOjzUCjAkAIWXgcELgvp2EmN4UNODJIx90wELNU891+O+jVoqfU8t7HMkxF4aFDLMnc2+hm+nXzJg7ltejO9CDmysW/RCTyJHWQ9SdYlasyyhr4mzSEKTXTUlSQKUFHUh9RJ94pSjSxNToV8bzzwWlDTI96zCMvEMC+tHKgmG3LsycqWmwI2QGwLmU84a/mMwY9nsW/LTbejQDrcp62G5T+ABw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=hOfLncgDV8d5Q1wUOwc7gzU+soF9bg8LoZ3vX+hETX0=; b=rtTlNKFby8cQfn8irbtFwtWEE3cUoZCmL+Dsspe8nSfaHKjQythtmrRfeVfeDaWuezwy8VcSYwqM7z+FR5d9dxnLShZ//wUM5Q1Pk3w0DMPsJlKXH4pYP2Wv/hIzTJSuyUaD8rqqu6UKQOJtl9U9T4TVR9ILy1d5DUmIKWvj0F5nZyZ1vAmAWVZbkrBZw4AHwr7IYolY4xvGKqH5iOphz4HbF/ERXb3GKB/86/OmBuZEP4f4sksw/bi0516W0168ZIwRqd7h6o2xHuNiDKo85Vz0pfbhF4RTeolep1dLTu/104uKOpfkRpcHmYdzWuNumxM898YPDI4+mjxAyCg61Q== 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=hOfLncgDV8d5Q1wUOwc7gzU+soF9bg8LoZ3vX+hETX0=; b=ZpUlH5p+W4QUzagKIse9gtO74NPBy0s5Xz39VuQwF5tC02YrTvRESUXqGpmqZDZcR9An7meGqqsidOH94DeJzP24iqeH8xetGWL+U6Yw+R6KAevdx8yvFSKpsBT4PF9ZNu4SKmnX0nVrBmbL3vBQuIOBl8FGTH328RGMm0fCeZ8= 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: , , , , , , , Federico Serafini , Stefano Stabellini Subject: [PATCH 2/6] xen/x86: add inclusion guards Date: Fri, 16 May 2025 16:21:26 -0700 Message-ID: <20250516232130.835779-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 (SATLEXMB03.amd.com: stefano.stabellini@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A34A:EE_|MW4PR12MB5666:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e30d180-9f2c-4510-09c2-08dd94d06d32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RDTLGWSWeHuWgJql4JL54szsUnjnlPXtULl5K3JPtwFlBtxS9nSUdVD2jkgF?= =?us-ascii?Q?lafQ4/Sv/KGUsOGbweuaHTJ/jjzFn5VX57K3RjKmBwdfIgoJnHsOhS/etYgd?= =?us-ascii?Q?bRDL8EUeH2aL13MZ+lfue1G8P071ma6+Q9nO6rOlZLd4iiN2X4suNbocRSvX?= =?us-ascii?Q?zD6HggIZ3DWeCmrH+FEKVzwnHhUivjg6n8yKTTnxRmEIv2HKtd2dbK4l+pCC?= =?us-ascii?Q?aOd7ltM0BPDwbA0bWqv3QENvgLOOlDG0WpgBJ9rzw5f15YJUU+s/HLVH9P9w?= =?us-ascii?Q?SyUqHYsfqEFNx8DqTV1s2G2z5xHeY7V58QNT3zJZ0tZfashNCkxMPT1hpA85?= =?us-ascii?Q?FCZv0JGeRZcdFX7c387I4n8f8kvHRXT/9LZO/zRzdmnDxfFHw1kUZskQHnO8?= =?us-ascii?Q?5EwfXi6U4AMdg0fb+hMnvAxSJTlYCt+qdTQJVZ0zPwU4PWODOJNAKy9SEhm+?= =?us-ascii?Q?OmlDIR+FH3dISEv1+4PnD0STruozZlk2Tt4mtwE0+F+rp5gl/VqbkOLml1zZ?= =?us-ascii?Q?EnPRaBLHQyvHbtMRoTREh4xEAqH7sFYO4+OkuuMPfil55Xi6EqFeSJwfYNS2?= =?us-ascii?Q?qxvUbp1cZoMaHsJW7Dq5UgqIbh4ErUQTGi9zJJF7jSmmrZZ9KAGKfD+Vh9YX?= =?us-ascii?Q?H3i2HRsnoXK6bGwYsTCMNQVBR5yVQ06jNWWzPO+dDnZBgIhWrux4SYoetCAt?= =?us-ascii?Q?pwUxIVyvzHkKmjsj0T1PH0+5fW7zv/IqNScY0FxI4zM5mPRCaiOCGEFrbzoD?= =?us-ascii?Q?K1Xh2KNTabN/Gs/jBQdWDHpem0ABUYu3bZ/J+/oD0hYwGzCXbsJUp6Wfj7bm?= =?us-ascii?Q?+cX4aJyB3zetIfs1nMFxhRwGDUYDegzYi0UT0YEBfrzPHQ9JVjakzBTkB/LO?= =?us-ascii?Q?gVKqzxUJTY7ZniZdOdjNO67vKKrFPahFmjFrzYZIOmyBd1Yacfwl7yl/SciL?= =?us-ascii?Q?9H/LaDJGuRUbvw+0UZxtI15rKz226Ps7agCAIFjtZd4tkp8ozQ5iZdwQU1L7?= =?us-ascii?Q?2J5uCenKKnVg7tkhvFgnqUTnuAyI1uNcda8H3E10Rx/bkjigGS1GGh3xG38S?= =?us-ascii?Q?uUIFJCN3eDlhPf04oEtcNkh08CFZj0QrlCK2MT4yq/di9AsdR13HrtsCj8gm?= =?us-ascii?Q?/LBpIm68AkwFMrdW4yPrkNkAbtdb1Ln6YFKo5ZJmELbigdhX1GsLSBOicHKs?= =?us-ascii?Q?u4kYW4z2Y8y3rRqnAQw/2PSamCX4kjTNEqz/U90aG3kGtjC0rReYsypQZ/wO?= =?us-ascii?Q?94TfGUifTNBCgZmiSzwU5G3evZqEqgvCzANel195tA8QJQEL1WwcUHBW1Vax?= =?us-ascii?Q?CVCSVdXfB2VDN3lviDQ21b3p/LLgvNeLcx75SgEtyY5nd4vok8NjI5N6iF9/?= =?us-ascii?Q?Zhv8sfplxzM1HqDimluWhPaQ+D91sXYmP2pOhW2Xw19hx1kAy0nD6gToO9Sn?= =?us-ascii?Q?nZx8ybXheUuQwoySngdmQuEAWn+0TkPV27feu6aKOAOfwdfp+g6LIM+GlzTJ?= =?us-ascii?Q?C8yfXQ93jAv8sVG892YX4ZavQT93jpzfkNxO?= 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:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2025 23:21:46.1229 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e30d180-9f2c-4510-09c2-08dd94d06d32 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: CH1PEPF0000A34A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB5666 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1747437729538116600 Content-Type: text/plain; charset="utf-8" From: Federico Serafini MISRA C Directive 4.10 states that: "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Add inclusion guards where missing to address violations of the guideline. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/cpu.h | 6 ++++++ xen/arch/x86/efi/efi-boot.h | 6 ++++++ xen/arch/x86/efi/runtime.h | 5 +++++ xen/arch/x86/include/asm/compat.h | 5 +++++ xen/arch/x86/include/asm/efibind.h | 5 +++++ xen/arch/x86/x86_64/mmconfig.h | 5 +++++ xen/arch/x86/x86_emulate/private.h | 5 +++++ 7 files changed, 37 insertions(+) diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 8be65e975a..cbb434f3a2 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -1,4 +1,8 @@ /* attempt to consolidate cpu attributes */ + +#ifndef X86_CPU_H +#define X86_CPU_H + struct cpu_dev { void (*c_early_init)(struct cpuinfo_x86 *c); void (*c_init)(struct cpuinfo_x86 * c); @@ -26,3 +30,5 @@ void amd_init_spectral_chicken(void); void detect_zen2_null_seg_behaviour(void); =20 void intel_unlock_cpuid_leaves(struct cpuinfo_x86 *c); + +#endif /* X86_CPU_H */ diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 1d8902a9a7..0ecf4ca53f 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -3,6 +3,10 @@ * is intended to be included by common/efi/boot.c _only_, and * therefore can define arch specific global variables. */ + +#ifndef X86_EFI_EFI_BOOT_H +#define X86_EFI_EFI_BOOT_H + #include =20 #include @@ -908,6 +912,8 @@ void __init efi_multiboot2(EFI_HANDLE ImageHandle, efi_exit_boot(ImageHandle, SystemTable); } =20 +#endif /* X86_EFI_EFI_BOOT_H */ + /* * Local variables: * mode: C diff --git a/xen/arch/x86/efi/runtime.h b/xen/arch/x86/efi/runtime.h index 77866c5f21..88ab5651e9 100644 --- a/xen/arch/x86/efi/runtime.h +++ b/xen/arch/x86/efi/runtime.h @@ -1,3 +1,6 @@ +#ifndef X86_EFI_RUNTIME_H +#define X86_EFI_RUNTIME_H + #include #include #include @@ -17,3 +20,5 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry= _t l4e) } } #endif + +#endif /* X86_EFI_RUNTIME_H */ diff --git a/xen/arch/x86/include/asm/compat.h b/xen/arch/x86/include/asm/c= ompat.h index 818cad87db..30ed8f2fd0 100644 --- a/xen/arch/x86/include/asm/compat.h +++ b/xen/arch/x86/include/asm/compat.h @@ -2,6 +2,9 @@ * compat.h */ =20 +#ifndef X86_COMPAT_H +#define X86_COMPAT_H + #ifdef CONFIG_COMPAT =20 #define COMPAT_BITS_PER_LONG 32 @@ -18,3 +21,5 @@ int switch_compat(struct domain *); #include static inline int switch_compat(struct domain *d) { return -EOPNOTSUPP; } #endif + +#endif /* X86_COMPAT_H */ diff --git a/xen/arch/x86/include/asm/efibind.h b/xen/arch/x86/include/asm/= efibind.h index bce02f3707..ab46341281 100644 --- a/xen/arch/x86/include/asm/efibind.h +++ b/xen/arch/x86/include/asm/efibind.h @@ -1,2 +1,7 @@ +#ifndef X86_EFIBIND_H +#define X86_EFIBIND_H + #include #include + +#endif /* X86_EFIBIND_H */ diff --git a/xen/arch/x86/x86_64/mmconfig.h b/xen/arch/x86/x86_64/mmconfig.h index 3da4b21e9b..722bf67975 100644 --- a/xen/arch/x86/x86_64/mmconfig.h +++ b/xen/arch/x86/x86_64/mmconfig.h @@ -5,6 +5,9 @@ * Author: Allen Kay - adapted from linux */ =20 +#ifndef X86_64_MMCONFIG_H +#define X86_64_MMCONFIG_H + #define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 #define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 =20 @@ -72,3 +75,5 @@ int pci_mmcfg_reserved(uint64_t address, unsigned int seg= ment, int pci_mmcfg_arch_init(void); int pci_mmcfg_arch_enable(unsigned int idx); void pci_mmcfg_arch_disable(unsigned int idx); + +#endif /* X86_64_MMCONFIG_H */ diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/= private.h index 30be595470..467bce3c84 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -6,6 +6,9 @@ * Copyright (c) 2005-2007 XenSource Inc. */ =20 +#ifndef X86_EMULATE_PRIVATE_H +#define X86_EMULATE_PRIVATE_H + #ifdef __XEN__ =20 # include @@ -843,3 +846,5 @@ static inline int read_ulong(enum x86_segment seg, *val =3D 0; return ops->read(seg, offset, val, bytes, ctxt); } + +#endif /* X86_EMULATE_PRIVATE_H */ --=20 2.25.1 From nobody Fri Oct 31 09:55:31 2025 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=1747437735; cv=pass; d=zohomail.com; s=zohoarc; b=BMGxhqu2FAAjsmuqjKGJGBCQL19I1acDuNayhlmjxajS/qJWHkeu4VMY2t+r5tcr5z6K6LKqasXfaYbdoTBGa3+++zrwCl5yGoqLkZnm1VmGFFxKeVljeJOr4dYQb/Ptyn0WArFoUD4UgG9AtpGKhA6U5K2hd/YocoZ29SCITss= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747437735; 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=buer/yquglfA9IXFa3Y4Vl4yg61qaCIVyNVRWFZFS5E=; b=M28zU0DiCrqmG+L3EMX9ozdnAHWQQ52QocAkm4cmsG9eKPrm8wL83HLL8Mlu7NUvheOg0qgS9AkA+lQtOy8q0z6zoquW7ciGhgoIC8F6gAMPl6cjmD2+T4yIEVEQHwRcMLD5aoOfpHhAFjhFM4+O9T3cYgCgLoriu2k5kdGB/Og= 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 1747437735583457.60939910502896; Fri, 16 May 2025 16:22:15 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.987717.1372955 (Exim 4.92) (envelope-from ) id 1uG4NJ-0006Ze-1B; Fri, 16 May 2025 23:21:57 +0000 Received: by outflank-mailman (output) from mailman id 987717.1372955; Fri, 16 May 2025 23:21:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4NI-0006YG-Ob; Fri, 16 May 2025 23:21:56 +0000 Received: by outflank-mailman (input) for mailman id 987717; Fri, 16 May 2025 23:21:56 +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 1uG4NI-0005aL-0D for xen-devel@lists.xenproject.org; Fri, 16 May 2025 23:21:56 +0000 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on20619.outbound.protection.outlook.com [2a01:111:f403:2408::619]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8dc1552c-32ac-11f0-9ffb-bf95429c2676; Sat, 17 May 2025 01:21:54 +0200 (CEST) Received: from SJ0PR03CA0075.namprd03.prod.outlook.com (2603:10b6:a03:331::20) by DS0PR12MB6654.namprd12.prod.outlook.com (2603:10b6:8:d1::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.33; Fri, 16 May 2025 23:21:48 +0000 Received: from SJ5PEPF000001CD.namprd05.prod.outlook.com (2603:10b6:a03:331:cafe::b) by SJ0PR03CA0075.outlook.office365.com (2603:10b6:a03:331::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.20 via Frontend Transport; Fri, 16 May 2025 23:21:47 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ5PEPF000001CD.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8746.27 via Frontend Transport; Fri, 16 May 2025 23:21:47 +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.39; Fri, 16 May 2025 18:21:46 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.39; Fri, 16 May 2025 18:21:46 -0500 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Fri, 16 May 2025 18:21:45 -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: 8dc1552c-32ac-11f0-9ffb-bf95429c2676 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Wq4wcSE0OxPwoI2lFKQrNTDQYDpqmWZTagP/dr3IOUNvjU3j32Iacp37b4NSxsYWCiToRXFOdg8HtL7W7keiooDkgZjfu0Q0GOVnynUi5yI4ygUAwphFemadloFfZDcsxkIaM8ScEmeUSxUVt/OF2TOLgeIdDO/j/lbKvdbDXamZDoswjRPYlwcncs7YHKD8dexgCp4BYt9oARMT9vrJ7WKycP+AkFaCY/QNH/TD3H4uRk2k/exNY3Mk+4xKzzDzzE+ZajiNPAoi7JjHSx/E+mAlX+euTDEmLXDmquYQ27MziX/k8yT5lKFTd06bytvGr1CwIhSXsRs0uxopjxBQVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=buer/yquglfA9IXFa3Y4Vl4yg61qaCIVyNVRWFZFS5E=; b=Ixk79s/37rKQo9wiVbAVF5KtE2ABszJ/E++5p7aY9wcJd813ooSAL+KXolHfZK7YWRB+FNoGIw6I/f8wsDOM/GrjuoEwPIMIyCMv9J8U7SZQYNycDKF43W5jP1s4R1MIKib5QEK/w2Yr5rgQ5V3QqE9jXd8y3wib+NFQ0WuaGNYb0A/RO4Z3pbGEZMEBNsE8ugn8zKLLUR0HhJjDWNmhCBXeXOwzv2DnMPzmOFJn82OzYj95zEzyiJIphLxfZA7zZmF+yEVZYXEQm4a/Pi77BLdKKni/ocM+0NuKmeMD/6/Qzk1XEgpzPl5OOUWPQVYABf9ffNe+YpPJdoX0HmX1vw== 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=buer/yquglfA9IXFa3Y4Vl4yg61qaCIVyNVRWFZFS5E=; b=sYBcgXrucDa43WOpz8FWPEot2bOd00i7FCBvq/EQNskGuBEg57xtGpACTtHzey35ydkUK0I1jee5ora8Har2GjwD9cmMNqKLjjdiK9DDtRz7zd9BiKdlqeuoLIjpFGKzdEvrOl3OYiaEpT6b9RaDFvx5wWRB6h+8grEGaeB07EA= 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: , , , , , , , Federico Serafini , Stefano Stabellini Subject: [PATCH 3/6] xen: add inclusion guards Date: Fri, 16 May 2025 16:21:27 -0700 Message-ID: <20250516232130.835779-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 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: SJ5PEPF000001CD:EE_|DS0PR12MB6654:EE_ X-MS-Office365-Filtering-Correlation-Id: 46ed49a2-ccad-4abd-5811-08dd94d06dff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XlEgjc6uz3VWMkmskh5kysM/uMntRkrrJGOifqG5D0Wr8Fdh4Dbe+Pa9Zsw8?= =?us-ascii?Q?36m+yRld9oiUc9D40OfiUNmaAqYY62ZslrNezNXMVU4nRlyHRsilzvR2PCYb?= =?us-ascii?Q?bc5560hF6m/Uq//9O9x1eLP1L7+VdXp7KpIcJ7GCT78G23gLsPcqzjpYNGhp?= =?us-ascii?Q?Hi1NAidHwV11F+Ncq3bl8LQtm2HLvU2+xJjbbiJn7VdUFGaqez/EpWtvLU4N?= =?us-ascii?Q?IzY/Xfr9veUd9LdrirjULj8FgCFSbR740+6rTvabY2jJyjbCzcbiSjySy/th?= =?us-ascii?Q?rsQ4dH2cmT7Bx0Daq08SBuPG2fGMiXking21qPkBc/g+EeP75KwtVgIRZKH8?= =?us-ascii?Q?Pd3vp+DgE51ahIA3Ckix4kV12Gxj7ZgyW7rZHHgzIQHp21N1QK/wE+dbDRqx?= =?us-ascii?Q?OmBj4Y3iyqGwmvB+/rQY/dVY1zTvl5oOFwL/050GfrRnnScrzSYLoeTSo+8d?= =?us-ascii?Q?ftqtnWnqRee1krBpZ81ph6FezKa/husyO879fyLIiIf8O9hRglGYxPxLVS1j?= =?us-ascii?Q?Wj5odFkw6sltAft8LkXylcx2DePAh0Qj5pytTxSJ7/CQ2a6KkuyJ7VybCJ80?= =?us-ascii?Q?ScBVqXDhV0uAEx0cO5KH0Nz8qv5ESE7dtfWJYLF6bDG16YBgkMdzFXdeeyxD?= =?us-ascii?Q?nmXUZCui+eVgqdphLRwR9H4NVZeuP5tfspKR5fdDAgmYOAKjAhZP0qxSTBG+?= =?us-ascii?Q?zvuQInTc0eSDzW3Qzgv+xipR77L1MupwpvE/dQ6nau03L77aC/IOOuoLXVip?= =?us-ascii?Q?o7J1w6A671sXYgxVlAWYHZp8CONefB/d8mgTbYnvo2mUOunLann1p4vJaYmi?= =?us-ascii?Q?L9vcRU5Ai+DyiLjCBAUccBatJrpS2po7e0mJasY/wWGDgMD4BD/rYq/gFVYk?= =?us-ascii?Q?WXe6hBcM/FnX4SKrnIiprJ4mmFrs5rsinBFAV3uODmc8ryD8sIZhLTe8RdH7?= =?us-ascii?Q?rG1nU/SlfOjSLjcpjI0NpEfVPiH3xhHhJ3UQcPIx8rlmUbjFBNsBARx8Kx3Z?= =?us-ascii?Q?ztnTe7DP6iXZ8/OT/D25gZQNUfKQ1L3t86ncbDqnLt4+rWs2jAOTxubzYjKN?= =?us-ascii?Q?TCdB/8HpbRT3BmYe3qSmrG7VwUpSMFpnblb6tn5shmEkEE5PIo8cnXwE6fsa?= =?us-ascii?Q?S1hcvjSxjpmTT6Kve21LS6ew87wP4JhraaC5pYzqu/UrebXhoiV2JlQelEG2?= =?us-ascii?Q?l3oFsQf+k5cZ7px01fcBX6UeAFvKFGY6kHFj9MsKj9yHzrwZhu8EWQJ6Q631?= =?us-ascii?Q?RhEqTJeOuD+c9KuS7XrlreM19o2vw5Njtz5RLphlbFJgZGzOzS6edWU1I4je?= =?us-ascii?Q?aQG1YPB4uLvgmDCeFulX9fUNrwEkPMZbU6It3uH5pmdTJrRza3I9qBLppnww?= =?us-ascii?Q?CaauvErRafnShpfjn74lANAiWQqBm+p6e+qy6rHdqu2KknzahDtEZSi/4cHp?= =?us-ascii?Q?Vcf2IHmKU81vGzHzGgqW4WaS2mixZlQQgr4Mn2Bdjgajf90fgU+ZbN+g0L/j?= =?us-ascii?Q?c6rUAbiUm4lpqHsA6ENKCvBbAMQDYU627W8c?= 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:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2025 23:21:47.4762 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 46ed49a2-ccad-4abd-5811-08dd94d06dff 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: SJ5PEPF000001CD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6654 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1747437737206116600 Content-Type: text/plain; charset="utf-8" From: Federico Serafini MISRA C Directive 4.10 states that: "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Add inclusion guards where missing to address violations of the guideline. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/common/decompress.h | 5 +++++ xen/common/efi/efi.h | 5 +++++ xen/common/event_channel.h | 5 +++++ xen/include/xen/pci_ids.h | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/xen/common/decompress.h b/xen/common/decompress.h index 4683eb6c7e..034c833665 100644 --- a/xen/common/decompress.h +++ b/xen/common/decompress.h @@ -1,3 +1,6 @@ +#ifndef DECOMPRESS_H +#define DECOMPRESS_H + #ifdef __XEN__ =20 #include @@ -22,3 +25,5 @@ #define large_free free =20 #endif + +#endif /* DECOMPRESS_H */ diff --git a/xen/common/efi/efi.h b/xen/common/efi/efi.h index c02fbb7b69..b02aa2775d 100644 --- a/xen/common/efi/efi.h +++ b/xen/common/efi/efi.h @@ -1,3 +1,6 @@ +#ifndef EFI_EFI_H +#define EFI_EFI_H + #include #include #include @@ -51,3 +54,5 @@ void free_ebmalloc_unused_mem(void); =20 const void *pe_find_section(const void *image, const UINTN image_size, const CHAR16 *section_name, UINTN *size_out); + +#endif /* EFI_EFI_H */ diff --git a/xen/common/event_channel.h b/xen/common/event_channel.h index a778ae775b..dc94a43cc2 100644 --- a/xen/common/event_channel.h +++ b/xen/common/event_channel.h @@ -1,5 +1,8 @@ /* Event channel handling private header. */ =20 +#ifndef EVENT_CHANNEL_H +#define EVENT_CHANNEL_H + #include =20 static inline unsigned int max_evtchns(const struct domain *d) @@ -67,6 +70,8 @@ static inline void evtchn_fifo_destroy(struct domain *d) } #endif /* CONFIG_EVTCHN_FIFO */ =20 +#endif /* EVENT_CHANNEL_H */ + /* * Local variables: * mode: C diff --git a/xen/include/xen/pci_ids.h b/xen/include/xen/pci_ids.h index e798477a7e..5884a20b8f 100644 --- a/xen/include/xen/pci_ids.h +++ b/xen/include/xen/pci_ids.h @@ -1,3 +1,6 @@ +#ifndef XEN_PCI_IDS_H +#define XEN_PCI_IDS_H + #define PCI_VENDOR_ID_AMD 0x1022 =20 #define PCI_VENDOR_ID_NVIDIA 0x10de @@ -11,3 +14,5 @@ #define PCI_VENDOR_ID_BROADCOM 0x14e4 =20 #define PCI_VENDOR_ID_INTEL 0x8086 + +#endif /* XEN_PCI_IDS_H */ --=20 2.25.1 From nobody Fri Oct 31 09:55:31 2025 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=1747437733; cv=pass; d=zohomail.com; s=zohoarc; b=AHIv7IhdcuE/5jPhn5CfvPAL+dS6FhjXaNBxRYktvw74U7IzUzuUbd3RIds1QTd/2e4GJ71CCy5E7Xx9Lf6rDHJKrlE73kBvDbMaapuo9rvp5loZHcavcJwR9pVuwxK0Xo0YAOlPx/DnZuw2+J/1KPQAV98+TKslBhjzqW8B+dc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747437733; 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=57V9Nd7Q2z6fh1EUxxPXh8g4JtB/sK8KIr3H3tt5FC0=; b=kLCLujVzdPtp/cIWYJQyO/jgzR7JqCs6cadqu5qqP63Ic6C9NGBY56BXHoIrrJMVzg9Slk1qKBTqZyZ+HqG9NS8+WyZzyiQ66r7Anqlswpx49u/qxKcGSLoQnM3yc5AmJXEdk633NzaOkBmQCnXVJDs14p8XvMlcT1ejbs7fBWQ= 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 1747437733852461.2159169942753; Fri, 16 May 2025 16:22:13 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.987718.1372970 (Exim 4.92) (envelope-from ) id 1uG4NK-00070w-Em; Fri, 16 May 2025 23:21:58 +0000 Received: by outflank-mailman (output) from mailman id 987718.1372970; Fri, 16 May 2025 23:21:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4NK-00070D-8g; Fri, 16 May 2025 23:21:58 +0000 Received: by outflank-mailman (input) for mailman id 987718; Fri, 16 May 2025 23:21:56 +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 1uG4NI-0005s2-M2 for xen-devel@lists.xenproject.org; Fri, 16 May 2025 23:21:56 +0000 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2061d.outbound.protection.outlook.com [2a01:111:f403:2412::61d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8e5915ea-32ac-11f0-9eb6-5ba50f476ded; Sat, 17 May 2025 01:21:55 +0200 (CEST) Received: from CH0PR03CA0427.namprd03.prod.outlook.com (2603:10b6:610:10e::30) by PH7PR12MB9253.namprd12.prod.outlook.com (2603:10b6:510:30d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.24; Fri, 16 May 2025 23:21:48 +0000 Received: from CH1PEPF0000A34B.namprd04.prod.outlook.com (2603:10b6:610:10e:cafe::51) by CH0PR03CA0427.outlook.office365.com (2603:10b6:610:10e::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.25 via Frontend Transport; Fri, 16 May 2025 23:21:48 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CH1PEPF0000A34B.mail.protection.outlook.com (10.167.244.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8746.27 via Frontend Transport; Fri, 16 May 2025 23:21:48 +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.39; Fri, 16 May 2025 18:21:47 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.39; Fri, 16 May 2025 18:21:47 -0500 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Fri, 16 May 2025 18:21:46 -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: 8e5915ea-32ac-11f0-9eb6-5ba50f476ded ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N48k9fDCm8AVH1vOEgCH4zBs4bk7c80SjG3qyO47bAB54rcAosn7JTDslQ63+0Y1QrM84c99Cl2J9L45RgglPn++X0cCMcHf1qywv69WshZ0Rc0BVM4buCw0Un7HhOmrOVB7eZmb7nJpI/lOm2JlMO3TjXpbtT+s8y34MM0G7zKkCGdNlsXc7TT0s3RXMZzxYIlxETGuGDA/7UIpu1/A9BF+LvN0HMe6bW1vSP5B2AxIOs0t9MN8njLEdMakrILAHQ6QCAei6pR6uZvLplveiQ+JRLVpuWc6d68gyZJE9hREcE7V8QDCDVmVnRBFcjLDqShIMhC3bu9Odc0qd+Es+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=57V9Nd7Q2z6fh1EUxxPXh8g4JtB/sK8KIr3H3tt5FC0=; b=RgqtonA+hPeHS2wHXU0H0nn9XIGhKwvRhnKo8r4QfRVbgHkaSGZzSr/ZLZoPDBpCnDWw2+96ZyjqlDIC0WysihaJVAeI5FOvNtTjgHmnrur+0U/HKWQRQXjxDtRt6h4xz2JglEU9nVJP1bgxWU5rHATOqfUxeior5zjkU9byWX6mqUhDCCbdqzkj7kjtOUS0Ye2ARxaCLgI+0HF0fBd8ga7RQIVeLPiLFyDasqsM/vKF7hXjLYcnzPPel2IXU3FuCtKzyAgUOeoMcvh5ow08fKCEZioVq7FNfrtM7RUdQWy/GxxPJKKBo4norIABPTE3nhB5UuRwufQ36JMAnadovg== 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=57V9Nd7Q2z6fh1EUxxPXh8g4JtB/sK8KIr3H3tt5FC0=; b=3pjvcGzeemkOKnkD40JJuwZ3Z40UJ5INMqPZTSPCgwfuL6Egc5OumHnzoUELueenoZvNVhlA5ZsrKZhh3skcvZP5GsToMJ5RSIO3H2DuW7xJDxgHatHs3TKa4eYjnGk7vQRdianV0XdY79Z5KX/fgJil9TSiHNU4yOvwG5N7neo= 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: , , , , , , , Federico Serafini , Stefano Stabellini Subject: [PATCH 4/6] xen: refactor include guards Date: Fri, 16 May 2025 16:21:28 -0700 Message-ID: <20250516232130.835779-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 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: CH1PEPF0000A34B:EE_|PH7PR12MB9253:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c29a5e5-071d-463c-c03b-08dd94d06e48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?GQspYlvZQDBymHqomv21D0KcsBZtzoy/cYmN4qXNJJ17E4GV4MRNkeIy2Ppa?= =?us-ascii?Q?ZCAPTO1ppVLgK2M//Jtomfm1srPqt+Y0pkIPIdOejEOxVvfpvNekUw8Ahz5E?= =?us-ascii?Q?Odv4LwymtYlLP+gqSFXTtyLJ2Bg+O6Th9xfwuOZyHKILD0++i73msKpZvEHs?= =?us-ascii?Q?dF6U/j2q99+NURY5ZR3dpT0vq1/h3gNWS4Rac+5tqW7h+OSZW27cTM6yfBjb?= =?us-ascii?Q?+aJAKca0VQlX2QWVYMxIVAq5mqjeUFWGOwXU8/upwNmke32mqzgLZ/KTXXeo?= =?us-ascii?Q?NCxcJoO1fHItPdPofjaAwIO9IES8M5LnnOLvqjSlC+ddSrhMPkVoQxpLCGqT?= =?us-ascii?Q?nrfoM6eOXxnz7pIVTuRKc2G9U63Pg37lQCX2ZZ/WngSEdWgKndZoCowNRlDD?= =?us-ascii?Q?lui321tLATdokVkIfEAE6NMc/1dk8tq1lJGgbFVHQVEE3cyYwrnYzTFXmjJW?= =?us-ascii?Q?jwR/FpaeJsSlI36n1uB6xP2nOPj8fPSIbtCWSA/hbLKeDPMtL5BX/orj02Rd?= =?us-ascii?Q?WJMqrTSdxm0Kc3eVHoS/ypjH9+sS+/dG4icTqRHDJTRfveYIJOYBHOov3733?= =?us-ascii?Q?t98dhI3sK1AUQ6jvMCZKBtkK/IlPtjyZTXk/9mysYj557WHaCTpWk47TRXBU?= =?us-ascii?Q?LJmqY/eIjqK+sQm9hjY7ijuFrHHV5bkv12M8H4apsmSuIMtlrv9vkMfpkN4B?= =?us-ascii?Q?xJ4rtGulmBhiHofMIx4wkF/DNqTQwBR3DGCbRnqSROLlqIFi29Nc6LgF26OV?= =?us-ascii?Q?mv+DUohg6Y/Un+qIwfBqCiGt1WSTPSQVNqrA0kQSOkpyxRq1xNPhpSj22e96?= =?us-ascii?Q?lAjaa82hwRiUE+7LcPhzlF+puHk0a3xdjZojD0UU6Gm14q4/7XeaM9NpkLz9?= =?us-ascii?Q?QRAagRwb2/p4zx1Z3Sipm+FBze6CD7ziCm80Sp8KkFIOBz6SmBLK4Eon7bLp?= =?us-ascii?Q?fAbEvTImiaLkcSm6r1w1Htfa5GrVXBRyy7/W6OoQQZbZegaqlk1UPNVspdoB?= =?us-ascii?Q?S2vGEACW3tR4syFjKTqwVxj2Aia+f2ntjbz7MJXNsozU7I9y2BIV+mnx7VtV?= =?us-ascii?Q?WIP2aFBD/105un/ZIa/tTPyRH+PADhenX6kZs9GmQKcnmb+52AGWw3I0V57v?= =?us-ascii?Q?yvWNR6J/DIFolDg/duMwpXEr3Zr195iwHDRQg0XHD98MzWDEZ2+ZGCOy26aN?= =?us-ascii?Q?9PAML6S0xo2JhHwBrtit6zJlpLIc0fzf22jwIL/qPh5dA5TGazzsOFIHjM4L?= =?us-ascii?Q?Dy0F27AcTazRBMgTrgOa8MdbS8p7BPsRMncBMzCYMjyrMX8cs9jG+wHsGfvy?= =?us-ascii?Q?/6vLdizIQv2wjQXQ0PyQigSeO+XI0jYKraFd9XwfwMfpZuSeA3L3adr+YDtv?= =?us-ascii?Q?Q3D2xCWLwWeP/85hPUeDlI+rBXt6gwHU7tft/UBFaKYDm9RsZUBLNnqVqDqX?= =?us-ascii?Q?uIGUy3rSuyLAXVwHUHIw7kVyZo49IiYUZDm7eunYsthjQ71YuBEmPzCnrKne?= =?us-ascii?Q?QiZuxeVpM5/RbWaD+mkZrEQjBtn7QrF7VLQ0?= 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:(13230040)(82310400026)(36860700013)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2025 23:21:48.0301 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c29a5e5-071d-463c-c03b-08dd94d06e48 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: CH1PEPF0000A34B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9253 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1747437735230116600 Content-Type: text/plain; charset="utf-8" From: Federico Serafini Refactor inclusion guards: 1) use a syntax that is more likely to be recognized by static analyzers; 2) follow the CODING_STYLE. No functional change. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini --- xen/include/xen/err.h | 10 +++++++--- xen/include/xen/softirq.h | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/include/xen/err.h b/xen/include/xen/err.h index cbdd1bf7f8..5bdf8b215c 100644 --- a/xen/include/xen/err.h +++ b/xen/include/xen/err.h @@ -1,5 +1,7 @@ -#if !defined(__XEN_ERR_H__) && !defined(__ASSEMBLY__) -#define __XEN_ERR_H__ +#if !defined(XEN_ERR_H) +#define XEN_ERR_H + +#if !defined(__ASSEMBLY__) =20 #include #include @@ -41,4 +43,6 @@ static inline int __must_check PTR_RET(const void *ptr) return IS_ERR(ptr) ? PTR_ERR(ptr) : 0; } =20 -#endif /* __XEN_ERR_H__ */ +#endif /* __ASSEMBLY__ */ + +#endif /* XEN_ERR_H */ diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index 33d6f2ecd2..5593c7b0a9 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -1,5 +1,7 @@ -#if !defined(__XEN_SOFTIRQ_H__) && !defined(__ASSEMBLY__) -#define __XEN_SOFTIRQ_H__ +#if !defined(XEN_SOFTIRQ_H) +#define XEN_SOFTIRQ_H + +#if !defined(__ASSEMBLY__) =20 /* Low-latency softirqs come first in the following list. */ enum { @@ -40,4 +42,6 @@ void cpu_raise_softirq_batch_finish(void); */ void process_pending_softirqs(void); =20 -#endif /* __XEN_SOFTIRQ_H__ */ +#endif /* __ASSEMBLY__ */ + +#endif /* XEN_SOFTIRQ_H */ --=20 2.25.1 From nobody Fri Oct 31 09:55:31 2025 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=1747437741; cv=pass; d=zohomail.com; s=zohoarc; b=Mh+xCH8Um2wwaUsZgTgrtzaY2ApSK+eMO9Y8ZJK0zQEd8g598Y5Az9X4W4AWt+MGySpC85E6TTTgvwGQeMCAoae5ghVRd8lWJ3s4qolHfu+fTonAPa6rqki8djZvv72v04cR3aC4HgNITJRY7eR2n0z00p11lWaLO/mVOrfbM5M= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747437741; 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=DK+KHWKqgLBHIw14tu9e6rDx3z6/no2a/sVRmU5bVsQ=; b=mW2/0vtBHm4GpstDFyE5aOOWkDsMbY+oWI8yrJ439S3P7PZSQqqcJHuJpqmEGQdI89YwFz7NYIX49CWGZS9Zs2ybjgWflV3sApOjHq3hHJNm82RI1XhGwpeiN7D2tvhWVtdvsQz6SyOv2ez1+DRn4UUH2RysoVJTSAF714VmpxI= 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 174743774082129.762101401507152; Fri, 16 May 2025 16:22:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.987719.1372978 (Exim 4.92) (envelope-from ) id 1uG4NL-0007IJ-LH; Fri, 16 May 2025 23:21:59 +0000 Received: by outflank-mailman (output) from mailman id 987719.1372978; Fri, 16 May 2025 23:21:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4NL-0007Hb-I1; Fri, 16 May 2025 23:21:59 +0000 Received: by outflank-mailman (input) for mailman id 987719; Fri, 16 May 2025 23:21:57 +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 1uG4NJ-0005s2-MK for xen-devel@lists.xenproject.org; Fri, 16 May 2025 23:21:57 +0000 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20603.outbound.protection.outlook.com [2a01:111:f403:2413::603]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8dfec691-32ac-11f0-9eb6-5ba50f476ded; Sat, 17 May 2025 01:21:55 +0200 (CEST) Received: from MW4PR03CA0179.namprd03.prod.outlook.com (2603:10b6:303:8d::34) by LV3PR12MB9093.namprd12.prod.outlook.com (2603:10b6:408:19d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.33; Fri, 16 May 2025 23:21:51 +0000 Received: from SJ5PEPF000001CF.namprd05.prod.outlook.com (2603:10b6:303:8d:cafe::33) by MW4PR03CA0179.outlook.office365.com (2603:10b6:303:8d::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.20 via Frontend Transport; Fri, 16 May 2025 23:21:50 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ5PEPF000001CF.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8746.27 via Frontend Transport; Fri, 16 May 2025 23:21:49 +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.39; Fri, 16 May 2025 18:21:48 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.39; Fri, 16 May 2025 18:21:48 -0500 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Fri, 16 May 2025 18:21:47 -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: 8dfec691-32ac-11f0-9eb6-5ba50f476ded ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eVQKfLMh5iuSxX7mG4fUMwovR6UhXUUhvjuA8rXPOmL4BHVE2j7NGiXKK6zqz5nuJmcK2v0xHDwVwsHSxgS54ibdgxTTSv30o5TyEuW92IDFdJxxUocdSFWVizlOUKeNU/kRdQbgtBz2MHb+DNbLRBi0PZa/NWW5kgiSHol4EQ4ZDJAH3JxELhKdzIbTHARINwmYONhHcFC0Frkxjxdfl14xZgfeAbijEUUy24AyhLzu/MC/eUTe8y6IfCHbehyc2LaEW9Tc5sFA+PvgTqKJKSE9ZopWhCtC8TTnrj0jHgFw08orGjSP3jujDOKoTXeuBPFfIEv06OxWFGtEEia0Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=DK+KHWKqgLBHIw14tu9e6rDx3z6/no2a/sVRmU5bVsQ=; b=MWB/cqI9w8folzAL5D1YgY1GgMxC+u4FcHVyczq6bxtdDH2gr5xZqTKEn8hju4nQyKx5ziEX19Y5/b33Wt2Qg7EnuY51zghpOTRwzTaLh9bZBsDvnE7VUKeS4kG0cvDOOaZ3kTTj7E3Wb+zYpNagrPMkQg72n2rZZCtpfbmrDfNxNjTda/SIxDit01jMrB+ygbzg0r1eHW93ojSaZxN7PdClbW80MSpVTQ9m/71H/1ziuAhPy3oyKPVW3YWZep28ajC2snN7Z4DUiEJwt5N8QYLr1e7fQz4+MhnvjouyJ476skxj6QgSg1XjA1NsfzWEwV2FM9rJaM59nXIfCzu6Ng== 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=DK+KHWKqgLBHIw14tu9e6rDx3z6/no2a/sVRmU5bVsQ=; b=a4jSFM/Yhfi7AaMtv7DlXmM7QRTwDjPGunXVWYjNUMwtNjiReP6IN1oGclEO0F7qN3pwXl6EDgy7EbbO8n5juxfwOctCUK0W9rCQ4P1+zce3e18coF+LBIBFyPPO2JHKZi9Yt/a7OYS7WQbgFPTmkckvxaMMLNyyVQkACtciTIo= 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: , , , , , , , Federico Serafini , Stefano Stabellini Subject: [PATCH 5/6] x86/asm: refactor inclusion guards Date: Fri, 16 May 2025 16:21:29 -0700 Message-ID: <20250516232130.835779-5-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: SJ5PEPF000001CF:EE_|LV3PR12MB9093:EE_ X-MS-Office365-Filtering-Correlation-Id: 50c262b4-0e9b-4bb1-6e45-08dd94d06f19 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XqYaRiVgtYC3IH4lCswyyD1yTDk9EXcntlAD4v8+DAz2RE7YbQYiwQzVOnyh?= =?us-ascii?Q?RkRFJrosUh7bvZmjHEOmyMyydRqi8WXensNxyHvyZQxYnMyJc/fYqZbCJMHN?= =?us-ascii?Q?Taey6QE53Zh4XAcEL10qgCooazax81u9P2BQD5ylji6OfGf2+4Qau4CgvsCh?= =?us-ascii?Q?UWKN9mg8PFYcIIsfZBqmqjDElCYDS8dXuUDslvadBiqVJxFU0pvdEGyuPG1S?= =?us-ascii?Q?lsQxxXgfKy0jEYnNOohVOfKN4vrgfc7k+KorI5zD58tuLx8T+OxaqfNDyn54?= =?us-ascii?Q?JDjUd7bufHHeZ3XdMovcGR4qpfaChUqpfmO6yTrJsygQzbR4POzJvSqvCU1h?= =?us-ascii?Q?YHzlArQH83vTQtjUDzwfU3d6RNeODsViKjBwPzUW5mO29jWr03KDFfzWKuio?= =?us-ascii?Q?4BZ6dCcupbdXnHUDEg1559z8bDjOelbSp9zBKJBrzdccnugDPwC2vRDpjIjK?= =?us-ascii?Q?/vFupmeL5IKy29wOoojShIq4lzNPFWoGx164rhExSOhM1Bar09CYT+uwkd6C?= =?us-ascii?Q?fH2VVe6rJJGuBwfDhMh1EZxies61QWcfT1wec67sEPDC+P4h/bFuAG/PyXfn?= =?us-ascii?Q?BlKCQS+nn4Mv9zFW5Y0eVbieFHN5HWOvjGZMUKTay0+YpY9KikTMWGtje4k4?= =?us-ascii?Q?DFoNxUX4HTYVJAbBBc4xvULmVyYsd3DiK86QbERhjayibf5+i4ysHNE95fx7?= =?us-ascii?Q?HRGgHZos00OEnfw70HzqMgjMtIwJtM9oleUtBCrSP1YuQinBa3vC4tr6rnsg?= =?us-ascii?Q?HESXcCufbZlH/pqrx0XzUidPYlTtmKthI261nhgJsiuIeewssWbB/S7etYbT?= =?us-ascii?Q?lDI9RJxWvh3xMUJ56iZTirh8SLce3IYFMbvmS6ZL0uwUIDeqNmkW3TNLUa0U?= =?us-ascii?Q?lkHuQrckg4zEAGhgolS/M+3HcQIcvgA2J30dJODP5fa5v1+K+i8qJzVQGjoT?= =?us-ascii?Q?WBNLrn4BE71vQSwMao/+5Nn66HnRXxeTYqVT4gx3reVd+Kx3P6APf0YC7UCg?= =?us-ascii?Q?qRWeu3WrorUU9FCKRz6yD8cGjc10/S3m3YDmcTiEYbrqX6tDIOUYyX7s+gyo?= =?us-ascii?Q?+LjRVS7KBYwoDKIuqmFYlGoqy9eCBWGyFiVwQz2UcUMLCAvSemE3LMP6QHFn?= =?us-ascii?Q?iOs5oqYxCPO0ZUAmn3CeFhnT+hapF5jF8akTPHD6ute6lz8fBsJZ64i/qyDd?= =?us-ascii?Q?Id2VNJrorVkl5NG3hC9i5NKeZKe458JFwORoASuKsBot5JZ84HLi0e9JmP+i?= =?us-ascii?Q?inNquz6osiErf5YBDrbHsqmIQOPSkD4OgyQm8PilkHK1EuAto0Bii3pU4y2R?= =?us-ascii?Q?ayjo0dr0mPynGlyOaHWkqAxDFcmSuOadkryegxLcqkpbzrrog8Vu2oaJwa3x?= =?us-ascii?Q?OHUij3NgI0cLt9G1duB/xnjICSXO1ggD6USYVLYAKEnfUVbCtwao80hFY4nJ?= =?us-ascii?Q?69qvqb5T+8xfvmSTEimm2K9qwe2HnRF+ofi0+i9HUNqdLSlg5QJypjEPj2ui?= =?us-ascii?Q?F4uqxt3s3DngOFeWeV/LdgMwE40OcmzRvqcE?= 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:(13230040)(36860700013)(1800799024)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2025 23:21:49.3256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 50c262b4-0e9b-4bb1-6e45-08dd94d06f19 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: SJ5PEPF000001CF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9093 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1747437741284116600 Content-Type: text/plain; charset="utf-8" From: Federico Serafini MISRA C Directive 4.10 states that "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Refactor inclusion guards to address a violation of Directive 4.10 and follow CODING_STYLE. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/arch/x86/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index bedb97cbee..ce724a9daa 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -261,17 +261,17 @@ $(objtree)/arch/x86/include/asm/asm-macros.h: $(obj)/= asm-macros.i $(src)/Makefil $(call filechk,asm-macros.h) =20 define filechk_asm-macros.h + echo '#ifndef X86_MACROS_H'; \ + echo '#define X86_MACROS_H'; \ echo '#if 0'; \ echo '.if 0'; \ echo '#endif'; \ - echo '#ifndef __ASM_MACROS_H__'; \ - echo '#define __ASM_MACROS_H__'; \ echo 'asm ( ".include \"$@\"" );'; \ - echo '#endif /* __ASM_MACROS_H__ */'; \ echo '#if 0'; \ echo '.endif'; \ cat $<; \ - echo '#endif' + echo '#endif'; \ + echo '#endif /* X86_MACROS_H */' endef =20 $(obj)/efi.lds: AFLAGS-y +=3D -DEFI --=20 2.25.1 From nobody Fri Oct 31 09:55:31 2025 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=1747437729; cv=pass; d=zohomail.com; s=zohoarc; b=IdyE2BLaVNletkcPNNqrHN4r3is1yRe+eLrBpu2zMMwlGSEFh7z7xDUEumNDaqc2mH08iOGUQvkeP7z6njFz+wNjdIR1Bk+tRUN505jQDEMAZLoYi0MFMg0UZiDjAIAts8gVkhNgGbWpOqEcVRVEGnvQDBbS9hTqA8Pm/1sCNPg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747437729; 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=ibzV0RVz7ZzeEdOUX3J5YjlDrdqnL5X0dajYZtxmsP0=; b=d+HHWKpYnA9qv1+h7u5KdPZpk10bzKuSEznCWu3ixsziimp9q0lvkFdmjSs73m+yuPQRyQmXqyDp3V0KbhfsnMxvC8aK56aWkZ9BtpPMc1aLkkztGkLE1ksY5A9OPTlf2o9qvi2AbG3onY8lkBQseowI2RcmkEZWbcBPLxodLTk= 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 1747437729975920.3607436460159; Fri, 16 May 2025 16:22:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.987716.1372949 (Exim 4.92) (envelope-from ) id 1uG4NI-0006WI-Kh; Fri, 16 May 2025 23:21:56 +0000 Received: by outflank-mailman (output) from mailman id 987716.1372949; Fri, 16 May 2025 23:21:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uG4NI-0006W9-Hn; Fri, 16 May 2025 23:21:56 +0000 Received: by outflank-mailman (input) for mailman id 987716; Fri, 16 May 2025 23:21:55 +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 1uG4NH-0005s2-Lo for xen-devel@lists.xenproject.org; Fri, 16 May 2025 23:21:55 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2060f.outbound.protection.outlook.com [2a01:111:f403:2415::60f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8d5ad323-32ac-11f0-9eb6-5ba50f476ded; Sat, 17 May 2025 01:21:54 +0200 (CEST) Received: from CH0PR03CA0257.namprd03.prod.outlook.com (2603:10b6:610:e5::22) by BL4PR12MB9722.namprd12.prod.outlook.com (2603:10b6:208:4ed::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.33; Fri, 16 May 2025 23:21:49 +0000 Received: from CH1PEPF0000A34A.namprd04.prod.outlook.com (2603:10b6:610:e5:cafe::2a) by CH0PR03CA0257.outlook.office365.com (2603:10b6:610:e5::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.20 via Frontend Transport; Fri, 16 May 2025 23:21:49 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CH1PEPF0000A34A.mail.protection.outlook.com (10.167.244.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8746.27 via Frontend Transport; Fri, 16 May 2025 23:21:49 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.39; Fri, 16 May 2025 18:21:49 -0500 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Fri, 16 May 2025 18:21:48 -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: 8d5ad323-32ac-11f0-9eb6-5ba50f476ded ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XKtZ8aW/IiRwTyZ/uaqz2fxpVZEXpFPF5KuSGIaAZdfsXEncC1DtyFeIXx5yR8quLC7bkso5t7y7XBWgbSRCoDiy+WJ/tCF+Rdl/B+bMhXOIJIiwoHUfGV2OzabSlcnzPXvu5GoDix8P7g42I+/jmy8+v0gBbt3utouL4t1h69cJBV6OFJhi+fe0xztZmplWWWNERth+1NPWdLst1uTO3WQsR+vCseKSpQmXavrDvgcv5RwTPGXcBxVVUqLBowusFm7r09go//2LZ0GBoWj8q7wyiI8w+ZJlwf9fVyCmIL4+bJOMycrtaqP1oiEnBveTPxBmf2sbrlhvawwrFGTkkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ibzV0RVz7ZzeEdOUX3J5YjlDrdqnL5X0dajYZtxmsP0=; b=qsqNsvK3UoFdwVwAtG07+1Glnd7poxQsU5eybvEc8WpwOUAOqfqek7xk+BYfkaW8PPf7Q3Ia/YDPUg6Ll5okXGbdqWDDmDNOJic0mFXsVe4yrUg3CY7XAJaRkOuy86n3UO7A1tkqcxnG1tYs9B/ygfNdzebVGrDejFFUhRLRyS+q1UwEmuYX0zTbnG7YK08WuorFuoCOBsGze7l+S4m3JR8gJIV6kd9VVZzNM1vTRWnXeyO0YbZWvdCzSZW8vT0S0gaJhWB/T4YmDaE9ELyQ1Qc+aM2WgVfCUFVb24sFdQGypLRJMJ5k4yvSx8DIKjiQ9DErETwkuDtyFfYh15vozA== 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=ibzV0RVz7ZzeEdOUX3J5YjlDrdqnL5X0dajYZtxmsP0=; b=h0cpAAOTRiq9qzJStQIhz1QLaNjH/MxpR7mxAGcabPwUGnn36mhqTW45CCB35AgxsuT5uXT8xcCg50dGQ0Ezri6ZEpB1svl0AYOBOmR2z8y/hKcyRgEtCAH/qOgKac5kxzQn6zJK2Myj8ISn9g+1Bq/KKUlOhoEcG3Qe90Cvppc= 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: , , , , , , , Federico Serafini , Stefano Stabellini Subject: [PATCH 6/6] automation/eclair: update configuration of D4.10 Date: Fri, 16 May 2025 16:21:30 -0700 Message-ID: <20250516232130.835779-6-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 (SATLEXMB03.amd.com: stefano.stabellini@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A34A:EE_|BL4PR12MB9722:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d0098eb-b6ae-4ef0-8585-08dd94d06f4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mLAxsJ2cxqSOq0wJUPAnz2mOBw1ZTjLDZx4BVp8M3ugPp2B7IBqi7ZATimzP?= =?us-ascii?Q?z328Tsk2tt/wFHVVGR5VAUkvplRqtY3YHZiJi/e6+mJi/aZAHroMC+DKNENz?= =?us-ascii?Q?vhD7wszYwhgnu1tIc4Xp1fX/2MXyPBcZi+KejgzNGlE423RFjYeiwUf75iEC?= =?us-ascii?Q?pYluNh6TEXZiT7c0oaVFBYRGlRoQw6pU38H/1h3yld8r5sDuYEN2fUwZ3uhX?= =?us-ascii?Q?PAdn0cOlw2wQOYdFomWH8urhyreiK75XT8rP7jGiAW3kZ9yknGAxJiULWr5m?= =?us-ascii?Q?fmfGzqURHiFB13uWShagI5nX01+YgdzHeK3zxPQVty+zTB41h00TTs3KncGi?= =?us-ascii?Q?h460QB6B9zWYQDRE2cMhU6QdhWVC+T8lP7CVwywUJmBkYRqHGLetSeA0BM31?= =?us-ascii?Q?DZXNkWtlah5L3ExQgBIOnsyxD3N+/S/uboS8EVCkTHYjzJmtDmn85jbYR7xZ?= =?us-ascii?Q?XVhWdlzCh/Q/Bc5l8WHZvdcM5R6H5XQKpKYC89qByDb71tiM0+ADXmcC+EDa?= =?us-ascii?Q?edpqZ4MpEWUmlaE+jrUNhku2zJAvFyjEcfOwtLJWJP+Jd3p1zd4jG7DXdOzS?= =?us-ascii?Q?2LF1DYtVgChYyg/gh5yFROhwRtHCq4e+Gxrm7Z+gia9ee/gWKNlHrVUeTB+O?= =?us-ascii?Q?Xpnq1zCj9eQu+m6dmseLr1TQ0aWFDRgV6fi4aIP1v5ygl4aFvt0JZnEVH0mU?= =?us-ascii?Q?Q2HjvBh7QmEMtaF3EhNkvZdPmRu1nXmYwQ7ZyA2/9DgQvZchx0ynZ4bqFVNF?= =?us-ascii?Q?xOnw9Y6a+BmMk2D897ScWx/3VOXzRQANTyU2z7Cslw0T0B+pO3zQOTU1ZkpQ?= =?us-ascii?Q?0wBUfXATk3if3y76XTjKf7/IphRksHb9aJ4Lyi3ECoF8g0YsKSHypxe9S9BY?= =?us-ascii?Q?n1cmlQZVYxFE7ptfwOXB3pk4g1VD2lf5lDWjkNE65+ZaxkWCi3+NeP0TIj+Y?= =?us-ascii?Q?HuF17uWVbhiNWCvv5f+Rz8nd91/RY+rX6LfnCzSUgAsMRpNkgXwRS/EVDEpJ?= =?us-ascii?Q?g3IBqH8fU3IU8mhSRz2foxQ7H/rLquLTjtcZY5vXDswGXzRPAoMvHljRPnOJ?= =?us-ascii?Q?/LSEi5Icx8eVOYrYS3gFDfImbTqIkxQOdLfmGnLmghMGrvX8VZ8jrTXzXBys?= =?us-ascii?Q?MLTq3t5uisaXCf3qmcj8UpZUkI/iXpAXW4U9MwxqpHKUNXlx5LlgrFtwOiGr?= =?us-ascii?Q?R8J1Nv97jYfAvflyeJ/1EBU24k6eJ35NPovV8Ilxxd77wnGhftvCZchvQn+i?= =?us-ascii?Q?Xv2dqXlUBaEoPxuCo/xGwllvOy59l7kNgZdudqSvP69EvNvsUx8qtn9xMsuJ?= =?us-ascii?Q?eC1JOaRDSeXtH/FtDReomDkmTMXn8iAmbxXSiwK7D1+hrdZkJ49WCHbDgDbW?= =?us-ascii?Q?AmkqAtfnlkGF22d3oC6RHSpYysLBZYggwfjPTYMC+DuSUGf/UEMx5Qwl2nFI?= =?us-ascii?Q?/2lZdlGMhBlrJQgyJoFIEqBxsPucJ4Mw/r9ZQLJRo6zm9404/YRhBivvcbps?= =?us-ascii?Q?9BNYXQPCKR/j+viAp4OkoZaSC60qjHFf5VFV?= 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:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2025 23:21:49.7292 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d0098eb-b6ae-4ef0-8585-08dd94d06f4c 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: CH1PEPF0000A34A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL4PR12MB9722 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1747437731384116600 Content-Type: text/plain; charset="utf-8" From: Federico Serafini MISRA C Directive 4.10 states that "Precautions shall be taken in order to prevent the contents of a header file being included more than once". Update ECLAIR configuration to: - extend existing deviation to other comments explicitly saying a file is intended for multiple inclusion; - extend existing deviation to other autogenerated files; - tag the guidelines as clean. Update deviations.rst accordingly. Signed-off-by: Federico Serafini Signed-off-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 14 +++++++++++--- automation/eclair_analysis/ECLAIR/tagging.ecl | 1 + docs/misra/deviations.rst | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/= eclair_analysis/ECLAIR/deviations.ecl index 9c67358d46..3fb6d9f971 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -72,11 +72,19 @@ they are not instances of commented-out code." -config=3DMC3A2.D4.3,reports+=3D{deliberate, "any_area(any_loc(file(arm64_= bitops))&&context(name(int_clear_mask16)))"} -doc_end =20 --doc_begin=3D"Files that are intended to be included more than once do not= need to -conform to the directive." +-doc_begin=3D"Files that are intended to be included more than once (and h= ave +a comment that says this explicitly) do not need to conform to the directi= ve." -config=3DMC3A2.D4.10,reports+=3D{safe, "first_area(text(^/\\* This file i= s intended to be included multiple times\\. \\*/$, begin-4))"} +-config=3DMC3A2.D4.10,reports+=3D{safe, "first_area(text(^.*Explicitly int= ended for multiple inclusion.*$, begin-3))"} +-config=3DMC3A2.D4.10,reports+=3D{safe, "first_area(text(^/\\* Generated f= ile, do not edit! \\*/$, begin-2))"} -config=3DMC3A2.D4.10,reports+=3D{safe, "first_area(text(^/\\* Generated f= ile, do not edit! \\*/$, begin-3))"} --config=3DMC3A2.D4.10,reports+=3D{safe, "all_area(all_loc(file(^xen/includ= e/generated/autoconf.h$)))"} +-doc_end + +-doc_begin=3D"Autogenerated files that do not need to conform to the direc= tive." +-config=3DMC3A2.D4.10,reports+=3D{safe, "all_area(all_loc(file(^xen/includ= e/generated/autoconf\\.h$)))"} +-config=3DMC3A2.D4.10,reports+=3D{safe, "all_area(all_loc(file(^xen/includ= e/xen/compile\\.h$)))"} +-config=3DMC3A2.D4.10,reports+=3D{safe, "all_area(all_loc(file(^xen/includ= e/compat/xlat\\.h$)))"} +-config=3DMC3A2.D4.10,reports+=3D{safe, "all_area(all_loc(file(^xen/arch/(= arm||x86)/include/generated/asm/.*$)))"} -doc_end =20 -doc_begin=3D"Including multiple times a .c file is safe because every fun= ction or data item diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/ecl= air_analysis/ECLAIR/tagging.ecl index 5bc35db1fd..7e3095423b 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -23,6 +23,7 @@ "MC3A2.D1.1|| MC3A2.D2.1|| MC3A2.D4.1|| +MC3A2.D4.10|| MC3A2.D4.11|| MC3A2.D4.14|| MC3A2.R1.1|| diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index fe0b1e10a2..87ed81c918 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -30,6 +30,21 @@ Deviations related to MISRA C:2012 Directives: not to add an additional encapsulation layer. - Tagged as `deliberate` for ECLAIR. =20 + * - D4.10 + - Files that are intended to be included more than once (and have + a comment that says this explicitly) do not need to conform to the + directive. + - Tagged as `safe` for ECLAIR. + + * - D4.10 + - There are autogenerated files that do not need to comply to the + directive. + - Tagged as `safe` for ECLAIR. Such files are: + - xen/include/generated/autoconf.h + - xen/include/compat/xlat.h + - xen/include/xen/compile.h + - xen/arch/{arm,x86}/include/generated/asm/\* + * - D4.10 - Including multiple times a .c file is safe because every function o= r data item it defines would in (the common case) be already defined. --=20 2.25.1