From: Cornelia Huck <cohuck@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Thomas Huth <thuth@redhat.com>, Andrew Jones <drjones@redhat.com>
Cc: kvm@vger.kernel.org, Laurent Vivier <lvivier@redhat.com>,
Cornelia Huck <cohuck@redhat.com>
Subject: [kvm-unit-tests PATCH 1/2] header guards: clean up some stragglers
Date: Thu, 10 Jun 2021 15:59:36 +0200 [thread overview]
Message-ID: <20210610135937.94375-2-cohuck@redhat.com> (raw)
In-Reply-To: <20210610135937.94375-1-cohuck@redhat.com>
Some headers had been missed during the initial header guard
standardization.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
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 <<EOF > 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 <asm/page.h>
#include <stdbool.h>
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 <drjones@redhat.com>
*
@@ -53,4 +53,4 @@ static inline void flush_dcache_addr(unsigned long vaddr)
#include <asm/mmu-api.h>
-#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 <drjones@redhat.com>
*
@@ -35,4 +35,4 @@ static inline void flush_dcache_addr(unsigned long vaddr)
#include <asm/mmu-api.h>
-#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_ */
--
2.31.1
next prev parent reply other threads:[~2021-06-10 13:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 13:59 [kvm-unit-tests PATCH 0/2] header guards: further cleanup Cornelia Huck
2021-06-10 13:59 ` Cornelia Huck [this message]
2021-06-10 14:29 ` [kvm-unit-tests PATCH 1/2] header guards: clean up some stragglers Laurent Vivier
2021-06-10 13:59 ` [kvm-unit-tests PATCH 2/2] add header guards for non-trivial headers Cornelia Huck
2021-06-10 14:30 ` Laurent Vivier
2021-06-10 16:58 ` [kvm-unit-tests PATCH 0/2] header guards: further cleanup Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210610135937.94375-2-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox