From patchwork Thu Jun 10 13:59:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 12313241 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B08EFC47094 for ; Thu, 10 Jun 2021 13:59:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9278C613F8 for ; Thu, 10 Jun 2021 13:59:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231175AbhFJOBm (ORCPT ); Thu, 10 Jun 2021 10:01:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29474 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230161AbhFJOBm (ORCPT ); Thu, 10 Jun 2021 10:01:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZNhzmFjrf3dgp788YZlGE07kjXUUAi8znsNrFkRrkZk=; b=ZWVVN1Oq513CfdhH+Gels82S4t0HtzhF32WbfCee2hi8qD9rfhHLmK5nDZCY+PuZ0jFqlp mZkOBBCFWzmCqixOUhBJz4xfXbQ6kwNXGG4eVgiCnSxfVTPrPWfd6eB0XDeYEET/ZrlwUq yOxZkQUcgJEywl/stIv0TZjH8FB+Ef0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-203-k6hylX3YMWeU1jp3NFT6-Q-1; Thu, 10 Jun 2021 09:59:44 -0400 X-MC-Unique: k6hylX3YMWeU1jp3NFT6-Q-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7450F9126D for ; Thu, 10 Jun 2021 13:59:43 +0000 (UTC) Received: from gondolin.fritz.box (ovpn-113-107.ams2.redhat.com [10.36.113.107]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FE331007623; Thu, 10 Jun 2021 13:59:41 +0000 (UTC) From: Cornelia Huck To: Paolo Bonzini , Thomas Huth , Andrew Jones Cc: kvm@vger.kernel.org, Laurent Vivier , Cornelia Huck Subject: [kvm-unit-tests PATCH 1/2] header guards: clean up some stragglers Date: Thu, 10 Jun 2021 15:59:36 +0200 Message-Id: <20210610135937.94375-2-cohuck@redhat.com> In-Reply-To: <20210610135937.94375-1-cohuck@redhat.com> References: <20210610135937.94375-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Some headers had been missed during the initial header guard standardization. Signed-off-by: Cornelia Huck Reviewed-by: Laurent Vivier --- configure | 4 ++-- lib/arm/asm/mmu-api.h | 4 ++-- lib/arm/asm/mmu.h | 6 +++--- lib/arm64/asm/mmu.h | 6 +++--- lib/pci.h | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 4ad5a4bcd782..b8442d61fb60 100755 --- a/configure +++ b/configure @@ -332,8 +332,8 @@ if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then fi cat < lib/config.h -#ifndef CONFIG_H -#define CONFIG_H 1 +#ifndef _CONFIG_H_ +#define _CONFIG_H_ /* * Generated file. DO NOT MODIFY. * diff --git a/lib/arm/asm/mmu-api.h b/lib/arm/asm/mmu-api.h index 05fc12b5afb8..3d77cbfd8b24 100644 --- a/lib/arm/asm/mmu-api.h +++ b/lib/arm/asm/mmu-api.h @@ -1,5 +1,5 @@ -#ifndef __ASMARM_MMU_API_H_ -#define __ASMARM_MMU_API_H_ +#ifndef _ASMARM_MMU_API_H_ +#define _ASMARM_MMU_API_H_ #include #include diff --git a/lib/arm/asm/mmu.h b/lib/arm/asm/mmu.h index 94e70f0a84bf..b24b97e554e2 100644 --- a/lib/arm/asm/mmu.h +++ b/lib/arm/asm/mmu.h @@ -1,5 +1,5 @@ -#ifndef __ASMARM_MMU_H_ -#define __ASMARM_MMU_H_ +#ifndef _ASMARM_MMU_H_ +#define _ASMARM_MMU_H_ /* * Copyright (C) 2014, Red Hat Inc, Andrew Jones * @@ -53,4 +53,4 @@ static inline void flush_dcache_addr(unsigned long vaddr) #include -#endif /* __ASMARM_MMU_H_ */ +#endif /* _ASMARM_MMU_H_ */ diff --git a/lib/arm64/asm/mmu.h b/lib/arm64/asm/mmu.h index 72371b2d9fe3..5c27edb24d2e 100644 --- a/lib/arm64/asm/mmu.h +++ b/lib/arm64/asm/mmu.h @@ -1,5 +1,5 @@ -#ifndef __ASMARM64_MMU_H_ -#define __ASMARM64_MMU_H_ +#ifndef _ASMARM64_MMU_H_ +#define _ASMARM64_MMU_H_ /* * Copyright (C) 2014, Red Hat Inc, Andrew Jones * @@ -35,4 +35,4 @@ static inline void flush_dcache_addr(unsigned long vaddr) #include -#endif /* __ASMARM64_MMU_H_ */ +#endif /* _ASMARM64_MMU_H_ */ diff --git a/lib/pci.h b/lib/pci.h index 689f03ca7647..e201711dfe18 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -1,5 +1,5 @@ -#ifndef PCI_H -#define PCI_H +#ifndef _PCI_H_ +#define _PCI_H_ /* * API for scanning a PCI bus for a given device, as well to access * BAR registers. @@ -102,4 +102,4 @@ struct pci_test_dev_hdr { #define PCI_HEADER_TYPE_MASK 0x7f -#endif /* PCI_H */ +#endif /* _PCI_H_ */ From patchwork Thu Jun 10 13:59:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 12313245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6D8BC47094 for ; Thu, 10 Jun 2021 13:59:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F0E6613E9 for ; Thu, 10 Jun 2021 13:59:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231249AbhFJOBr (ORCPT ); Thu, 10 Jun 2021 10:01:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35535 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230311AbhFJOBq (ORCPT ); Thu, 10 Jun 2021 10:01:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fx4P1AWcI/t4nEynqEC+OGfVQRnoQFxSkbz5Bk3lO2c=; b=NAtOYdj81c9Y3xAINdReUryNPpEkEYrrv2gOsaWomkK+iJmQ6P+teXnHLg3uC8q89PmvgM pLWYZRtZP4VVBnPwN2L3L2zENSrvnGfeNxBatDcOqHGwzQOP4Mh0e/wWTN2eFN3fsNn9s9 3cJhV4k3czt5i71+tGW9zgUBtdj/CaU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-566-Y8cDpc9yOja_cRezyBrgPA-1; Thu, 10 Jun 2021 09:59:48 -0400 X-MC-Unique: Y8cDpc9yOja_cRezyBrgPA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B9A580364C for ; Thu, 10 Jun 2021 13:59:47 +0000 (UTC) Received: from gondolin.fritz.box (ovpn-113-107.ams2.redhat.com [10.36.113.107]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29973100238C; Thu, 10 Jun 2021 13:59:43 +0000 (UTC) From: Cornelia Huck To: Paolo Bonzini , Thomas Huth , Andrew Jones Cc: kvm@vger.kernel.org, Laurent Vivier , Cornelia Huck Subject: [kvm-unit-tests PATCH 2/2] add header guards for non-trivial headers Date: Thu, 10 Jun 2021 15:59:37 +0200 Message-Id: <20210610135937.94375-3-cohuck@redhat.com> In-Reply-To: <20210610135937.94375-1-cohuck@redhat.com> References: <20210610135937.94375-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add header guards to headers that do not simply include another one. Signed-off-by: Cornelia Huck Reviewed-by: Laurent Vivier --- lib/argv.h | 5 +++++ lib/arm/io.h | 5 +++++ lib/powerpc/io.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/lib/argv.h b/lib/argv.h index e5fcf8482ca8..1fd746dc2177 100644 --- a/lib/argv.h +++ b/lib/argv.h @@ -5,7 +5,12 @@ * under the terms of the GNU Library General Public License version 2. */ +#ifndef _ARGV_H_ +#define _ARGV_H_ + extern void __setup_args(void); extern void setup_args_progname(const char *args); extern void setup_env(char *env, int size); extern void add_setup_arg(const char *arg); + +#endif diff --git a/lib/arm/io.h b/lib/arm/io.h index 2746d72e8280..183479c899a9 100644 --- a/lib/arm/io.h +++ b/lib/arm/io.h @@ -4,4 +4,9 @@ * This work is licensed under the terms of the GNU GPL, version 2. */ +#ifndef _ARM_IO_H_ +#define _ARM_IO_H_ + extern void io_init(void); + +#endif diff --git a/lib/powerpc/io.h b/lib/powerpc/io.h index 1f5a7bd6d745..d4f21ba15a54 100644 --- a/lib/powerpc/io.h +++ b/lib/powerpc/io.h @@ -4,5 +4,10 @@ * This work is licensed under the terms of the GNU GPL, version 2. */ +#ifndef _POWERPC_IO_H_ +#define _POWERPC_IO_H_ + extern void io_init(void); extern void putchar(int c); + +#endif