diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-03-15 15:51:20 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-05-13 08:58:55 +0200 |
| commit | 58ea30f5145fc8c7ebb80ee0b0c812a3a958c762 (patch) | |
| tree | 7f87b21d9446843917a711a5c9501c4533465472 /hw | |
| parent | 814167479a4c7cccc3f5d532fc234dc75ab8961c (diff) | |
| download | qemu-58ea30f5145fc8c7ebb80ee0b0c812a3a958c762.zip qemu-58ea30f5145fc8c7ebb80ee0b0c812a3a958c762.tar.gz qemu-58ea30f5145fc8c7ebb80ee0b0c812a3a958c762.tar.bz2 | |
Clean up header guards that don't match their file name
Header guard symbols should match their file name to make guard
collisions less likely.
Cleaned up with scripts/clean-header-guards.pl, followed by some
renaming of new guard symbols picked by the script to better ones.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190315145123.28030-6-armbru@redhat.com>
[Rebase to master: update include/hw/net/ne2000-isa.h]
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/smmuv3-internal.h | 4 | ||||
| -rw-r--r-- | hw/display/vga_regs.h | 6 | ||||
| -rw-r--r-- | hw/rdma/vmw/pvrdma_qp_ops.h | 4 | ||||
| -rw-r--r-- | hw/sd/sdmmc-internal.h | 5 |
4 files changed, 10 insertions, 9 deletions
diff --git a/hw/arm/smmuv3-internal.h b/hw/arm/smmuv3-internal.h index 19540f8..b160289 100644 --- a/hw/arm/smmuv3-internal.h +++ b/hw/arm/smmuv3-internal.h @@ -18,8 +18,8 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef HW_ARM_SMMU_V3_INTERNAL_H -#define HW_ARM_SMMU_V3_INTERNAL_H +#ifndef HW_ARM_SMMUV3_INTERNAL_H +#define HW_ARM_SMMUV3_INTERNAL_H #include "hw/arm/smmu-common.h" diff --git a/hw/display/vga_regs.h b/hw/display/vga_regs.h index 16886f5..30a98b8 100644 --- a/hw/display/vga_regs.h +++ b/hw/display/vga_regs.h @@ -14,8 +14,8 @@ * */ -#ifndef LINUX_VIDEO_VGA_H -#define LINUX_VIDEO_VGA_H +#ifndef HW_VGA_REGS_H +#define HW_VGA_REGS_H /* Some of the code below is taken from SVGAlib. The original, unmodified copyright notice for that code is below. */ @@ -156,4 +156,4 @@ /* VGA graphics controller bit masks */ #define VGA_GR06_GRAPHICS_MODE 0x01 -#endif /* LINUX_VIDEO_VGA_H */ +#endif /* HW_VGA_REGS_H */ diff --git a/hw/rdma/vmw/pvrdma_qp_ops.h b/hw/rdma/vmw/pvrdma_qp_ops.h index 82e720a..bf2b15c 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.h +++ b/hw/rdma/vmw/pvrdma_qp_ops.h @@ -13,8 +13,8 @@ * */ -#ifndef PVRDMA_QP_H -#define PVRDMA_QP_H +#ifndef PVRDMA_QP_OPS_H +#define PVRDMA_QP_OPS_H #include "pvrdma.h" diff --git a/hw/sd/sdmmc-internal.h b/hw/sd/sdmmc-internal.h index 9aa0476..d8bf17d 100644 --- a/hw/sd/sdmmc-internal.h +++ b/hw/sd/sdmmc-internal.h @@ -7,8 +7,9 @@ * See the COPYING file in the top-level directory. * SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef SD_INTERNAL_H -#define SD_INTERNAL_H + +#ifndef SDMMC_INTERNAL_H +#define SDMMC_INTERNAL_H #define SDMMC_CMD_MAX 64 |