Browse Source

Clean up ill-advised or unusual header guards

Leading underscores are ill-advised because such identifiers are
reserved.  Trailing underscores are merely ugly.  Strip both.

Our header guards commonly end in _H.  Normalize the exceptions.

Done with scripts/clean-header-guards.pl.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <2019031514.28030-7-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Changes to slirp/ dropped, as we're about to spin it off]
master
Markus Armbruster 3 months ago
parent
commit
a8b991b52d

+ 3
- 3
block/crypto.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef BLOCK_CRYPTO_H__
22
-#define BLOCK_CRYPTO_H__
21
+#ifndef BLOCK_CRYPTO_H
22
+#define BLOCK_CRYPTO_H
23 23
 
24 24
 #define BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, helpstr)                \
25 25
     {                                                                   \
@@ -94,4 +94,4 @@ block_crypto_create_opts_init(QDict *opts, Error **errp);
94 94
 QCryptoBlockOpenOptions *
95 95
 block_crypto_open_opts_init(QDict *opts, Error **errp);
96 96
 
97
-#endif /* BLOCK_CRYPTO_H__ */
97
+#endif /* BLOCK_CRYPTO_H */

+ 2
- 2
hw/i386/amd_iommu.h View File

@@ -18,8 +18,8 @@
18 18
  * with this program; if not, see <http://www.gnu.org/licenses/>.
19 19
  */
20 20
 
21
-#ifndef AMD_IOMMU_H_
22
-#define AMD_IOMMU_H_
21
+#ifndef AMD_IOMMU_H
22
+#define AMD_IOMMU_H
23 23
 
24 24
 #include "hw/hw.h"
25 25
 #include "hw/pci/pci.h"

+ 4
- 3
hw/tpm/tpm_ioctl.h View File

@@ -5,8 +5,9 @@
5 5
  *
6 6
  * This file is licensed under the terms of the 3-clause BSD license
7 7
  */
8
-#ifndef _TPM_IOCTL_H_
9
-#define _TPM_IOCTL_H_
8
+
9
+#ifndef TPM_IOCTL_H
10
+#define TPM_IOCTL_H
10 11
 
11 12
 #include <sys/uio.h>
12 13
 #include <sys/ioctl.h>
@@ -267,4 +268,4 @@ enum {
267 268
     CMD_SET_BUFFERSIZE,
268 269
 };
269 270
 
270
-#endif /* _TPM_IOCTL_H */
271
+#endif /* TPM_IOCTL_H */

+ 2
- 2
hw/xtensa/xtensa_memory.h View File

@@ -25,8 +25,8 @@
25 25
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26
  */
27 27
 
28
-#ifndef _XTENSA_MEMORY_H
29
-#define _XTENSA_MEMORY_H
28
+#ifndef XTENSA_MEMORY_H
29
+#define XTENSA_MEMORY_H
30 30
 
31 31
 #include "qemu-common.h"
32 32
 #include "cpu.h"

+ 3
- 4
include/authz/base.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QAUTHZ_BASE_H__
22
-#define QAUTHZ_BASE_H__
21
+#ifndef QAUTHZ_BASE_H
22
+#define QAUTHZ_BASE_H
23 23
 
24 24
 #include "qemu-common.h"
25 25
 #include "qapi/error.h"
@@ -108,5 +108,4 @@ bool qauthz_is_allowed_by_id(const char *authzid,
108 108
                              const char *identity,
109 109
                              Error **errp);
110 110
 
111
-#endif /* QAUTHZ_BASE_H__ */
112
-
111
+#endif /* QAUTHZ_BASE_H */

+ 3
- 4
include/authz/list.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QAUTHZ_LIST_H__
22
-#define QAUTHZ_LIST_H__
21
+#ifndef QAUTHZ_LIST_H
22
+#define QAUTHZ_LIST_H
23 23
 
24 24
 #include "authz/base.h"
25 25
 #include "qapi/qapi-types-authz.h"
@@ -102,5 +102,4 @@ ssize_t qauthz_list_delete_rule(QAuthZList *auth,
102 102
                                 const char *match);
103 103
 
104 104
 
105
-#endif /* QAUTHZ_LIST_H__ */
106
-
105
+#endif /* QAUTHZ_LIST_H */

+ 3
- 4
include/authz/simple.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QAUTHZ_SIMPLE_H__
22
-#define QAUTHZ_SIMPLE_H__
21
+#ifndef QAUTHZ_SIMPLE_H
22
+#define QAUTHZ_SIMPLE_H
23 23
 
24 24
 #include "authz/base.h"
25 25
 
@@ -80,5 +80,4 @@ QAuthZSimple *qauthz_simple_new(const char *id,
80 80
                                 Error **errp);
81 81
 
82 82
 
83
-#endif /* QAUTHZ_SIMPLE_H__ */
84
-
83
+#endif /* QAUTHZ_SIMPLE_H */

+ 2
- 2
include/chardev/spice.h View File

@@ -1,5 +1,5 @@
1
-#ifndef CHARDEV_SPICE_H_
2
-#define CHARDEV_SPICE_H_
1
+#ifndef CHARDEV_SPICE_H
2
+#define CHARDEV_SPICE_H
3 3
 
4 4
 #include <spice.h>
5 5
 #include "chardev/char-fe.h"

+ 4
- 3
include/hw/ppc/pnv.h View File

@@ -16,8 +16,9 @@
16 16
  * You should have received a copy of the GNU Lesser General Public
17 17
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
18 18
  */
19
-#ifndef _PPC_PNV_H
20
-#define _PPC_PNV_H
19
+
20
+#ifndef PPC_PNV_H
21
+#define PPC_PNV_H
21 22
 
22 23
 #include "hw/boards.h"
23 24
 #include "hw/sysbus.h"
@@ -255,4 +256,4 @@ void pnv_bmc_powerdown(IPMIBmc *bmc);
255 256
 #define PNV9_PSIHB_ESB_SIZE          0x0000000000010000ull
256 257
 #define PNV9_PSIHB_ESB_BASE(chip)    PNV9_CHIP_BASE(chip, 0x00060302031c0000ull)
257 258
 
258
-#endif /* _PPC_PNV_H */
259
+#endif /* PPC_PNV_H */

+ 4
- 3
include/hw/ppc/pnv_core.h View File

@@ -16,8 +16,9 @@
16 16
  * You should have received a copy of the GNU Lesser General Public
17 17
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
18 18
  */
19
-#ifndef _PPC_PNV_CORE_H
20
-#define _PPC_PNV_CORE_H
19
+
20
+#ifndef PPC_PNV_CORE_H
21
+#define PPC_PNV_CORE_H
21 22
 
22 23
 #include "hw/cpu/core.h"
23 24
 
@@ -68,4 +69,4 @@ typedef struct PnvQuad {
68 69
     uint32_t id;
69 70
     MemoryRegion xscom_regs;
70 71
 } PnvQuad;
71
-#endif /* _PPC_PNV_CORE_H */
72
+#endif /* PPC_PNV_CORE_H */

+ 4
- 3
include/hw/ppc/pnv_lpc.h View File

@@ -16,8 +16,9 @@
16 16
  * You should have received a copy of the GNU Lesser General Public
17 17
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
18 18
  */
19
-#ifndef _PPC_PNV_LPC_H
20
-#define _PPC_PNV_LPC_H
19
+
20
+#ifndef PPC_PNV_LPC_H
21
+#define PPC_PNV_LPC_H
21 22
 
22 23
 #include "hw/ppc/pnv_psi.h"
23 24
 
@@ -98,4 +99,4 @@ struct PnvChip;
98 99
 ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp);
99 100
 int pnv_dt_lpc(struct PnvChip *chip, void *fdt, int root_offset);
100 101
 
101
-#endif /* _PPC_PNV_LPC_H */
102
+#endif /* PPC_PNV_LPC_H */

+ 4
- 3
include/hw/ppc/pnv_occ.h View File

@@ -16,8 +16,9 @@
16 16
  * You should have received a copy of the GNU Lesser General Public
17 17
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
18 18
  */
19
-#ifndef _PPC_PNV_OCC_H
20
-#define _PPC_PNV_OCC_H
19
+
20
+#ifndef PPC_PNV_OCC_H
21
+#define PPC_PNV_OCC_H
21 22
 
22 23
 #include "hw/ppc/pnv_psi.h"
23 24
 
@@ -52,4 +53,4 @@ typedef struct PnvOCCClass {
52 53
     int psi_irq;
53 54
 } PnvOCCClass;
54 55
 
55
-#endif /* _PPC_PNV_OCC_H */
56
+#endif /* PPC_PNV_OCC_H */

+ 4
- 3
include/hw/ppc/pnv_psi.h View File

@@ -16,8 +16,9 @@
16 16
  * You should have received a copy of the GNU Lesser General Public
17 17
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
18 18
  */
19
-#ifndef _PPC_PNV_PSI_H
20
-#define _PPC_PNV_PSI_H
19
+
20
+#ifndef PPC_PNV_PSI_H
21
+#define PPC_PNV_PSI_H
21 22
 
22 23
 #include "hw/sysbus.h"
23 24
 #include "hw/ppc/xics.h"
@@ -118,4 +119,4 @@ void pnv_psi_irq_set(PnvPsi *psi, int irq, bool state);
118 119
 
119 120
 void pnv_psi_pic_print_info(Pnv9Psi *psi, Monitor *mon);
120 121
 
121
-#endif /* _PPC_PNV_PSI_H */
122
+#endif /* PPC_PNV_PSI_H */

+ 4
- 3
include/hw/ppc/pnv_xscom.h View File

@@ -16,8 +16,9 @@
16 16
  * You should have received a copy of the GNU Lesser General Public
17 17
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
18 18
  */
19
-#ifndef _PPC_PNV_XSCOM_H
20
-#define _PPC_PNV_XSCOM_H
19
+
20
+#ifndef PPC_PNV_XSCOM_H
21
+#define PPC_PNV_XSCOM_H
21 22
 
22 23
 #include "qom/object.h"
23 24
 
@@ -98,4 +99,4 @@ extern void pnv_xscom_region_init(MemoryRegion *mr,
98 99
                                   const char *name,
99 100
                                   uint64_t size);
100 101
 
101
-#endif /* _PPC_PNV_XSCOM_H */
102
+#endif /* PPC_PNV_XSCOM_H */

+ 4
- 3
include/hw/ppc/spapr_ovec.h View File

@@ -33,8 +33,9 @@
33 33
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
34 34
  * See the COPYING file in the top-level directory.
35 35
  */
36
-#ifndef _SPAPR_OVEC_H
37
-#define _SPAPR_OVEC_H
36
+
37
+#ifndef SPAPR_OVEC_H
38
+#define SPAPR_OVEC_H
38 39
 
39 40
 #include "cpu.h"
40 41
 #include "migration/vmstate.h"
@@ -80,4 +81,4 @@ int spapr_ovec_populate_dt(void *fdt, int fdt_offset,
80 81
 /* migration */
81 82
 extern const VMStateDescription vmstate_spapr_ovec;
82 83
 
83
-#endif /* !defined (_SPAPR_OVEC_H) */
84
+#endif /* SPAPR_OVEC_H */

+ 2
- 2
include/hw/timer/pl031.h View File

@@ -11,8 +11,8 @@
11 11
  * GNU GPL, version 2 or (at your option) any later version.
12 12
  */
13 13
 
14
-#ifndef HW_TIMER_PL031
15
-#define HW_TIMER_PL031
14
+#ifndef HW_TIMER_PL031_H
15
+#define HW_TIMER_PL031_H
16 16
 
17 17
 #include "hw/sysbus.h"
18 18
 

+ 3
- 3
include/hw/virtio/vhost-vsock.h View File

@@ -11,8 +11,8 @@
11 11
  * top-level directory.
12 12
  */
13 13
 
14
-#ifndef _QEMU_VHOST_VSOCK_H
15
-#define _QEMU_VHOST_VSOCK_H
14
+#ifndef QEMU_VHOST_VSOCK_H
15
+#define QEMU_VHOST_VSOCK_H
16 16
 
17 17
 #include "hw/virtio/virtio.h"
18 18
 #include "hw/virtio/vhost.h"
@@ -38,4 +38,4 @@ typedef struct {
38 38
     /*< public >*/
39 39
 } VHostVSock;
40 40
 
41
-#endif /* _QEMU_VHOST_VSOCK_H */
41
+#endif /* QEMU_VHOST_VSOCK_H */

+ 3
- 3
include/hw/virtio/virtio-crypto.h View File

@@ -11,8 +11,8 @@
11 11
  * top-level directory.
12 12
  */
13 13
 
14
-#ifndef _QEMU_VIRTIO_CRYPTO_H
15
-#define _QEMU_VIRTIO_CRYPTO_H
14
+#ifndef QEMU_VIRTIO_CRYPTO_H
15
+#define QEMU_VIRTIO_CRYPTO_H
16 16
 
17 17
 #include "standard-headers/linux/virtio_crypto.h"
18 18
 #include "hw/virtio/virtio.h"
@@ -99,4 +99,4 @@ typedef struct VirtIOCrypto {
99 99
     uint8_t vhost_started;
100 100
 } VirtIOCrypto;
101 101
 
102
-#endif /* _QEMU_VIRTIO_CRYPTO_H */
102
+#endif /* QEMU_VIRTIO_CRYPTO_H */

+ 3
- 3
include/hw/xen/start_info.h View File

@@ -20,8 +20,8 @@
20 20
  * Copyright (c) 2016, Citrix Systems, Inc.
21 21
  */
22 22
 
23
-#ifndef __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__
24
-#define __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__
23
+#ifndef XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H
24
+#define XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H
25 25
 
26 26
 /*
27 27
  * Start of day structure passed to PVH guests and to HVM guests in %ebx.
@@ -143,4 +143,4 @@ struct hvm_memmap_table_entry {
143 143
     uint32_t reserved;
144 144
 };
145 145
 
146
-#endif /* __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ */
146
+#endif /* XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H */

+ 2
- 2
include/hw/xtensa/mx_pic.h View File

@@ -25,8 +25,8 @@
25 25
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26
  */
27 27
 
28
-#ifndef _XTENSA_MX_PIC_H
29
-#define _XTENSA_MX_PIC_H
28
+#ifndef XTENSA_MX_PIC_H
29
+#define XTENSA_MX_PIC_H
30 30
 
31 31
 #include "exec/memory.h"
32 32
 #include "hw/irq.h"

+ 2
- 2
include/qemu/drm.h View File

@@ -1,5 +1,5 @@
1
-#ifndef QEMU_DRM_H_
2
-#define QEMU_DRM_H_
1
+#ifndef QEMU_DRM_H
2
+#define QEMU_DRM_H
3 3
 
4 4
 int qemu_drm_rendernode_open(const char *rendernode);
5 5
 

+ 3
- 3
include/qemu/jhash.h View File

@@ -21,8 +21,8 @@
21 21
   * Jozsef
22 22
   */
23 23
 
24
-#ifndef QEMU_JHASH_H__
25
-#define QEMU_JHASH_H__
24
+#ifndef QEMU_JHASH_H
25
+#define QEMU_JHASH_H
26 26
 
27 27
 #include "qemu/bitops.h"
28 28
 
@@ -56,4 +56,4 @@
56 56
 /* An arbitrary initial parameter */
57 57
 #define JHASH_INITVAL           0xdeadbeef
58 58
 
59
-#endif /* QEMU_JHASH_H__ */
59
+#endif /* QEMU_JHASH_H */

+ 3
- 2
include/sysemu/hvf.h View File

@@ -9,8 +9,9 @@
9 9
  */
10 10
 
11 11
 /* header to be included in non-HVF-specific code */
12
-#ifndef _HVF_H
13
-#define _HVF_H
12
+
13
+#ifndef HVF_H
14
+#define HVF_H
14 15
 
15 16
 #include "qemu-common.h"
16 17
 #include "qemu/bitops.h"

+ 3
- 3
linux-user/xtensa/syscall_nr.h View File

@@ -8,8 +8,8 @@
8 8
  * Copyright (C) 2001 - 2009 Tensilica Inc.
9 9
  */
10 10
 
11
-#ifndef _XTENSA_UNISTD_H
12
-#define _XTENSA_UNISTD_H
11
+#ifndef XTENSA_SYSCALL_NR_H
12
+#define XTENSA_SYSCALL_NR_H
13 13
 
14 14
 #define TARGET_NR_spill                                0
15 15
 #define TARGET_NR_xtensa                               1
@@ -434,4 +434,4 @@
434 434
 
435 435
 #define TARGET_NR_syscall_count                      352
436 436
 
437
-#endif  /* _XTENSA_UNISTD_H */
437
+#endif /* XTENSA_SYSCALL_NR_H */

+ 2
- 2
linux-user/xtensa/target_structs.h View File

@@ -1,5 +1,5 @@
1
-#ifndef XTENSA_TARGET_STRUCTS_T
2
-#define XTENSA_TARGET_STRUCTS_T
1
+#ifndef XTENSA_TARGET_STRUCTS_H
2
+#define XTENSA_TARGET_STRUCTS_H
3 3
 
4 4
 struct target_ipc_perm {
5 5
     abi_int __key;                      /* Key.  */

+ 3
- 3
linux-user/xtensa/termbits.h View File

@@ -10,8 +10,8 @@
10 10
  * Copyright (C) 2001 - 2005 Tensilica Inc.
11 11
  */
12 12
 
13
-#ifndef _XTENSA_TERMBITS_H
14
-#define _XTENSA_TERMBITS_H
13
+#ifndef XTENSA_TERMBITS_H
14
+#define XTENSA_TERMBITS_H
15 15
 
16 16
 #include <linux/posix_types.h>
17 17
 
@@ -325,4 +325,4 @@ struct target_ktermios {
325 325
 
326 326
 #define TARGET_TIOCMIWAIT  _IO('T', 92) /* wait for a change on serial input line(s) */
327 327
 #define TARGET_TIOCGICOUNT 0x545D  /* read serial port inline interrupt counts */
328
-#endif  /* _XTENSA_TERMBITS_H */
328
+#endif /* XTENSA_TERMBITS_H */

+ 2
- 2
qga/vss-win32/vss-handles.h View File

@@ -1,5 +1,5 @@
1
-#ifndef VSS_HANDLES
2
-#define VSS_HANDLES
1
+#ifndef VSS_HANDLES_H
2
+#define VSS_HANDLES_H
3 3
 
4 4
 /* Constants for QGA VSS Provider */
5 5
 

+ 2
- 2
target/i386/hax-i386.h View File

@@ -10,8 +10,8 @@
10 10
  *
11 11
  */
12 12
 
13
-#ifndef _HAX_I386_H
14
-#define _HAX_I386_H
13
+#ifndef HAX_I386_H
14
+#define HAX_I386_H
15 15
 
16 16
 #include "cpu.h"
17 17
 #include "sysemu/hax.h"

+ 2
- 2
target/i386/hax-interface.h View File

@@ -14,8 +14,8 @@
14 14
 
15 15
 /* Interface with HAX kernel module */
16 16
 
17
-#ifndef _HAX_INTERFACE_H
18
-#define _HAX_INTERFACE_H
17
+#ifndef HAX_INTERFACE_H
18
+#define HAX_INTERFACE_H
19 19
 
20 20
 /* fx_layout has 3 formats table 3-56, 512bytes */
21 21
 struct fx_layout {

+ 2
- 2
target/i386/hvf/hvf-i386.h View File

@@ -13,8 +13,8 @@
13 13
  *
14 14
  */
15 15
 
16
-#ifndef _HVF_I386_H
17
-#define _HVF_I386_H
16
+#ifndef HVF_I386_H
17
+#define HVF_I386_H
18 18
 
19 19
 #include "sysemu/hvf.h"
20 20
 #include "cpu.h"

+ 2
- 2
target/i386/hvf/vmcs.h View File

@@ -26,8 +26,8 @@
26 26
  * $FreeBSD$
27 27
  */
28 28
 
29
-#ifndef _VMCS_H_
30
-#define _VMCS_H_
29
+#ifndef VMCS_H
30
+#define VMCS_H
31 31
 
32 32
 #include <Hypervisor/hv.h>
33 33
 #include <Hypervisor/hv_vmx.h>

+ 3
- 2
target/i386/hvf/x86_emu.h View File

@@ -15,8 +15,9 @@
15 15
  * You should have received a copy of the GNU Lesser General Public
16 16
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
17 17
  */
18
-#ifndef __X86_EMU_H__
19
-#define __X86_EMU_H__
18
+
19
+#ifndef X86_EMU_H
20
+#define X86_EMU_H
20 21
 
21 22
 #include "x86.h"
22 23
 #include "x86_decode.h"

+ 4
- 3
target/i386/hvf/x86_flags.h View File

@@ -20,8 +20,9 @@
20 20
 /*
21 21
  * x86 eflags functions
22 22
  */
23
-#ifndef __X86_FLAGS_H__
24
-#define __X86_FLAGS_H__
23
+
24
+#ifndef X86_FLAGS_H
25
+#define X86_FLAGS_H
25 26
 
26 27
 #include "cpu.h"
27 28
 void lflags_to_rflags(CPUX86State *env);
@@ -77,4 +78,4 @@ void SET_FLAGS_OSZAPC_LOGIC16(CPUX86State *env, uint16_t v1, uint16_t v2,
77 78
 void SET_FLAGS_OSZAPC_LOGIC8(CPUX86State *env, uint8_t v1, uint8_t v2,
78 79
                              uint8_t diff);
79 80
 
80
-#endif /* __X86_FLAGS_H__ */
81
+#endif /* X86_FLAGS_H */

+ 4
- 3
target/i386/hvf/x86_mmu.h View File

@@ -15,8 +15,9 @@
15 15
  * You should have received a copy of the GNU Lesser General Public
16 16
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
17 17
  */
18
-#ifndef __X86_MMU_H__
19
-#define __X86_MMU_H__
18
+
19
+#ifndef X86_MMU_H
20
+#define X86_MMU_H
20 21
 
21 22
 #define PT_PRESENT      (1 << 0)
22 23
 #define PT_WRITE        (1 << 1)
@@ -40,4 +41,4 @@ bool mmu_gva_to_gpa(struct CPUState *cpu, target_ulong gva, uint64_t *gpa);
40 41
 void vmx_write_mem(struct CPUState *cpu, target_ulong gva, void *data, int bytes);
41 42
 void vmx_read_mem(struct CPUState *cpu, void *data, target_ulong gva, int bytes);
42 43
 
43
-#endif /* __X86_MMU_H__ */
44
+#endif /* X86_MMU_H */

+ 2
- 2
target/riscv/pmp.h View File

@@ -19,8 +19,8 @@
19 19
  * this program.  If not, see <http://www.gnu.org/licenses/>.
20 20
  */
21 21
 
22
-#ifndef _RISCV_PMP_H_
23
-#define _RISCV_PMP_H_
22
+#ifndef RISCV_PMP_H
23
+#define RISCV_PMP_H
24 24
 
25 25
 typedef enum {
26 26
     PMP_READ  = 1 << 0,

+ 3
- 3
target/sparc/asi.h View File

@@ -1,5 +1,5 @@
1
-#ifndef _SPARC_ASI_H
2
-#define _SPARC_ASI_H
1
+#ifndef SPARC_ASI_H
2
+#define SPARC_ASI_H
3 3
 
4 4
 /* asi.h:  Address Space Identifier values for the sparc.
5 5
  *
@@ -309,4 +309,4 @@
309 309
 				      * implicit, little-endian
310 310
 				      */
311 311
 
312
-#endif /* _SPARC_ASI_H */
312
+#endif /* SPARC_ASI_H */

+ 2
- 2
tests/libqos/e1000e.h View File

@@ -16,8 +16,8 @@
16 16
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
17 17
  */
18 18
 
19
-#ifndef QGRAPH_E1000E
20
-#define QGRAPH_E1000E
19
+#ifndef QGRAPH_E1000E_H
20
+#define QGRAPH_E1000E_H
21 21
 
22 22
 #include "libqos/qgraph.h"
23 23
 #include "pci.h"

+ 2
- 2
tests/libqos/sdhci.h View File

@@ -16,8 +16,8 @@
16 16
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
17 17
  */
18 18
 
19
-#ifndef QGRAPH_QSDHCI
20
-#define QGRAPH_QSDHCI
19
+#ifndef QGRAPH_QSDHCI_H
20
+#define QGRAPH_QSDHCI_H
21 21
 
22 22
 #include "libqos/qgraph.h"
23 23
 #include "pci.h"

Loading…
Cancel
Save