From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89333C2BD09 for ; Mon, 1 Jul 2024 14:36:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.751745.1159791 (Exim 4.92) (envelope-from ) id 1sOI8j-0003cB-4q; Mon, 01 Jul 2024 14:36:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 751745.1159791; Mon, 01 Jul 2024 14:36:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sOI8j-0003c4-1S; Mon, 01 Jul 2024 14:36:21 +0000 Received: by outflank-mailman (input) for mailman id 751745; Mon, 01 Jul 2024 14:36:19 +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 1sOI8h-0003bw-T4 for xen-devel@lists.xenproject.org; Mon, 01 Jul 2024 14:36:19 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4746e310-37b7-11ef-90a5-e314d9c70b13; Mon, 01 Jul 2024 16:36:18 +0200 (CEST) Received: from support.bugseng.com (support.bugseng.com [162.55.131.47]) by support.bugseng.com (Postfix) with ESMTPA id 02F8F4EE0738; Mon, 1 Jul 2024 16:36:17 +0200 (CEST) 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: 4746e310-37b7-11ef-90a5-e314d9c70b13 MIME-Version: 1.0 Date: Mon, 01 Jul 2024 16:36:17 +0200 From: Alessandro Zucchelli To: =?UTF-8?Q?Marek_Marczykowski-G=C3=B3recki?= Cc: xen-devel@lists.xenproject.org, nicola.vetrini@bugseng.com, consulting@bugseng.com, Simone Ballarin , "Daniel P. Smith" , Jan Beulich , Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= Subject: Re: [PATCH 06/17] x86/EFI: address violations of MISRA C:2012 Directive 4.10 Reply-To: alessandro.zucchelli@bugseng.com Mail-Reply-To: alessandro.zucchelli@bugseng.com In-Reply-To: References: <0267af93ae969b67a77c3a9aca9f4ad6525de1b9.1719829101.git.alessandro.zucchelli@bugseng.com> Message-ID: X-Sender: alessandro.zucchelli@bugseng.com Organization: BUGSENG Srl Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2024-07-01 16:09, Marek Marczykowski-Górecki wrote: > On Mon, Jul 01, 2024 at 03:36:01PM +0200, Alessandro Zucchelli wrote: >> From: Simone Ballarin >> >> Add inclusion guard to address violations of >> MISRA C:2012 Directive 4.10 ("Precautions shall be taken in order >> to prevent the contents of a header file being included more than >> once"). >> >> Mechanical change. >> >> Signed-off-by: Simone Ballarin >> Signed-off-by: Maria Celeste Cesario >> >> Signed-off-by: Nicola Vetrini >> Signed-off-by: Alessandro Zucchelli >> >> --- >> Changes in v4: >> - Modified inclusion guard. >> Changes in v3: >> - remove trailing underscores >> - change inclusion guard name to adhere to the new standard >> Changes in v2: >> - remove changes in "xen/arch/x86/efi/efi-boot.h" >> >> Note: >> Changes in efi-boot.h have been removed since the file is >> intenteded to be included by common/efi/boot.c only. This motivation >> is not enough to raise a deviation record, so the violation is >> still present. > > I'm confused by this comment. It says changes in efi-boot.h have been > removed, yet the patch does include them. The note referes to the "Changes in v2". You can ignore it. > >> --- >> xen/arch/x86/efi/efi-boot.h | 7 +++++++ >> xen/arch/x86/efi/runtime.h | 5 +++++ >> 2 files changed, 12 insertions(+) >> >> diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h >> index f282358435..c6be744f2b 100644 >> --- a/xen/arch/x86/efi/efi-boot.h >> +++ b/xen/arch/x86/efi/efi-boot.h >> @@ -3,6 +3,11 @@ >> * 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 >> #include >> #include >> @@ -912,6 +917,8 @@ void asmlinkage __init efi_multiboot2(EFI_HANDLE >> ImageHandle, >> efi_exit_boot(ImageHandle, SystemTable); >> } >> >> +#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 */ >> -- >> 2.34.1 >> -- Alessandro Zucchelli, B.Sc. Software Engineer, BUGSENG (https://bugseng.com)