Clean up ill-advised or unusual header guards

Cleaned up with scripts/clean-header-guards.pl.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>

diff --git a/contrib/ivshmem-client/ivshmem-client.h b/contrib/ivshmem-client/ivshmem-client.h
index 54cde17d937c125a8a6c22ff5e19ffa627914087..5ee942262b8434f00011d9f716fcfc535c53584b 100644 (file)
--- a/contrib/ivshmem-client/ivshmem-client.h
+++ b/contrib/ivshmem-client/ivshmem-client.h
@@ -6,8 +6,8 @@
  * top-level directory.
  */
 
-#ifndef _IVSHMEM_CLIENT_H_
-#define _IVSHMEM_CLIENT_H_
+#ifndef IVSHMEM_CLIENT_H
+#define IVSHMEM_CLIENT_H
 
 /**
  * This file provides helper to implement an ivshmem client. It is used
@@ -209,4 +209,4 @@ ivshmem_client_search_peer(IvshmemClient *client, int64_t peer_id);
  */
 void ivshmem_client_dump(const IvshmemClient *client);
 
-#endif /* _IVSHMEM_CLIENT_H_ */
+#endif /* IVSHMEM_CLIENT_H */

diff --git a/contrib/ivshmem-server/ivshmem-server.h b/contrib/ivshmem-server/ivshmem-server.h
index d37ca85265bd79a72be9f84c5fa081c4436e3f21..4af08e1bb783d01792d437cd39c6780fb43c4fe6 100644 (file)
--- a/contrib/ivshmem-server/ivshmem-server.h
+++ b/contrib/ivshmem-server/ivshmem-server.h
@@ -6,8 +6,8 @@
  * top-level directory.
  */
 
-#ifndef _IVSHMEM_SERVER_H_
-#define _IVSHMEM_SERVER_H_
+#ifndef IVSHMEM_SERVER_H
+#define IVSHMEM_SERVER_H
 
 /**
  * The ivshmem server is a daemon that creates a unix socket in listen
@@ -163,4 +163,4 @@ ivshmem_server_search_peer(IvshmemServer *server, int64_t peer_id);
  */
 void ivshmem_server_dump(const IvshmemServer *server);
 
-#endif /* _IVSHMEM_SERVER_H_ */
+#endif /* IVSHMEM_SERVER_H */

diff --git a/crypto/block-luks.h b/crypto/block-luks.h
index 0934138aaa55e8b72791b078fa1a2f0b4f23e07c..b2d8a35c1bc5ef186fe973f75c23e6d20ff73d12 100644 (file)
--- a/crypto/block-luks.h
+++ b/crypto/block-luks.h
@@ -18,11 +18,11 @@
  *
  */
 
-#ifndef QCRYPTO_BLOCK_LUKS_H__
-#define QCRYPTO_BLOCK_LUKS_H__
+#ifndef QCRYPTO_BLOCK_LUKS_H
+#define QCRYPTO_BLOCK_LUKS_H
 
 #include "crypto/blockpriv.h"
 
 extern const QCryptoBlockDriver qcrypto_block_driver_luks;
 
-#endif /* QCRYPTO_BLOCK_LUKS_H__ */
+#endif /* QCRYPTO_BLOCK_LUKS_H */

diff --git a/crypto/block-qcow.h b/crypto/block-qcow.h
index 569f8361007d09dbd73fc6f3877ec8860382e486..3e2c0a851a1f3454a003192100a58f4f02d57881 100644 (file)
--- a/crypto/block-qcow.h
+++ b/crypto/block-qcow.h
@@ -18,11 +18,11 @@
  *
  */
 
-#ifndef QCRYPTO_BLOCK_QCOW_H__
-#define QCRYPTO_BLOCK_QCOW_H__
+#ifndef QCRYPTO_BLOCK_QCOW_H
+#define QCRYPTO_BLOCK_QCOW_H
 
 #include "crypto/blockpriv.h"
 
 extern const QCryptoBlockDriver qcrypto_block_driver_qcow;
 
-#endif /* QCRYPTO_BLOCK_QCOW_H__ */
+#endif /* QCRYPTO_BLOCK_QCOW_H */

diff --git a/fsdev/9p-iov-marshal.h b/fsdev/9p-iov-marshal.h
index 6bccbfb41a2cbd69b01dce2e75ac08d8fc7c36f3..1fb5016853a0d62bfa2f6311f05bbbe5dfd952f4 100644 (file)
--- a/fsdev/9p-iov-marshal.h
+++ b/fsdev/9p-iov-marshal.h
@@ -1,5 +1,5 @@
-#ifndef _QEMU_9P_IOV_MARSHAL_H
-#define _QEMU_9P_IOV_MARSHAL_H
+#ifndef QEMU_9P_IOV_MARSHAL_H
+#define QEMU_9P_IOV_MARSHAL_H
 
 #include "9p-marshal.h"
 

diff --git a/fsdev/9p-marshal.h b/fsdev/9p-marshal.h
index e91b24e9ca6918d845f52412b66426179275c9d0..140db6d99f9c0ee82c01f58a1fe5fabe6500e384 100644 (file)
--- a/fsdev/9p-marshal.h
+++ b/fsdev/9p-marshal.h
@@ -1,5 +1,5 @@
-#ifndef _QEMU_9P_MARSHAL_H
-#define _QEMU_9P_MARSHAL_H
+#ifndef QEMU_9P_MARSHAL_H
+#define QEMU_9P_MARSHAL_H
 
 typedef struct V9fsString
 {

diff --git a/hw/9pfs/9p-proxy.h b/hw/9pfs/9p-proxy.h
index ba9ca203de16e9925475b20632c4dc202fca4940..b84301d001b0d749bdec203efd8ab6500af17844 100644 (file)
--- a/hw/9pfs/9p-proxy.h
+++ b/hw/9pfs/9p-proxy.h
@@ -9,8 +9,9 @@
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
  */
-#ifndef _QEMU_9P_PROXY_H
-#define _QEMU_9P_PROXY_H
+
+#ifndef QEMU_9P_PROXY_H
+#define QEMU_9P_PROXY_H
 
 #define PROXY_MAX_IO_SZ (64 * 1024)
 #define V9FS_FD_VALID INT_MAX

diff --git a/hw/9pfs/9p-xattr.h b/hw/9pfs/9p-xattr.h
index 4d39a20262ad2aba7e652725e3991a819ead96f4..a853ea641c0b63f551fabf7b3fcaa0cbf49c317a 100644 (file)
--- a/hw/9pfs/9p-xattr.h
+++ b/hw/9pfs/9p-xattr.h
@@ -10,8 +10,9 @@
  * the COPYING file in the top-level directory.
  *
  */
-#ifndef _QEMU_9P_XATTR_H
-#define _QEMU_9P_XATTR_H
+
+#ifndef QEMU_9P_XATTR_H
+#define QEMU_9P_XATTR_H
 
 #include "qemu/xattr.h"
 

diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
index d2030fdf56e9becd69f9336d79654bbee12d77a3..b4f757ab544997503b64befe61cccdaa70b55a40 100644 (file)
--- a/hw/9pfs/9p.h
+++ b/hw/9pfs/9p.h
@@ -1,5 +1,5 @@
-#ifndef _QEMU_9P_H
-#define _QEMU_9P_H
+#ifndef QEMU_9P_H
+#define QEMU_9P_H
 
 #include <dirent.h>
 #include <utime.h>

diff --git a/hw/9pfs/coth.h b/hw/9pfs/coth.h
index 5b02a63ad9fd4fab7b46e6e6a27e5056ecd0a0ff..3c7424e423d9de8c28db929ea91f739abc1f2aeb 100644 (file)
--- a/hw/9pfs/coth.h
+++ b/hw/9pfs/coth.h
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef _QEMU_9P_COTH_H
-#define _QEMU_9P_COTH_H
+#ifndef QEMU_9P_COTH_H
+#define QEMU_9P_COTH_H
 
 #include "qemu/thread.h"
 #include "qemu/coroutine.h"

diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index 7f6d88553937e4b28fb199eba3bf0525009bac26..7586b792d61eeb8453db3ccb1b3308707a0e08da 100644 (file)
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -1,5 +1,5 @@
-#ifndef _QEMU_VIRTIO_9P_H
-#define _QEMU_VIRTIO_9P_H
+#ifndef QEMU_VIRTIO_9P_H
+#define QEMU_VIRTIO_9P_H
 
 #include "standard-headers/linux/virtio_9p.h"
 #include "hw/virtio/virtio.h"

diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h
index cd32bbdb0e2040bc18cbeecb1a7c780278001d9c..1470eac4f573c4a323c8f2d719442947551acb18 100644 (file)
--- a/hw/arm/strongarm.h
+++ b/hw/arm/strongarm.h
@@ -1,5 +1,5 @@
-#ifndef _STRONGARM_H
-#define _STRONGARM_H
+#ifndef STRONGARM_H
+#define STRONGARM_H
 
 #include "exec/memory.h"
 #include "target-arm/cpu-qom.h"

diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h
index 24ba5f4802ab323db73c8508e8665c93bf36d95d..fdda7f9f51afca3e7dd789c4933083b6480c55d6 100644 (file)
--- a/hw/audio/fmopl.h
+++ b/hw/audio/fmopl.h
@@ -1,5 +1,5 @@
-#ifndef __FMOPL_H_
-#define __FMOPL_H_
+#ifndef FMOPL_H
+#define FMOPL_H
 
 /* --- select emulation chips --- */
 #define BUILD_YM3812 (HAS_YM3812)

diff --git a/hw/block/xen_blkif.h b/hw/block/xen_blkif.h
index 07386844100110114a09d3aa51a0a02a53c5c5cb..3300b6fc0a8e99be233669edda2bdf108add5f56 100644 (file)
--- a/hw/block/xen_blkif.h
+++ b/hw/block/xen_blkif.h
@@ -1,5 +1,5 @@
-#ifndef __XEN_BLKIF_H__
-#define __XEN_BLKIF_H__
+#ifndef XEN_BLKIF_H
+#define XEN_BLKIF_H
 
 #include <xen/io/ring.h>
 #include <xen/io/blkif.h>
@@ -143,4 +143,4 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst,
     }
 }
 
-#endif /* __XEN_BLKIF_H__ */
+#endif /* XEN_BLKIF_H */

diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
index 9fc2760b53e5df6e70c745054c74e44ad5586e13..34c11a70a6738375b5424298efbe15d12ba3d063 100644 (file)
--- a/hw/core/uboot_image.h
+++ b/hw/core/uboot_image.h
@@ -26,8 +26,8 @@
  ********************************************************************
  */
 
-#ifndef __UBOOT_IMAGE_H__
-#define __UBOOT_IMAGE_H__
+#ifndef UBOOT_IMAGE_H
+#define UBOOT_IMAGE_H
 
 /*
  * Operating System Codes
@@ -155,4 +155,4 @@ typedef struct uboot_image_header {
 } uboot_image_header_t;
 
 
-#endif /* __IMAGE_H__ */
+#endif /* UBOOT_IMAGE_H */

diff --git a/hw/display/vga.h b/hw/display/vga.h
index d917046da6479f3dcaa9a539b8209d5116dc2947..16886f5eede7ffe3d9fb3891e4002e3452ea47a9 100644 (file)
--- a/hw/display/vga.h
+++ b/hw/display/vga.h
@@ -14,8 +14,8 @@
  *
  */
 
-#ifndef __linux_video_vga_h__
-#define __linux_video_vga_h__
+#ifndef LINUX_VIDEO_VGA_H
+#define LINUX_VIDEO_VGA_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 /* LINUX_VIDEO_VGA_H */

diff --git a/hw/microblaze/boot.h b/hw/microblaze/boot.h
index 0eb7f8e4f6c16b670fb19e3651fffa4a057a71d0..dd1090d8b55eb53b952a658c7377ef5b5655d70a 100644 (file)
--- a/hw/microblaze/boot.h
+++ b/hw/microblaze/boot.h
@@ -1,5 +1,5 @@
-#ifndef __MICROBLAZE_BOOT__
-#define __MICROBLAZE_BOOT__
+#ifndef MICROBLAZE_BOOT_H
+#define MICROBLAZE_BOOT_H
 
 #include "hw/hw.h"
 
@@ -9,4 +9,4 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
                             const char *dtb_filename,
                             void (*machine_cpu_reset)(MicroBlazeCPU *));
 
-#endif /* __MICROBLAZE_BOOT __ */
+#endif /* MICROBLAZE_BOOT_H */

diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h
index e7dc0a4b90c68161fb474aab1b6d901774054840..30c828e241dec16fa4a57a83a57b0ed853fef9d0 100644 (file)
--- a/hw/net/fsl_etsec/etsec.h
+++ b/hw/net/fsl_etsec/etsec.h
@@ -21,8 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef _ETSEC_H_
-#define _ETSEC_H_
+
+#ifndef ETSEC_H
+#define ETSEC_H
 
 #include "hw/qdev.h"
 #include "hw/sysbus.h"
@@ -173,4 +174,4 @@ void etsec_write_miim(eTSEC          *etsec,
 
 void etsec_miim_link_status(eTSEC *etsec, NetClientState *nc);
 
-#endif /* ! _ETSEC_H_ */
+#endif /* ETSEC_H */

diff --git a/hw/net/fsl_etsec/registers.h b/hw/net/fsl_etsec/registers.h
index 6fb96842b83ba75ae685f303f0aafbe556942019..c4ed2b9d62ebe9d25392bc7f0ed3cb01a9227b3c 100644 (file)
--- a/hw/net/fsl_etsec/registers.h
+++ b/hw/net/fsl_etsec/registers.h
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef _ETSEC_REGISTERS_H_
-#define _ETSEC_REGISTERS_H_
 
+#ifndef ETSEC_REGISTERS_H
+#define ETSEC_REGISTERS_H
 
 enum eTSEC_Register_Access_Type {
     ACC_RW      = 1,            /* Read/Write */
@@ -316,4 +316,4 @@ extern const eTSEC_Register_Definition eTSEC_registers_def[];
 #define TMR_ETTS2_H  (0xEA8 / 4)
 #define TMR_ETTS2_L  (0xEAC / 4)
 
-#endif /* ! _ETSEC_REGISTERS_H_ */
+#endif /* ETSEC_REGISTERS_H */

diff --git a/hw/net/rocker/rocker.h b/hw/net/rocker/rocker.h
index f9c80f80134fad341594b89a3f8f09b36f65455a..7ae0495d9ec7521c5e7140f117b7f9bd7e6d96e1 100644 (file)
--- a/hw/net/rocker/rocker.h
+++ b/hw/net/rocker/rocker.h
@@ -16,8 +16,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _ROCKER_H_
-#define _ROCKER_H_
+#ifndef ROCKER_H
+#define ROCKER_H
 
 #include "qemu/sockets.h"
 
@@ -81,4 +81,4 @@ int rx_produce(World *world, uint32_t pport,
 int rocker_port_eg(Rocker *r, uint32_t pport,
                    const struct iovec *iov, int iovcnt);
 
-#endif /* _ROCKER_H_ */
+#endif /* ROCKER_H */

diff --git a/hw/net/rocker/rocker_desc.h b/hw/net/rocker/rocker_desc.h
index d4041f5c4c58d9600dcd08a9c6dd6fb6f461bc6c..1dec33561493d580583c842ce3f58a2e93eb788e 100644 (file)
--- a/hw/net/rocker/rocker_desc.h
+++ b/hw/net/rocker/rocker_desc.h
@@ -14,9 +14,8 @@
  * GNU General Public License for more details.
  */
 
-
-#ifndef _ROCKER_DESC_H_
-#define _ROCKER_DESC_H_
+#ifndef ROCKER_DESC_H
+#define ROCKER_DESC_H
 
 #include "rocker_hw.h"
 

diff --git a/hw/net/rocker/rocker_fp.h b/hw/net/rocker/rocker_fp.h
index 04592bbfd2260eda62d2bee954f91eb2f414ccc2..dbe1dd329a4bf29d386a74a840345201c7ad2cc3 100644 (file)
--- a/hw/net/rocker/rocker_fp.h
+++ b/hw/net/rocker/rocker_fp.h
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _ROCKER_FP_H_
-#define _ROCKER_FP_H_
+#ifndef ROCKER_FP_H
+#define ROCKER_FP_H
 
 #include "net/net.h"
 #include "qemu/iov.h"
@@ -51,4 +51,4 @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name,
 void fp_port_free(FpPort *port);
 void fp_port_reset(FpPort *port);
 
-#endif /* _ROCKER_FP_H_ */
+#endif /* ROCKER_FP_H */

diff --git a/hw/net/rocker/rocker_hw.h b/hw/net/rocker/rocker_hw.h
index 8c50830325373f37c00d17a46b84277b507242ce..1786323fa4a684a8010aae28beca132a7af2f21d 100644 (file)
--- a/hw/net/rocker/rocker_hw.h
+++ b/hw/net/rocker/rocker_hw.h
@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef _ROCKER_HW_
-#define _ROCKER_HW_
+#ifndef ROCKER_HW_H
+#define ROCKER_HW_H
 
 #define __le16 uint16_t
 #define __le32 uint32_t
@@ -490,4 +490,4 @@ enum rocker_of_dpa_overlay_type {
  */
 #define ROCKER_CONTROL_RESET            (1 << 0)
 
-#endif /* _ROCKER_HW_ */
+#endif /* ROCKER_HW_H */

diff --git a/hw/net/rocker/rocker_of_dpa.h b/hw/net/rocker/rocker_of_dpa.h
index f3f6d77807a6247c97c87b98c4e7617a11c2444e..01c7a97d0d32ce7c4825439e96f78d7fa71835f7 100644 (file)
--- a/hw/net/rocker/rocker_of_dpa.h
+++ b/hw/net/rocker/rocker_of_dpa.h
@@ -14,9 +14,9 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _ROCKER_OF_DPA_H_
-#define _ROCKER_OF_DPA_H_
+#ifndef ROCKER_OF_DPA_H
+#define ROCKER_OF_DPA_H
 
 World *of_dpa_world_alloc(Rocker *r);
 
-#endif /* _ROCKER_OF_DPA_H_ */
+#endif /* ROCKER_OF_DPA_H */

diff --git a/hw/net/rocker/rocker_tlv.h b/hw/net/rocker/rocker_tlv.h
index 88561648f0adbeb3f710fc3409bb8ab25aae8258..dd28d084431a7ff1d4fbfbd09ecbfe3d22a2a88b 100644 (file)
--- a/hw/net/rocker/rocker_tlv.h
+++ b/hw/net/rocker/rocker_tlv.h
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _ROCKER_TLV_H_
-#define _ROCKER_TLV_H_
+#ifndef ROCKER_TLV_H
+#define ROCKER_TLV_H
 
 #define ROCKER_TLV_ALIGNTO 8U
 #define ROCKER_TLV_ALIGN(len) \

diff --git a/hw/net/rocker/rocker_world.h b/hw/net/rocker/rocker_world.h
index 58ade473350928eeeac15d2172e3f2d71f0a3f73..44f1fe3e19d7c6df37ebe6a0f2d93dc51037f131 100644 (file)
--- a/hw/net/rocker/rocker_world.h
+++ b/hw/net/rocker/rocker_world.h
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _ROCKER_WORLD_H_
-#define _ROCKER_WORLD_H_
+#ifndef ROCKER_WORLD_H
+#define ROCKER_WORLD_H
 
 #include "rocker_hw.h"
 
@@ -58,4 +58,4 @@ const char *world_name(World *world);
 
 World *rocker_get_world(Rocker *r, enum rocker_world_type type);
 
-#endif /* _ROCKER_WORLD_H_ */
+#endif /* ROCKER_WORLD_H */

diff --git a/hw/net/vmxnet3.h b/hw/net/vmxnet3.h
index f7006afe96a6fb551422c4602e84ac7aaac53090..f9352c4a2742c191d42ed0034b63fc2bb5ae4027 100644 (file)
--- a/hw/net/vmxnet3.h
+++ b/hw/net/vmxnet3.h
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef _QEMU_VMXNET3_H
-#define _QEMU_VMXNET3_H
+#ifndef QEMU_VMXNET3_H
+#define QEMU_VMXNET3_H
 
 #define VMXNET3_DEVICE_MAX_TX_QUEUES 8
 #define VMXNET3_DEVICE_MAX_RX_QUEUES 8   /* Keep this value as a power of 2 */

diff --git a/hw/net/vmxnet_debug.h b/hw/net/vmxnet_debug.h
index 5aab00b05004cb8238933ed0d19fa065e201af36..cb50aa95dbeb5683d8420b59907afc212db7c89f 100644 (file)
--- a/hw/net/vmxnet_debug.h
+++ b/hw/net/vmxnet_debug.h
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef _QEMU_VMXNET_DEBUG_H
-#define _QEMU_VMXNET_DEBUG_H
+#ifndef QEMU_VMXNET_DEBUG_H
+#define QEMU_VMXNET_DEBUG_H
 
 #define VMXNET_DEVICE_NAME "vmxnet3"
 
@@ -142,4 +142,4 @@
         }                                                                     \
     } while (0)
 
-#endif /* _QEMU_VMXNET3_DEBUG_H  */
+#endif /* QEMU_VMXNET_DEBUG_H */

diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index 5764b86c28d914b03d3f29e79a8a5206556f516d..20cbddb4e465a9300b17bc47afac3dd3c6ab7edd 100644 (file)
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -22,8 +22,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#if !defined(__PPC_MAC_H__)
-#define __PPC_MAC_H__
+
+#ifndef PPC_MAC_H
+#define PPC_MAC_H
 
 #include "exec/memory.h"
 #include "hw/sysbus.h"
@@ -184,4 +185,4 @@ typedef struct MacIONVRAMState {
 } MacIONVRAMState;
 
 void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len);
-#endif /* !defined(__PPC_MAC_H__) */
+#endif /* PPC_MAC_H */

diff --git a/hw/sh4/sh7750_regnames.h b/hw/sh4/sh7750_regnames.h
index 7463709b4c642069527f9a8f3a9057aa1aaa0e48..e3ba88636fe55a877b1b368a03630511a5d4da61 100644 (file)
--- a/hw/sh4/sh7750_regnames.h
+++ b/hw/sh4/sh7750_regnames.h
@@ -1,6 +1,6 @@
-#ifndef _SH7750_REGNAMES_H
-#define _SH7750_REGNAMES_H
+#ifndef SH7750_REGNAMES_H
+#define SH7750_REGNAMES_H
 
 const char *regname(uint32_t addr);
 
-#endif                         /* _SH7750_REGNAMES_H */
+#endif /* SH7750_REGNAMES_H */

diff --git a/hw/sh4/sh7750_regs.h b/hw/sh4/sh7750_regs.h
index 534aa4840364b52986df23cd4ea20f6500fbc727..3e4554af315193e1005ef30a401542b336904647 100644 (file)
--- a/hw/sh4/sh7750_regs.h
+++ b/hw/sh4/sh7750_regs.h
@@ -16,8 +16,8 @@
  * @(#) sh7750_regs.h,v 1.2.4.1 2003/09/04 18:46:00 joel Exp
  */
 
-#ifndef __SH7750_REGS_H__
-#define __SH7750_REGS_H__
+#ifndef SH7750_REGS_H
+#define SH7750_REGS_H
 
 /*
  * All register has 2 addresses: in 0xff000000 - 0xffffffff (P4 address)  and

diff --git a/hw/xtensa/bootparam.h b/hw/xtensa/bootparam.h
index 955f4e86e3da77d9da39e25048f0a88cadaa16c9..ade7891ec5057e9df789562a96837a89792834e5 100644 (file)
--- a/hw/xtensa/bootparam.h
+++ b/hw/xtensa/bootparam.h
@@ -1,5 +1,5 @@
-#ifndef HW_XTENSA_BOOTPARAM
-#define HW_XTENSA_BOOTPARAM
+#ifndef HW_XTENSA_BOOTPARAM_H
+#define HW_XTENSA_BOOTPARAM_H
 
 #define BP_TAG_COMMAND_LINE     0x1001  /* command line (0-terminated string)*/
 #define BP_TAG_INITRD           0x1002  /* ramdisk addr and size (bp_meminfo) */

diff --git a/include/crypto/afsplit.h b/include/crypto/afsplit.h
index 4cc4ca4b3899326c34e477c0623701bbc6b48cdd..7dd21f0a670e1142a1e2ffb3fdbc06d9a2c01a34 100644 (file)
--- a/include/crypto/afsplit.h
+++ b/include/crypto/afsplit.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_AFSPLIT_H__
-#define QCRYPTO_AFSPLIT_H__
+#ifndef QCRYPTO_AFSPLIT_H
+#define QCRYPTO_AFSPLIT_H
 
 #include "crypto/hash.h"
 
@@ -132,4 +132,4 @@ int qcrypto_afsplit_decode(QCryptoHashAlgorithm hash,
                            uint8_t *out,
                            Error **errp);
 
-#endif /* QCRYPTO_AFSPLIT_H__ */
+#endif /* QCRYPTO_AFSPLIT_H */

diff --git a/include/crypto/block.h b/include/crypto/block.h
index a21e11ff86ea3996bc4deb6b6922a26eb04ab66b..895521162cbabdd2c0cc5a0fc5ac58f86cf9c56f 100644 (file)
--- a/include/crypto/block.h
+++ b/include/crypto/block.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_BLOCK_H__
-#define QCRYPTO_BLOCK_H__
+#ifndef QCRYPTO_BLOCK_H
+#define QCRYPTO_BLOCK_H
 
 #include "crypto/cipher.h"
 #include "crypto/ivgen.h"
@@ -229,4 +229,4 @@ uint64_t qcrypto_block_get_payload_offset(QCryptoBlock *block);
  */
 void qcrypto_block_free(QCryptoBlock *block);
 
-#endif /* QCRYPTO_BLOCK_H__ */
+#endif /* QCRYPTO_BLOCK_H */

diff --git a/include/crypto/cipher.h b/include/crypto/cipher.h
index d770c4835a3447ff48c6eb4d384067cd83d89415..376654dcdd8d784edf384a196462f0843b683a08 100644 (file)
--- a/include/crypto/cipher.h
+++ b/include/crypto/cipher.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_CIPHER_H__
-#define QCRYPTO_CIPHER_H__
+#ifndef QCRYPTO_CIPHER_H
+#define QCRYPTO_CIPHER_H
 
 #include "qapi-types.h"
 
@@ -230,4 +230,4 @@ int qcrypto_cipher_setiv(QCryptoCipher *cipher,
                          const uint8_t *iv, size_t niv,
                          Error **errp);
 
-#endif /* QCRYPTO_CIPHER_H__ */
+#endif /* QCRYPTO_CIPHER_H */

diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index f38caed6691231419ccff66949780f15ed48724f..ca3267f3dfd1d48eb941960da794587e2e028d08 100644 (file)
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_HASH_H__
-#define QCRYPTO_HASH_H__
+#ifndef QCRYPTO_HASH_H
+#define QCRYPTO_HASH_H
 
 #include "qapi-types.h"
 
@@ -189,4 +189,4 @@ int qcrypto_hash_base64(QCryptoHashAlgorithm alg,
                         char **base64,
                         Error **errp);
 
-#endif /* QCRYPTO_HASH_H__ */
+#endif /* QCRYPTO_HASH_H */

diff --git a/include/crypto/init.h b/include/crypto/init.h
index 2513ed09867dc6aefe89d9eb3a255fcbbf4164ed..04c1edf770649eb1bb151d4fc2be8670c7eb3dab 100644 (file)
--- a/include/crypto/init.h
+++ b/include/crypto/init.h
@@ -18,9 +18,9 @@
  *
  */
 
-#ifndef QCRYPTO_INIT_H__
-#define QCRYPTO_INIT_H__
+#ifndef QCRYPTO_INIT_H
+#define QCRYPTO_INIT_H
 
 int qcrypto_init(Error **errp);
 
-#endif /* QCRYPTO_INIT_H__ */
+#endif /* QCRYPTO_INIT_H */

diff --git a/include/crypto/ivgen.h b/include/crypto/ivgen.h
index 09cdb6fcd9e1a66ca0c73f666b12071f4b3d9745..0350cd2a9301714db81d86be9db427beee9a3dd2 100644 (file)
--- a/include/crypto/ivgen.h
+++ b/include/crypto/ivgen.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_IVGEN_H__
-#define QCRYPTO_IVGEN_H__
+#ifndef QCRYPTO_IVGEN_H
+#define QCRYPTO_IVGEN_H
 
 #include "crypto/cipher.h"
 #include "crypto/hash.h"
@@ -203,4 +203,4 @@ QCryptoHashAlgorithm qcrypto_ivgen_get_hash(QCryptoIVGen *ivgen);
  */
 void qcrypto_ivgen_free(QCryptoIVGen *ivgen);
 
-#endif /* QCRYPTO_IVGEN_H__ */
+#endif /* QCRYPTO_IVGEN_H */

diff --git a/include/crypto/pbkdf.h b/include/crypto/pbkdf.h
index 58a1fe62a15a5c28c84dd8c1db6353e6d3625853..e9e4ceca8338e159049e2c988ffe41714037e9f1 100644 (file)
--- a/include/crypto/pbkdf.h
+++ b/include/crypto/pbkdf.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_PBKDF_H__
-#define QCRYPTO_PBKDF_H__
+#ifndef QCRYPTO_PBKDF_H
+#define QCRYPTO_PBKDF_H
 
 #include "crypto/hash.h"
 
@@ -149,4 +149,4 @@ int qcrypto_pbkdf2_count_iters(QCryptoHashAlgorithm hash,
                                const uint8_t *salt, size_t nsalt,
                                Error **errp);
 
-#endif /* QCRYPTO_PBKDF_H__ */
+#endif /* QCRYPTO_PBKDF_H */

diff --git a/include/crypto/random.h b/include/crypto/random.h
index f9308f4647629678920d2f55c9f768bdf37c831c..a101353202ef03975dde352b2dcfd982a8b21785 100644 (file)
--- a/include/crypto/random.h
+++ b/include/crypto/random.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_RANDOM_H__
-#define QCRYPTO_RANDOM_H__
+#ifndef QCRYPTO_RANDOM_H
+#define QCRYPTO_RANDOM_H
 
 #include "qemu-common.h"
 #include "qapi/error.h"
@@ -41,4 +41,4 @@ int qcrypto_random_bytes(uint8_t *buf,
                          Error **errp);
 
 
-#endif /* QCRYPTO_RANDOM_H__ */
+#endif /* QCRYPTO_RANDOM_H */

diff --git a/include/crypto/secret.h b/include/crypto/secret.h
index b7392c6ba0b3a3490a60ccbb8a71a9c8a0337e1b..07a963e7940a4f4fd9dcffb5ae1f1efec95b5e5a 100644 (file)
--- a/include/crypto/secret.h
+++ b/include/crypto/secret.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_SECRET_H__
-#define QCRYPTO_SECRET_H__
+#ifndef QCRYPTO_SECRET_H
+#define QCRYPTO_SECRET_H
 
 #include "qom/object.h"
 
@@ -143,4 +143,4 @@ extern char *qcrypto_secret_lookup_as_utf8(const char *secretid,
 extern char *qcrypto_secret_lookup_as_base64(const char *secretid,
                                              Error **errp);
 
-#endif /* QCRYPTO_SECRET_H__ */
+#endif /* QCRYPTO_SECRET_H */

diff --git a/include/crypto/xts.h b/include/crypto/xts.h
index c2924d8ba03f712da77919fb3c6ef25176c5e3cf..da32ab82b64c650dbb80a0604dae2038cf8fd3ea 100644 (file)
--- a/include/crypto/xts.h
+++ b/include/crypto/xts.h
@@ -23,9 +23,8 @@
  *
  */
 
-
-#ifndef QCRYPTO_XTS_H_
-#define QCRYPTO_XTS_H_
+#ifndef QCRYPTO_XTS_H
+#define QCRYPTO_XTS_H
 
 #include "qemu-common.h"
 #include "qapi/error.h"
@@ -83,4 +82,4 @@ void xts_encrypt(const void *datactx,
                  const uint8_t *src);
 
 
-#endif /* QCRYPTO_XTS_H_ */
+#endif /* QCRYPTO_XTS_H */

diff --git a/include/disas/disas.h b/include/disas/disas.h
index 4930d78ac4edf9eb73af8a9582d01ff0befc0077..e549ca24a1523ae4f8a4917a89c12096fc505f53 100644 (file)
--- a/include/disas/disas.h
+++ b/include/disas/disas.h
@@ -1,5 +1,5 @@
-#ifndef _QEMU_DISAS_H
-#define _QEMU_DISAS_H
+#ifndef QEMU_DISAS_H
+#define QEMU_DISAS_H
 
 #include "qemu-common.h"
 
@@ -42,4 +42,4 @@ struct syminfo {
 /* Filled in by elfload.c.  Simplistic, but will do for now. */
 extern struct syminfo *syminfos;
 
-#endif /* _QEMU_DISAS_H */
+#endif /* QEMU_DISAS_H */

diff --git a/include/elf.h b/include/elf.h
index 745739ab8c26d2c33f0cab3822e0dbc648437c34..1c2975dc82be62e4a1b2fbb5c3c52b3cd1a6142b 100644 (file)
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,6 +1,5 @@
-#ifndef _QEMU_ELF_H
-#define _QEMU_ELF_H
-
+#ifndef QEMU_ELF_H
+#define QEMU_ELF_H
 
 /* 32-bit ELF base types. */
 typedef uint32_t Elf32_Addr;
@@ -1573,4 +1572,4 @@ struct elf32_fdpic_loadmap {
 #endif /* ELF_CLASS */
 
 
-#endif /* _QEMU_ELF_H */
+#endif /* QEMU_ELF_H */

diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index db79ab65cebeee4aecdad56a291416ba07ee215f..acda7b613d5329a68751614877319d642b311f4e 100644 (file)
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -17,8 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXEC_ALL_H_
-#define _EXEC_ALL_H_
+#ifndef EXEC_ALL_H
+#define EXEC_ALL_H
 
 #include "qemu-common.h"
 #include "exec/tb-context.h"

diff --git a/include/exec/tb-context.h b/include/exec/tb-context.h
index e209c1c28c0655086b7c3ced5f108e6a92d50c04..dce95d92d638db742a346e3cbeecbed16f17a13c 100644 (file)
--- a/include/exec/tb-context.h
+++ b/include/exec/tb-context.h
@@ -17,8 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef QEMU_TB_CONTEXT_H_
-#define QEMU_TB_CONTEXT_H_
+#ifndef QEMU_TB_CONTEXT_H
+#define QEMU_TB_CONTEXT_H
 
 #include "qemu/thread.h"
 #include "qemu/qht.h"

diff --git a/include/exec/tb-hash-xx.h b/include/exec/tb-hash-xx.h
index 85b741d02a8cda190c4010161b872b31f1c02cc6..2c40b5c466541d79ab031e4a8a286a21f8fd320a 100644 (file)
--- a/include/exec/tb-hash-xx.h
+++ b/include/exec/tb-hash-xx.h
@@ -30,8 +30,9 @@
  * You can contact the author at :
  * - xxHash source repository : https://github.com/Cyan4973/xxHash
  */
-#ifndef EXEC_TB_HASH_XX
-#define EXEC_TB_HASH_XX
+
+#ifndef EXEC_TB_HASH_XX_H
+#define EXEC_TB_HASH_XX_H
 
 #include "qemu/bitops.h"
 
@@ -91,4 +92,4 @@ uint32_t tb_hash_func5(uint64_t a0, uint64_t b0, uint32_t e)
     return h32;
 }
 
-#endif /* EXEC_TB_HASH_XX */
+#endif /* EXEC_TB_HASH_XX_H */

diff --git a/include/exec/tb-hash.h b/include/exec/tb-hash.h
index 1d0200bc9136bb29b148df127157df0ad44cefef..2c27490cb8dfebe65da28dbd77b9450019fadc23 100644 (file)
--- a/include/exec/tb-hash.h
+++ b/include/exec/tb-hash.h
@@ -17,8 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EXEC_TB_HASH
-#define EXEC_TB_HASH
+#ifndef EXEC_TB_HASH_H
+#define EXEC_TB_HASH_H
 
 #include "exec/tb-hash-xx.h"
 

diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h
index b6d929ddb745559aad631dc364b035c902a81b0b..29fef8bfa1dac0b398793682634a08eadb6f0ac4 100644 (file)
--- a/include/hw/arm/exynos4210.h
+++ b/include/hw/arm/exynos4210.h
@@ -22,9 +22,8 @@
  *
  */
 
-
-#ifndef EXYNOS4210_H_
-#define EXYNOS4210_H_
+#ifndef EXYNOS4210_H
+#define EXYNOS4210_H
 
 #include "qemu-common.h"
 #include "exec/memory.h"
@@ -135,4 +134,4 @@ DeviceState *exynos4210_uart_create(hwaddr addr,
                                     CharDriverState *chr,
                                     qemu_irq irq);
 
-#endif /* EXYNOS4210_H_ */
+#endif /* EXYNOS4210_H */

diff --git a/include/hw/gpio/imx_gpio.h b/include/hw/gpio/imx_gpio.h
index 4573570384147c44d4cb21f5936d322b2a474cd4..ffab437f23f27893c7cf980f845c0c967454a07e 100644 (file)
--- a/include/hw/gpio/imx_gpio.h
+++ b/include/hw/gpio/imx_gpio.h
@@ -17,8 +17,8 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __IMX_GPIO_H_
-#define __IMX_GPIO_H_
+#ifndef IMX_GPIO_H
+#define IMX_GPIO_H
 
 #include "hw/sysbus.h"
 
@@ -60,4 +60,4 @@ typedef struct IMXGPIOState {
     qemu_irq output[IMX_GPIO_PIN_COUNT];
 } IMXGPIOState;
 
-#endif /* __IMX_GPIO_H_ */
+#endif /* IMX_GPIO_H */

diff --git a/include/hw/i2c/i2c-ddc.h b/include/hw/i2c/i2c-ddc.h
index cb8e62d622111cd3e75c2fa04e8f74831107b3ca..d9b5f33f5856fb384c6b80c47c7626d004ec223c 100644 (file)
--- a/include/hw/i2c/i2c-ddc.h
+++ b/include/hw/i2c/i2c-ddc.h
@@ -16,8 +16,8 @@
  *  with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef I2C_DDC
-#define I2C_DDC
+#ifndef I2C_DDC_H
+#define I2C_DDC_H
 
 /* A simple I2C slave which just returns the contents of its EDID blob. */
 
@@ -35,4 +35,4 @@ typedef struct I2CDDCState I2CDDCState;
 #define TYPE_I2CDDC "i2c-ddc"
 #define I2CDDC(obj) OBJECT_CHECK(I2CDDCState, (obj), TYPE_I2CDDC)
 
-#endif /* !I2C_DDC */
+#endif /* I2C_DDC_H */

diff --git a/include/hw/i2c/imx_i2c.h b/include/hw/i2c/imx_i2c.h
index fb95df5a526e98f6c7bac58822210ca8afa9d0d1..7c73a1fa2895a803358e0ce9ec61bf54ad8c0a8c 100644 (file)
--- a/include/hw/i2c/imx_i2c.h
+++ b/include/hw/i2c/imx_i2c.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __IMX_I2C_H_
-#define __IMX_I2C_H_
+#ifndef IMX_I2C_H
+#define IMX_I2C_H
 
 #include "hw/sysbus.h"
 
@@ -84,4 +84,4 @@ typedef struct IMXI2CState {
     uint16_t i2dr_write;
 } IMXI2CState;
 
-#endif /* __IMX_I2C_H_ */
+#endif /* IMX_I2C_H */

diff --git a/include/hw/input/adb.h b/include/hw/input/adb.h
index db51d03804515cd0b9e4b8f8557fd8d58cfbaa9d..3ae8445e953aef338c1fd5a65cf8ba4764e8ba9d 100644 (file)
--- a/include/hw/input/adb.h
+++ b/include/hw/input/adb.h
@@ -23,8 +23,8 @@
  * THE SOFTWARE.
  */
 
-#if !defined(__ADB_H__)
-#define __ADB_H__
+#ifndef ADB_H
+#define ADB_H
 
 #include "hw/qdev.h"
 
@@ -84,4 +84,4 @@ int adb_poll(ADBBusState *s, uint8_t *buf_out, uint16_t poll_mask);
 #define TYPE_ADB_KEYBOARD "adb-keyboard"
 #define TYPE_ADB_MOUSE "adb-mouse"
 
-#endif /* !defined(__ADB_H__) */
+#endif /* ADB_H */

diff --git a/include/hw/intc/mips_gic.h b/include/hw/intc/mips_gic.h
index dd6d44d73183bb28cce98eb91e9b2e5fee9947ab..b98d50094a610244184cb0a7d8ab9867c35b2fc8 100644 (file)
--- a/include/hw/intc/mips_gic.h
+++ b/include/hw/intc/mips_gic.h
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef _MIPS_GIC_H
-#define _MIPS_GIC_H
+#ifndef MIPS_GIC_H
+#define MIPS_GIC_H
 
 #include "hw/timer/mips_gictimer.h"
 #include "cpu.h"
@@ -213,4 +213,4 @@ struct MIPSGICState {
     int32_t num_irq;
 };
 
-#endif /* _MIPS_GIC_H */
+#endif /* MIPS_GIC_H */

diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h
index afe950b40930b1add74da7dbc1ad5a8ea01e6d25..6137e2d7a2f2d0ca0cc26f8f36ef0575949b3286 100644 (file)
--- a/include/hw/ppc/openpic.h
+++ b/include/hw/ppc/openpic.h
@@ -1,5 +1,5 @@
-#if !defined(__OPENPIC_H__)
-#define __OPENPIC_H__
+#ifndef OPENPIC_H
+#define OPENPIC_H
 
 #include "qemu-common.h"
 #include "hw/qdev-core.h"
@@ -30,4 +30,4 @@ enum {
 #define TYPE_KVM_OPENPIC "kvm-openpic"
 int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs);
 
-#endif /* __OPENPIC_H__ */
+#endif /* OPENPIC_H */

diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 2e2dd14c30dc74a8dd556b91970efa2b8844a269..bd8ac28160a58cb19f3933310f22b5aa818d3d26 100644 (file)
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -1,5 +1,5 @@
-#if !defined(__HW_SPAPR_H__)
-#define __HW_SPAPR_H__
+#ifndef HW_SPAPR_H
+#define HW_SPAPR_H
 
 #include "sysemu/dma.h"
 #include "hw/boards.h"
@@ -648,4 +648,4 @@ int spapr_rng_populate_dt(void *fdt);
 #define SPAPR_LMB_FLAGS_DRC_INVALID 0x00000020
 #define SPAPR_LMB_FLAGS_RESERVED 0x00000080
 
-#endif /* !defined (__HW_SPAPR_H__) */
+#endif /* HW_SPAPR_H */

diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h
index 6aa506fbc3d83ee5b58695820a7014fdc125c0bd..fa531d5c26b586f4f2d553b17a32980ebab16790 100644 (file)
--- a/include/hw/ppc/spapr_drc.h
+++ b/include/hw/ppc/spapr_drc.h
@@ -9,8 +9,9 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
-#if !defined(__HW_SPAPR_DRC_H__)
-#define __HW_SPAPR_DRC_H__
+
+#ifndef HW_SPAPR_DRC_H
+#define HW_SPAPR_DRC_H
 
 #include <libfdt.h>
 #include "qom/object.h"
@@ -202,4 +203,4 @@ sPAPRDRConnector *spapr_dr_connector_by_id(sPAPRDRConnectorType type,
 int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner,
                           uint32_t drc_type_mask);
 
-#endif /* __HW_SPAPR_DRC_H__ */
+#endif /* HW_SPAPR_DRC_H */

diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
index bdb5d2f308e2b559f0a6a96c1c8ee82d502b182f..d4a1e2c8afa43462af1200448c7a0b5f9934b991 100644 (file)
--- a/include/hw/ppc/spapr_vio.h
+++ b/include/hw/ppc/spapr_vio.h
@@ -1,5 +1,6 @@
-#ifndef _HW_SPAPR_VIO_H
-#define _HW_SPAPR_VIO_H
+#ifndef HW_SPAPR_VIO_H
+#define HW_SPAPR_VIO_H
+
 /*
  * QEMU sPAPR VIO bus definitions
  *
@@ -145,4 +146,4 @@ extern const VMStateDescription vmstate_spapr_vio;
 
 void spapr_vio_set_bypass(VIOsPAPRDevice *dev, bool bypass);
 
-#endif /* _HW_SPAPR_VIO_H */
+#endif /* HW_SPAPR_VIO_H */

diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 6189a3bff752c21cae89de7539e08280e36d497c..2db9f938d3e1ca74883756ddf24a30c8f54b77ff 100644 (file)
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -24,8 +24,9 @@
  * THE SOFTWARE.
  *
  */
-#if !defined(__XICS_H__)
-#define __XICS_H__
+
+#ifndef XICS_H
+#define XICS_H
 
 #include "hw/sysbus.h"
 
@@ -196,4 +197,4 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi);
 
 int xics_find_source(XICSState *icp, int irq);
 
-#endif /* __XICS_H__ */
+#endif /* XICS_H */

diff --git a/include/hw/s390x/ebcdic.h b/include/hw/s390x/ebcdic.h
index 1d6fde9c1259e8226d13ef32616ecbf8ae734ee8..69a04cab62ce4c1a6f9da1d2c4791ba798b0e7d8 100644 (file)
--- a/include/hw/s390x/ebcdic.h
+++ b/include/hw/s390x/ebcdic.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef EBCDIC_H_
-#define EBCDIC_H_
+#ifndef EBCDIC_H
+#define EBCDIC_H
 
 /* EBCDIC handling */
 static const uint8_t ebcdic2ascii[] = {
@@ -101,4 +101,4 @@ static inline void ascii_put(uint8_t *p, const char *ebcdic, int len)
     }
 }
 
-#endif /* EBCDIC_H_ */
+#endif /* EBCDIC_H */

diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h
index 1dac2ee48d8e5da3774953722c84b5cccc7dd40c..9094edadf59be44df83b73f6fcdb4b57163b4328 100644 (file)
--- a/include/hw/s390x/s390_flic.h
+++ b/include/hw/s390x/s390_flic.h
@@ -10,8 +10,8 @@
  * directory.
  */
 
-#ifndef __HW_S390_FLIC_H
-#define __HW_S390_FLIC_H
+#ifndef HW_S390_FLIC_H
+#define HW_S390_FLIC_H
 
 #include "hw/sysbus.h"
 #include "hw/s390x/adapter.h"
@@ -78,4 +78,4 @@ static inline DeviceState *s390_flic_kvm_create(void)
 }
 #endif
 
-#endif /* __HW_S390_FLIC_H */
+#endif /* HW_S390_FLIC_H */

diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h
index 5ed7a0ebb0b3663cb843799d0910bf997dd05ee9..62df48ec06d2d3b18ae3679d5f88ebf7d371b401 100644 (file)
--- a/include/hw/s390x/storage-keys.h
+++ b/include/hw/s390x/storage-keys.h
@@ -9,8 +9,8 @@
  * directory.
  */
 
-#ifndef __S390_STORAGE_KEYS_H
-#define __S390_STORAGE_KEYS_H
+#ifndef S390_STORAGE_KEYS_H
+#define S390_STORAGE_KEYS_H
 
 #include "hw/qdev.h"
 #include "monitor/monitor.h"
@@ -57,4 +57,4 @@ S390SKeysState *s390_get_skeys_device(void);
 void hmp_dump_skeys(Monitor *mon, const QDict *qdict);
 void hmp_info_skeys(Monitor *mon, const QDict *qdict);
 
-#endif /* __S390_STORAGE_KEYS_H */
+#endif /* S390_STORAGE_KEYS_H */

diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index c8a4b98d5d712fb5cc54fdf1b9663bac6ea12dfe..79909b2478e2290eb3e2e1562039db8c2b095a5b 100644 (file)
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -26,8 +26,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __hw_sd_h
-#define __hw_sd_h              1
+
+#ifndef HW_SD_H
+#define HW_SD_H
 
 #include "hw/qdev.h"
 
@@ -144,4 +145,4 @@ bool sdbus_get_readonly(SDBus *sd);
 void sdbus_set_inserted(SDBus *sd, bool inserted);
 void sdbus_set_readonly(SDBus *sd, bool inserted);
 
-#endif /* __hw_sd_h */
+#endif /* HW_SD_H */

diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h
index b7ddcb096a81b6dc9934023867fce547279c018f..7913bc48a2c356fbd9b6445faa146746de43c352 100644 (file)
--- a/include/hw/sh4/sh_intc.h
+++ b/include/hw/sh4/sh_intc.h
@@ -1,5 +1,5 @@
-#ifndef __SH_INTC_H__
-#define __SH_INTC_H__
+#ifndef SH_INTC_H
+#define SH_INTC_H
 
 #include "qemu-common.h"
 #include "hw/irq.h"
@@ -80,4 +80,4 @@ int sh_intc_init(MemoryRegion *sysmem,
 
 void sh_intc_set_irl(void *opaque, int n, int level);
 
-#endif /* __SH_INTC_H__ */
+#endif /* SH_INTC_H */

diff --git a/include/hw/sparc/grlib.h b/include/hw/sparc/grlib.h
index 9a0db7b47b4249e3323988acef51b969ce50a40b..afbb9bc07c1feab38cc00ad31dee806bf1f6e77c 100644 (file)
--- a/include/hw/sparc/grlib.h
+++ b/include/hw/sparc/grlib.h
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef _GRLIB_H_
-#define _GRLIB_H_
+#ifndef GRLIB_H
+#define GRLIB_H
 
 #include "hw/qdev.h"
 #include "hw/sysbus.h"
@@ -117,4 +117,4 @@ DeviceState *grlib_apbuart_create(hwaddr  base,
     return dev;
 }
 
-#endif /* ! _GRLIB_H_ */
+#endif /* GRLIB_H */

diff --git a/include/hw/timer/mips_gictimer.h b/include/hw/timer/mips_gictimer.h
index e3ca45c533dbc9f0562cbb7643ea010c52062c76..c8bc5d25412da99d3885daf3f9f1b155c5d2a476 100644 (file)
--- a/include/hw/timer/mips_gictimer.h
+++ b/include/hw/timer/mips_gictimer.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef _MIPS_GICTIMER_H_
-#define _MIPS_GICTIMER_H_
+#ifndef MIPS_GICTIMER_H
+#define MIPS_GICTIMER_H
 
 typedef struct MIPSGICTimerVPState MIPSGICTimerVPState;
 typedef struct MIPSGICTimerState MIPSGICTimerState;
@@ -43,4 +43,4 @@ void mips_gictimer_stop_count(MIPSGICTimerState *gic);
 MIPSGICTimerState *mips_gictimer_init(void *opaque, uint32_t nvps,
                                       MIPSGICTimerCB *cb);
 
-#endif /* _MIPS_GICTIMER_H_ */
+#endif /* MIPS_GICTIMER_H */

diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
index 84e1cb79ff345708a9dc942a34863c698d7545a3..cf7f0b5a69213cfbc4441a44645d4c44ad3747f4 100644 (file)
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -8,9 +8,8 @@
  *
  */
 
-#ifndef VHOST_BACKEND_H_
-#define VHOST_BACKEND_H_
-
+#ifndef VHOST_BACKEND_H
+#define VHOST_BACKEND_H
 
 typedef enum VhostBackendType {
     VHOST_BACKEND_TYPE_NONE = 0,
@@ -110,4 +109,4 @@ extern const VhostOps user_ops;
 int vhost_set_backend_type(struct vhost_dev *dev,
                            VhostBackendType backend_type);
 
-#endif /* VHOST_BACKEND_H_ */
+#endif /* VHOST_BACKEND_H */

diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h
index 4b280381464209bee34fbfa846956b1708a4b07a..440b4555ea61ea38d3721ad9ded12c772c8c0386 100644 (file)
--- a/include/hw/virtio/virtio-access.h
+++ b/include/hw/virtio/virtio-access.h
@@ -12,8 +12,10 @@
  * (at your option) any later version.
  *
  */
-#ifndef _QEMU_VIRTIO_ACCESS_H
-#define _QEMU_VIRTIO_ACCESS_H
+
+#ifndef QEMU_VIRTIO_ACCESS_H
+#define QEMU_VIRTIO_ACCESS_H
+
 #include "hw/virtio/virtio.h"
 #include "exec/address-spaces.h"
 
@@ -175,4 +177,4 @@ static inline void virtio_tswap64s(VirtIODevice *vdev, uint64_t *s)
 {
     *s = virtio_tswap64(vdev, *s);
 }
-#endif /* _QEMU_VIRTIO_ACCESS_H */
+#endif /* QEMU_VIRTIO_ACCESS_H */

diff --git a/include/hw/virtio/virtio-balloon.h b/include/hw/virtio/virtio-balloon.h
index 35f62ac119df0fbebb28f1f75d4b7675774ae65a..1ea13bd6a48d3a7aedb3d199e98e7ed39c782191 100644 (file)
--- a/include/hw/virtio/virtio-balloon.h
+++ b/include/hw/virtio/virtio-balloon.h
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef _QEMU_VIRTIO_BALLOON_H
-#define _QEMU_VIRTIO_BALLOON_H
+#ifndef QEMU_VIRTIO_BALLOON_H
+#define QEMU_VIRTIO_BALLOON_H
 
 #include "standard-headers/linux/virtio_balloon.h"
 #include "hw/virtio/virtio.h"

diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
index e9bf463f536b321e03c0b90df8e93725b0a8fba3..180bd8db5df2fa421895cd9d9f513db2ddf76e34 100644 (file)
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef _QEMU_VIRTIO_BLK_H
-#define _QEMU_VIRTIO_BLK_H
+#ifndef QEMU_VIRTIO_BLK_H
+#define QEMU_VIRTIO_BLK_H
 
 #include "standard-headers/linux/virtio_blk.h"
 #include "hw/virtio/virtio.h"

diff --git a/include/hw/virtio/virtio-input.h b/include/hw/virtio/virtio-input.h
index bddbd4b28772d169d6bb6d61ef3439a8c30083ae..55db31087ad558d32855299b6e6c919e23d6d7df 100644 (file)
--- a/include/hw/virtio/virtio-input.h
+++ b/include/hw/virtio/virtio-input.h
@@ -1,5 +1,5 @@
-#ifndef _QEMU_VIRTIO_INPUT_H
-#define _QEMU_VIRTIO_INPUT_H
+#ifndef QEMU_VIRTIO_INPUT_H
+#define QEMU_VIRTIO_INPUT_H
 
 #include "ui/input.h"
 
@@ -105,4 +105,4 @@ void virtio_input_add_config(VirtIOInput *vinput,
 void virtio_input_idstr_config(VirtIOInput *vinput,
                                uint8_t select, const char *string);
 
-#endif /* _QEMU_VIRTIO_INPUT_H */
+#endif /* QEMU_VIRTIO_INPUT_H */

diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
index 0cabdb682241b1ad94a50c1ab1839b5745fa6be5..91ed97cfcde73d6d8394d1e78b614721c2b9304b 100644 (file)
--- a/include/hw/virtio/virtio-net.h
+++ b/include/hw/virtio/virtio-net.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef _QEMU_VIRTIO_NET_H
-#define _QEMU_VIRTIO_NET_H
+#ifndef QEMU_VIRTIO_NET_H
+#define QEMU_VIRTIO_NET_H
 
 #include "standard-headers/linux/virtio_net.h"
 #include "hw/virtio/virtio.h"

diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h
index 2bc1ee5b50e0bb0385aa063df1f51c945db5efea..2d40abdbdbcf18bc3ef8137fe290eb606292913c 100644 (file)
--- a/include/hw/virtio/virtio-rng.h
+++ b/include/hw/virtio/virtio-rng.h
@@ -9,8 +9,8 @@
  * top-level directory.
  */
 
-#ifndef _QEMU_VIRTIO_RNG_H
-#define _QEMU_VIRTIO_RNG_H
+#ifndef QEMU_VIRTIO_RNG_H
+#define QEMU_VIRTIO_RNG_H
 
 #include "sysemu/rng.h"
 #include "sysemu/rng-random.h"

diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
index b5156694e5f3688762b48d7706d388db6ccc4301..5e3f088f9a1b000d09af7b39d83eb9f1f2f0f56b 100644 (file)
--- a/include/hw/virtio/virtio-scsi.h
+++ b/include/hw/virtio/virtio-scsi.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef _QEMU_VIRTIO_SCSI_H
-#define _QEMU_VIRTIO_SCSI_H
+#ifndef QEMU_VIRTIO_SCSI_H
+#define QEMU_VIRTIO_SCSI_H
 
 /* Override CDB/sense data size: they are dynamic (guest controlled) in QEMU */
 #define VIRTIO_SCSI_CDB_SIZE 0
@@ -141,4 +141,4 @@ void virtio_scsi_dataplane_start(VirtIOSCSI *s);
 void virtio_scsi_dataplane_stop(VirtIOSCSI *s);
 void virtio_scsi_dataplane_notify(VirtIODevice *vdev, VirtIOSCSIReq *req);
 
-#endif /* _QEMU_VIRTIO_SCSI_H */
+#endif /* QEMU_VIRTIO_SCSI_H */

diff --git a/include/hw/virtio/virtio-serial.h b/include/hw/virtio/virtio-serial.h
index 12a55a19e9cde6c45de08b7ad0720860f41fec55..730c88d2a7805160fcdd1bbfb6a4e0ea6c82b90a 100644 (file)
--- a/include/hw/virtio/virtio-serial.h
+++ b/include/hw/virtio/virtio-serial.h
@@ -12,8 +12,9 @@
  * the COPYING file in the top-level directory.
  *
  */
-#ifndef _QEMU_VIRTIO_SERIAL_H
-#define _QEMU_VIRTIO_SERIAL_H
+
+#ifndef QEMU_VIRTIO_SERIAL_H
+#define QEMU_VIRTIO_SERIAL_H
 
 #include "standard-headers/linux/virtio_console.h"
 #include "hw/qdev.h"

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 96b581dc91bb066cc40929e7cb41779ece61f1a0..8a681f56f173e198f305011ee7cc2029a9927528 100644 (file)
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef _QEMU_VIRTIO_H
-#define _QEMU_VIRTIO_H
+#ifndef QEMU_VIRTIO_H
+#define QEMU_VIRTIO_H
 
 #include "hw/hw.h"
 #include "net/net.h"

diff --git a/include/io/channel-buffer.h b/include/io/channel-buffer.h
index 65c498b2c2d1933e428ad3fd18e43832dc89015e..3f4b3f29e126029b172fa726a53b836310eba702 100644 (file)
--- a/include/io/channel-buffer.h
+++ b/include/io/channel-buffer.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_CHANNEL_BUFFER_H__
-#define QIO_CHANNEL_BUFFER_H__
+#ifndef QIO_CHANNEL_BUFFER_H
+#define QIO_CHANNEL_BUFFER_H
 
 #include "io/channel.h"
 
@@ -57,4 +57,4 @@ struct QIOChannelBuffer {
 QIOChannelBuffer *
 qio_channel_buffer_new(size_t capacity);
 
-#endif /* QIO_CHANNEL_BUFFER_H__ */
+#endif /* QIO_CHANNEL_BUFFER_H */

diff --git a/include/io/channel-command.h b/include/io/channel-command.h
index cfc177e78691145d09f781ef785cc925e4dcf148..336d47fa5c878db28eff42fa29b082e4432ea098 100644 (file)
--- a/include/io/channel-command.h
+++ b/include/io/channel-command.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_CHANNEL_COMMAND_H__
-#define QIO_CHANNEL_COMMAND_H__
+#ifndef QIO_CHANNEL_COMMAND_H
+#define QIO_CHANNEL_COMMAND_H
 
 #include "io/channel.h"
 
@@ -88,4 +88,4 @@ qio_channel_command_new_spawn(const char *const argv[],
                               Error **errp);
 
 
-#endif /* QIO_CHANNEL_COMMAND_H__ */
+#endif /* QIO_CHANNEL_COMMAND_H */

diff --git a/include/io/channel-file.h b/include/io/channel-file.h
index 308e6d44d6e4070ad5b961a928f0a2e7b6b9f9be..d2462c2ed7e3b45572065ffc061cb9ab6f52743a 100644 (file)
--- a/include/io/channel-file.h
+++ b/include/io/channel-file.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_CHANNEL_FILE_H__
-#define QIO_CHANNEL_FILE_H__
+#ifndef QIO_CHANNEL_FILE_H
+#define QIO_CHANNEL_FILE_H
 
 #include "io/channel.h"
 
@@ -90,4 +90,4 @@ qio_channel_file_new_path(const char *path,
                           mode_t mode,
                           Error **errp);
 
-#endif /* QIO_CHANNEL_FILE_H__ */
+#endif /* QIO_CHANNEL_FILE_H */

diff --git a/include/io/channel-socket.h b/include/io/channel-socket.h
index 70d06b40d9d023fc4ee01a2c97bcf6cdb4d60a2f..711f8bf7ceeaf09427973ef30521587da6397f51 100644 (file)
--- a/include/io/channel-socket.h
+++ b/include/io/channel-socket.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_CHANNEL_SOCKET_H__
-#define QIO_CHANNEL_SOCKET_H__
+#ifndef QIO_CHANNEL_SOCKET_H
+#define QIO_CHANNEL_SOCKET_H
 
 #include "io/channel.h"
 #include "io/task.h"
@@ -248,4 +248,4 @@ qio_channel_socket_accept(QIOChannelSocket *ioc,
                           Error **errp);
 
 
-#endif /* QIO_CHANNEL_SOCKET_H__ */
+#endif /* QIO_CHANNEL_SOCKET_H */

diff --git a/include/io/channel-tls.h b/include/io/channel-tls.h
index 322eccbaae183054b86e9900bf01583e7e751537..d157eb10e89f20868720b3d646d61a594cb39952 100644 (file)
--- a/include/io/channel-tls.h
+++ b/include/io/channel-tls.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_CHANNEL_TLS_H__
-#define QIO_CHANNEL_TLS_H__
+#ifndef QIO_CHANNEL_TLS_H
+#define QIO_CHANNEL_TLS_H
 
 #include "io/channel.h"
 #include "io/task.h"
@@ -139,4 +139,4 @@ void qio_channel_tls_handshake(QIOChannelTLS *ioc,
 QCryptoTLSSession *
 qio_channel_tls_get_session(QIOChannelTLS *ioc);
 
-#endif /* QIO_CHANNEL_TLS_H__ */
+#endif /* QIO_CHANNEL_TLS_H */

diff --git a/include/io/channel-util.h b/include/io/channel-util.h
index c93af828846a1a3de99c144a24ee6f8163de6b36..c0b79cf6036bd30af6fc29a6f363fe1297fb7652 100644 (file)
--- a/include/io/channel-util.h
+++ b/include/io/channel-util.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_CHANNEL_UTIL_H__
-#define QIO_CHANNEL_UTIL_H__
+#ifndef QIO_CHANNEL_UTIL_H
+#define QIO_CHANNEL_UTIL_H
 
 #include "io/channel.h"
 
@@ -49,4 +49,4 @@
 QIOChannel *qio_channel_new_fd(int fd,
                                Error **errp);
 
-#endif /* QIO_CHANNEL_UTIL_H__ */
+#endif /* QIO_CHANNEL_UTIL_H */

diff --git a/include/io/channel-watch.h b/include/io/channel-watch.h
index 76d764223ea033826bde530dfdf78ca182f5644e..63bc4ae2d92a098135d9e97ee970c170be58d829 100644 (file)
--- a/include/io/channel-watch.h
+++ b/include/io/channel-watch.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_CHANNEL_WATCH_H__
-#define QIO_CHANNEL_WATCH_H__
+#ifndef QIO_CHANNEL_WATCH_H
+#define QIO_CHANNEL_WATCH_H
 
 #include "io/channel.h"
 
@@ -87,4 +87,4 @@ GSource *qio_channel_create_fd_pair_watch(QIOChannel *ioc,
                                           int fdwrite,
                                           GIOCondition condition);
 
-#endif /* QIO_CHANNEL_WATCH_H__ */
+#endif /* QIO_CHANNEL_WATCH_H */

diff --git a/include/io/channel-websock.h b/include/io/channel-websock.h
index 0dc21cc56de86f2f3efdf200ff2da0caa371b99b..3c9ff8472747af7e2aa122b489b757d9a487111d 100644 (file)
--- a/include/io/channel-websock.h
+++ b/include/io/channel-websock.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_CHANNEL_WEBSOCK_H__
-#define QIO_CHANNEL_WEBSOCK_H__
+#ifndef QIO_CHANNEL_WEBSOCK_H
+#define QIO_CHANNEL_WEBSOCK_H
 
 #include "io/channel.h"
 #include "qemu/buffer.h"
@@ -105,4 +105,4 @@ void qio_channel_websock_handshake(QIOChannelWebsock *ioc,
                                    gpointer opaque,
                                    GDestroyNotify destroy);
 
-#endif /* QIO_CHANNEL_WEBSOCK_H__ */
+#endif /* QIO_CHANNEL_WEBSOCK_H */

diff --git a/include/io/channel.h b/include/io/channel.h
index e52f059310b37885e6d029bb6d7a45650a7f136d..752e89f4dc206ac6e1b13d9865f2d85d8c92a3e2 100644 (file)
--- a/include/io/channel.h
+++ b/include/io/channel.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_CHANNEL_H__
-#define QIO_CHANNEL_H__
+#ifndef QIO_CHANNEL_H
+#define QIO_CHANNEL_H
 
 #include "qemu-common.h"
 #include "qom/object.h"
@@ -502,4 +502,4 @@ void qio_channel_yield(QIOChannel *ioc,
 void qio_channel_wait(QIOChannel *ioc,
                       GIOCondition condition);
 
-#endif /* QIO_CHANNEL_H__ */
+#endif /* QIO_CHANNEL_H */

diff --git a/include/io/task.h b/include/io/task.h
index df9499aa3a83b89a659d5ba3162b3884466d04b9..42028cb424f2f56df33254938e305e04ddcd8262 100644 (file)
--- a/include/io/task.h
+++ b/include/io/task.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QIO_TASK_H__
-#define QIO_TASK_H__
+#ifndef QIO_TASK_H
+#define QIO_TASK_H
 
 #include "qemu-common.h"
 #include "qom/object.h"
@@ -252,4 +252,4 @@ void qio_task_abort(QIOTask *task,
  */
 Object *qio_task_get_source(QIOTask *task);
 
-#endif /* QIO_TASK_H__ */
+#endif /* QIO_TASK_H */

diff --git a/include/libdecnumber/decContext.h b/include/libdecnumber/decContext.h
index 01365e2313011e77f09df40e4a7dcacc05f8d9b6..cea6e4279eca07b74bcd9ed6b494efbc3530dca9 100644 (file)
--- a/include/libdecnumber/decContext.h
+++ b/include/libdecnumber/decContext.h
@@ -50,8 +50,9 @@
 /*                                                                   */
 /* ------------------------------------------------------------------ */
 
-#if !defined(DECCONTEXT)
-  #define DECCONTEXT
+#ifndef DECCONTEXT_H
+#define DECCONTEXT_H
+
   #define DECCNAME     "decContext"                    /* Short name */
   #define DECCFULLNAME "Decimal Context Descriptor"   /* Verbose name */
   #define DECCAUTHOR   "Mike Cowlishaw"                      /* Who to blame */

diff --git a/include/libdecnumber/decNumber.h b/include/libdecnumber/decNumber.h
index 3f3a74af9ec345733af639f9a0787a64a28c2ee7..aa115fed07974a0555b0c18b9d7bd1f0ec0f08be 100644 (file)
--- a/include/libdecnumber/decNumber.h
+++ b/include/libdecnumber/decNumber.h
@@ -32,8 +32,9 @@
 /* Decimal Number arithmetic module header                           */
 /* ------------------------------------------------------------------ */
 
-#if !defined(DECNUMBER)
-  #define DECNUMBER
+#ifndef DECNUMBER_H
+#define DECNUMBER_H
+
   #define DECNAME     "decNumber"                      /* Short name */
   #define DECFULLNAME "Decimal Number Module"        /* Verbose name */
   #define DECAUTHOR   "Mike Cowlishaw"               /* Who to blame */

diff --git a/include/libdecnumber/dpd/decimal128.h b/include/libdecnumber/dpd/decimal128.h
index 13d1ae81f866c12ee3ae05f90ac0cf85767257a9..aff261e5566d597a7f493a6263b420ac8c3b62eb 100644 (file)
--- a/include/libdecnumber/dpd/decimal128.h
+++ b/include/libdecnumber/dpd/decimal128.h
@@ -32,8 +32,9 @@
 /* Decimal 128-bit format module header                                      */
 /* ------------------------------------------------------------------ */
 
-#if !defined(DECIMAL128)
-  #define DECIMAL128
+#ifndef DECIMAL128_H
+#define DECIMAL128_H
+
   #define DEC128NAME    "decimal128"                 /* Short name   */
   #define DEC128FULLNAME "Decimal 128-bit Number"     /* Verbose name */
   #define DEC128AUTHOR  "Mike Cowlishaw"             /* Who to blame */

diff --git a/include/libdecnumber/dpd/decimal32.h b/include/libdecnumber/dpd/decimal32.h
index 03c80dbbaa60b152490650526314b0983250c305..6cb9e436204a9dd53dbf5e0b44ce8f98e03b4cf2 100644 (file)
--- a/include/libdecnumber/dpd/decimal32.h
+++ b/include/libdecnumber/dpd/decimal32.h
@@ -32,8 +32,9 @@
 /* Decimal 32-bit format module header                               */
 /* ------------------------------------------------------------------ */
 
-#if !defined(DECIMAL32)
-  #define DECIMAL32
+#ifndef DECIMAL32_H
+#define DECIMAL32_H
+
   #define DEC32NAME    "decimal32"                   /* Short name   */
   #define DEC32FULLNAME "Decimal 32-bit Number"              /* Verbose name */
   #define DEC32AUTHOR  "Mike Cowlishaw"              /* Who to blame */

diff --git a/include/libdecnumber/dpd/decimal64.h b/include/libdecnumber/dpd/decimal64.h
index a375faf4d2330adeba49144843bf133dd35b6258..f29e57064d7e46043650378195734cfaa7acf9bf 100644 (file)
--- a/include/libdecnumber/dpd/decimal64.h
+++ b/include/libdecnumber/dpd/decimal64.h
@@ -32,8 +32,9 @@
 /* Decimal 64-bit format module header                               */
 /* ------------------------------------------------------------------ */
 
-#if !defined(DECIMAL64)
-  #define DECIMAL64
+#ifndef DECIMAL64_H
+#define DECIMAL64_H
+
   #define DEC64NAME    "decimal64"                   /* Short name   */
   #define DEC64FULLNAME "Decimal 64-bit Number"              /* Verbose name */
   #define DEC64AUTHOR  "Mike Cowlishaw"              /* Who to blame */

diff --git a/include/net/vhost-user.h b/include/net/vhost-user.h
index efae35d57e40b35a341c9cd3dccdbee8c0c25711..5bcd8a6285986f8922b55173308f37eaa120b014 100644 (file)
--- a/include/net/vhost-user.h
+++ b/include/net/vhost-user.h
@@ -8,11 +8,11 @@
  *
  */
 
-#ifndef VHOST_USER_H_
-#define VHOST_USER_H_
+#ifndef VHOST_USER_H
+#define VHOST_USER_H
 
 struct vhost_net;
 struct vhost_net *vhost_user_get_vhost_net(NetClientState *nc);
 uint64_t vhost_user_get_acked_features(NetClientState *nc);
 
-#endif /* VHOST_USER_H_ */
+#endif /* VHOST_USER_H */

diff --git a/include/qemu/acl.h b/include/qemu/acl.h
index 4a403b71cd5ce9e37d733b7d9eadb792975846df..7c44119a47e23f4ee5ea143018bc09cf4078659f 100644 (file)
--- a/include/qemu/acl.h
+++ b/include/qemu/acl.h
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __QEMU_ACL_H__
-#define __QEMU_ACL_H__
+#ifndef QEMU_ACL_H
+#define QEMU_ACL_H
 
 #include "qemu/queue.h"
 
@@ -63,4 +63,4 @@ int qemu_acl_insert(qemu_acl *acl,
 int qemu_acl_remove(qemu_acl *acl,
                    const char *match);
 
-#endif /* __QEMU_ACL_H__ */
+#endif /* QEMU_ACL_H */

diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h
index 7a590969b59ffd323c2f734b8adce9fa7efd0281..7e13fca351d1caa24356eb3d8e391ecf70e5bce3 100644 (file)
--- a/include/qemu/atomic.h
+++ b/include/qemu/atomic.h
@@ -12,10 +12,8 @@
  * atomic primitive is meant to provide.
  */
 
-#ifndef __QEMU_ATOMIC_H
-#define __QEMU_ATOMIC_H 1
-
-
+#ifndef QEMU_ATOMIC_H
+#define QEMU_ATOMIC_H
 
 /* Compiler barrier */
 #define barrier()   ({ asm volatile("" ::: "memory"); (void)0; })
@@ -366,4 +364,4 @@
 #define atomic_or(ptr, n)      ((void) __sync_fetch_and_or(ptr, n))
 
 #endif /* __ATOMIC_RELAXED */
-#endif /* __QEMU_ATOMIC_H */
+#endif /* QEMU_ATOMIC_H */

diff --git a/include/qemu/base64.h b/include/qemu/base64.h
index 793708dc3a5cd7fc2c0759d13d5d8a92a4cb5873..815d85267d81aa65758d6fe1e06dd738bd5f0947 100644 (file)
--- a/include/qemu/base64.h
+++ b/include/qemu/base64.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QEMU_BASE64_H__
-#define QEMU_BASE64_H__
+#ifndef QEMU_BASE64_H
+#define QEMU_BASE64_H
 
 #include "qemu-common.h"
 
@@ -55,4 +55,4 @@ uint8_t *qbase64_decode(const char *input,
                         Error **errp);
 
 
-#endif /* QEMU_BUFFER_H__ */
+#endif /* QEMU_BASE64_H */

diff --git a/include/qemu/buffer.h b/include/qemu/buffer.h
index dead9b77e1962818a08eb302a3d39fbbea9d4bd4..b2ead1f051fc22be2ecf15e2974800fe85339d12 100644 (file)
--- a/include/qemu/buffer.h
+++ b/include/qemu/buffer.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QEMU_BUFFER_H__
-#define QEMU_BUFFER_H__
+#ifndef QEMU_BUFFER_H
+#define QEMU_BUFFER_H
 
 #include "qemu-common.h"
 
@@ -158,4 +158,4 @@ void buffer_move_empty(Buffer *to, Buffer *from);
  */
 void buffer_move(Buffer *to, Buffer *from);
 
-#endif /* QEMU_BUFFER_H__ */
+#endif /* QEMU_BUFFER_H */

diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h
index 0899b2f01e97ad30d621f60c20f89b8c26f2af8a..933c024ac5a5494852795a2f277680f6ea9365a2 100644 (file)
--- a/include/qemu/mmap-alloc.h
+++ b/include/qemu/mmap-alloc.h
@@ -1,5 +1,5 @@
-#ifndef QEMU_MMAP_ALLOC
-#define QEMU_MMAP_ALLOC
+#ifndef QEMU_MMAP_ALLOC_H
+#define QEMU_MMAP_ALLOC_H
 
 #include "qemu-common.h"
 

diff --git a/include/qemu/queue.h b/include/qemu/queue.h
index f781aa20a83ee1d05f01fcaf87cfb1039c4ff0eb..c2b6c8149ddf8e19ad573bd11b97bdf842b544d2 100644 (file)
--- a/include/qemu/queue.h
+++ b/include/qemu/queue.h
@@ -37,8 +37,8 @@
  *      @(#)queue.h     8.5 (Berkeley) 8/20/94
  */
 
-#ifndef QEMU_SYS_QUEUE_H_
-#define QEMU_SYS_QUEUE_H_
+#ifndef QEMU_SYS_QUEUE_H
+#define QEMU_SYS_QUEUE_H
 
 /*
  * This file defines four types of data structures: singly-linked lists,
@@ -436,4 +436,4 @@ struct {                                                                \
 #define QTAILQ_PREV(elm, headname, field) \
         (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
 
-#endif  /* !QEMU_SYS_QUEUE_H_ */
+#endif /* QEMU_SYS_QUEUE_H */

diff --git a/include/qemu/thread-posix.h b/include/qemu/thread-posix.h
index 24f84908b0092ac6ca5b3da7608f54a52d48aa7a..aa03567e5e0da4e86676331b376262bffee0bdbc 100644 (file)
--- a/include/qemu/thread-posix.h
+++ b/include/qemu/thread-posix.h
@@ -1,5 +1,5 @@
-#ifndef __QEMU_THREAD_POSIX_H
-#define __QEMU_THREAD_POSIX_H 1
+#ifndef QEMU_THREAD_POSIX_H
+#define QEMU_THREAD_POSIX_H
 
 #include <pthread.h>
 #include <semaphore.h>

diff --git a/include/qemu/thread-win32.h b/include/qemu/thread-win32.h
index 1417d38b473e923dc717cb6cabd301da8f83a95e..c7ce8dcd45981926566306905825d64a3129ca22 100644 (file)
--- a/include/qemu/thread-win32.h
+++ b/include/qemu/thread-win32.h
@@ -1,5 +1,5 @@
-#ifndef __QEMU_THREAD_WIN32_H
-#define __QEMU_THREAD_WIN32_H 1
+#ifndef QEMU_THREAD_WIN32_H
+#define QEMU_THREAD_WIN32_H
 
 #include <windows.h>
 

diff --git a/include/qemu/thread.h b/include/qemu/thread.h
index c5d71cf8fc5a7db8dfbc69d8eedc42e6568fe723..31237e93ee1ddfc670ed23fa476a42561277c129 100644 (file)
--- a/include/qemu/thread.h
+++ b/include/qemu/thread.h
@@ -1,5 +1,5 @@
-#ifndef __QEMU_THREAD_H
-#define __QEMU_THREAD_H 1
+#ifndef QEMU_THREAD_H
+#define QEMU_THREAD_H
 
 #include "qemu/processor.h"
 #include "qemu/atomic.h"

diff --git a/include/sysemu/balloon.h b/include/sysemu/balloon.h
index 3f976b49e7bf850e02871f59e6540795b730db98..af49e19c7879f80d696b4d857db27d1f3dc117dd 100644 (file)
--- a/include/sysemu/balloon.h
+++ b/include/sysemu/balloon.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef _QEMU_BALLOON_H
-#define _QEMU_BALLOON_H
+#ifndef QEMU_BALLOON_H
+#define QEMU_BALLOON_H
 
 #include "qapi-types.h"
 

diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h
index 705650aad47c1ffdb6c77a398a4bf4cfcbe87465..e22e5bec9c3f205a95a7535399d99825d8df1636 100644 (file)
--- a/include/sysemu/device_tree.h
+++ b/include/sysemu/device_tree.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef __DEVICE_TREE_H__
-#define __DEVICE_TREE_H__
+#ifndef DEVICE_TREE_H
+#define DEVICE_TREE_H
 
 void *create_device_tree(int *sizep);
 void *load_device_tree(const char *filename_path, int *sizep);
@@ -168,4 +168,4 @@ int qemu_fdt_setprop_sized_cells_from_array(void *fdt,
 #define FDT_PCI_RANGE_IOPORT               0x01000000
 #define FDT_PCI_RANGE_CONFIG               0x00000000
 
-#endif /* __DEVICE_TREE_H__ */
+#endif /* DEVICE_TREE_H */

diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h
index 7f6f6549d653e0731bd8ecd9103b9187d711209e..d459c5da02c699098e08ca985ecd22dbc2378200 100644 (file)
--- a/linux-user/arm/nwfpe/fpa11.h
+++ b/linux-user/arm/nwfpe/fpa11.h
@@ -18,8 +18,8 @@
     along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __FPA11_H__
-#define __FPA11_H__
+#ifndef FPA11_H
+#define FPA11_H
 
 #include "cpu.h"
 

diff --git a/linux-user/arm/nwfpe/fpopcode.h b/linux-user/arm/nwfpe/fpopcode.h
index 1b1137f3c85971f7e0d32347bdb27175801e7edf..06cd909850100d6fd87efc9a0d6cf472f1678a1f 100644 (file)
--- a/linux-user/arm/nwfpe/fpopcode.h
+++ b/linux-user/arm/nwfpe/fpopcode.h
@@ -18,8 +18,8 @@
     along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __FPOPCODE_H__
-#define __FPOPCODE_H__
+#ifndef FPOPCODE_H
+#define FPOPCODE_H
 
 /*
 ARM Floating Point Instruction Classes

diff --git a/linux-user/arm/nwfpe/fpsr.h b/linux-user/arm/nwfpe/fpsr.h
index 859dcd5898edcaf3d1da602790f56655fd8e057b..8c978f0b8ff31f9d7e05e084bfc78022f27fe9d1 100644 (file)
--- a/linux-user/arm/nwfpe/fpsr.h
+++ b/linux-user/arm/nwfpe/fpsr.h
@@ -18,8 +18,8 @@
     along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __FPSR_H__
-#define __FPSR_H__
+#ifndef FPSR_H
+#define FPSR_H
 
 /*
 The FPSR is a 32 bit register consisting of 4 parts, each exactly

diff --git a/linux-user/linux_loop.h b/linux-user/linux_loop.h
index 8974caa9d0321380d61d3a8c0f6d28d0e066c5b3..1f52403814602f7f7bc21473a97423c93372d762 100644 (file)
--- a/linux-user/linux_loop.h
+++ b/linux-user/linux_loop.h
@@ -1,6 +1,7 @@
 /* Copied from 2.6.25 kernel headers to avoid problems on older hosts.  */
-#ifndef _LINUX_LOOP_H
-#define _LINUX_LOOP_H
+
+#ifndef LINUX_LOOP_H
+#define LINUX_LOOP_H
 
 /*
  * include/linux/loop.h

diff --git a/linux-user/tilegx/syscall_nr.h b/linux-user/tilegx/syscall_nr.h
index 87fb72c5541fdd855c0dd6386339f2fd2493312d..8e30cd1ae964cb93325e322f2e5fc998d1b451bd 100644 (file)
--- a/linux-user/tilegx/syscall_nr.h
+++ b/linux-user/tilegx/syscall_nr.h
@@ -1,5 +1,5 @@
-#ifndef TILEGX_SYSCALL_NR
-#define TILEGX_SYSCALL_NR
+#ifndef TILEGX_SYSCALL_NR_H
+#define TILEGX_SYSCALL_NR_H
 
 /*
  * Copy from linux kernel asm-generic/unistd.h, which tilegx uses.

diff --git a/qemu-options.h b/qemu-options.h
index 89a009ee967d0a181f1c2ebea9921d890d49a543..b4ee63cd6011a3d376a6dc85cae9dbaef5056a31 100644 (file)
--- a/qemu-options.h
+++ b/qemu-options.h
@@ -25,8 +25,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef _QEMU_OPTIONS_H_
-#define _QEMU_OPTIONS_H_
+#ifndef QEMU_OPTIONS_H
+#define QEMU_OPTIONS_H
 
 enum {
 #define QEMU_OPTIONS_GENERATE_ENUM

diff --git a/slirp/if.h b/slirp/if.h
index c7a5c5724db11de1fc421e4778b582dfa8f78a46..69569c10df61fbfdec3e66d19cacff3f18bc710c 100644 (file)
--- a/slirp/if.h
+++ b/slirp/if.h
@@ -5,8 +5,8 @@
  * terms and conditions of the copyright.
  */
 
-#ifndef _IF_H_
-#define _IF_H_
+#ifndef IF_H
+#define IF_H
 
 #define IF_COMPRESS    0x01    /* We want compression */
 #define IF_NOCOMPRESS  0x02    /* Do not do compression */

diff --git a/slirp/ip.h b/slirp/ip.h
index e2ee5e304cc520b795fc8195b0c029a13a6f5aee..1df67233578b2e19a7b9a05da2e478b3be0d3bee 100644 (file)
--- a/slirp/ip.h
+++ b/slirp/ip.h
@@ -30,8 +30,8 @@
  * ip.h,v 1.3 1994/08/21 05:27:30 paul Exp
  */
 
-#ifndef _IP_H_
-#define _IP_H_
+#ifndef IP_H
+#define IP_H
 
 #ifdef HOST_WORDS_BIGENDIAN
 # undef NTOHL

diff --git a/slirp/ip6.h b/slirp/ip6.h
index da23de66f1d869fbaf215a55f357e33ee69b7fbb..0908855f0f1f57f57c31fc14208d07520e350a4b 100644 (file)
--- a/slirp/ip6.h
+++ b/slirp/ip6.h
@@ -3,8 +3,8 @@
  * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
  */
 
-#ifndef SLIRP_IP6_H_
-#define SLIRP_IP6_H_
+#ifndef SLIRP_IP6_H
+#define SLIRP_IP6_H
 
 #include "net/eth.h"
 

diff --git a/slirp/ip_icmp.h b/slirp/ip_icmp.h
index 846761d08e6e62f221befe432228dd44615d6f28..d88ab34c1ba6282c116a7a986b1cc63833bc07a5 100644 (file)
--- a/slirp/ip_icmp.h
+++ b/slirp/ip_icmp.h
@@ -30,8 +30,8 @@
  * ip_icmp.h,v 1.4 1995/05/30 08:09:43 rgrimes Exp
  */
 
-#ifndef _NETINET_IP_ICMP_H_
-#define _NETINET_IP_ICMP_H_
+#ifndef NETINET_IP_ICMP_H
+#define NETINET_IP_ICMP_H
 
 /*
  * Interface Control Message Protocol Definitions.

diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index b6fc5842190509c04375cd204191f2cc35454408..f90f0f524c8c06e6056fdedf3ef009f7ba3b0e83 100644 (file)
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -1,5 +1,5 @@
-#ifndef _LIBSLIRP_H
-#define _LIBSLIRP_H
+#ifndef LIBSLIRP_H
+#define LIBSLIRP_H
 
 #include "qemu-common.h"
 

diff --git a/slirp/mbuf.h b/slirp/mbuf.h
index 36fb8140974552f342d9474f67d9274535b77027..893601ff9dc63c2d70dfa064c09a5ca405dce9cf 100644 (file)
--- a/slirp/mbuf.h
+++ b/slirp/mbuf.h
@@ -30,8 +30,8 @@
  * mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp
  */
 
-#ifndef _MBUF_H_
-#define _MBUF_H_
+#ifndef MBUF_H
+#define MBUF_H
 
 #define MINCSIZE 4096  /* Amount to increase mbuf if too small */
 

diff --git a/slirp/misc.h b/slirp/misc.h
index 0d0c059e6b9c87676e43e41e2bb726df139e63aa..5211bbd30a3c3f97103e55428074121a3c360a3e 100644 (file)
--- a/slirp/misc.h
+++ b/slirp/misc.h
@@ -5,8 +5,8 @@
  * terms and conditions of the copyright.
  */
 
-#ifndef _MISC_H_
-#define _MISC_H_
+#ifndef MISC_H
+#define MISC_H
 
 struct ex_list {
        int ex_pty;                     /* Do we want a pty? */

diff --git a/slirp/sbuf.h b/slirp/sbuf.h
index 4f22e7c388da107e49cf15cb21512ba088bd80a1..efcec39a6b04a07ed138c04015345da92cb7c554 100644 (file)
--- a/slirp/sbuf.h
+++ b/slirp/sbuf.h
@@ -5,8 +5,8 @@
  * terms and conditions of the copyright.
  */
 
-#ifndef _SBUF_H_
-#define _SBUF_H_
+#ifndef SBUF_H
+#define SBUF_H
 
 #define sbflush(sb) sbdrop((sb),(sb)->sb_cc)
 #define sbspace(sb) ((sb)->sb_datalen - (sb)->sb_cc)

diff --git a/slirp/socket.h b/slirp/socket.h
index b602e69b953ac34c3c95b19f858db1b5653d4000..8feed2aea45b9039e78730e5e37fe918bef64bf8 100644 (file)
--- a/slirp/socket.h
+++ b/slirp/socket.h
@@ -5,8 +5,8 @@
  * terms and conditions of the copyright.
  */
 
-#ifndef _SLIRP_SOCKET_H_
-#define _SLIRP_SOCKET_H_
+#ifndef SLIRP_SOCKET_H
+#define SLIRP_SOCKET_H
 
 #define SO_EXPIRE 240000
 #define SO_EXPIREFAST 10000
@@ -158,4 +158,4 @@ void sotranslate_in(struct socket *, struct sockaddr_storage *);
 void sotranslate_accept(struct socket *);
 
 
-#endif /* _SOCKET_H_ */
+#endif /* SLIRP_SOCKET_H */

diff --git a/slirp/tcp.h b/slirp/tcp.h
index 61befcde57c4c654d38de7dd4da1d2207ec0a9a9..174d3d960c0dec107f06851176f899a902971620 100644 (file)
--- a/slirp/tcp.h
+++ b/slirp/tcp.h
@@ -30,8 +30,8 @@
  * tcp.h,v 1.3 1994/08/21 05:27:34 paul Exp
  */
 
-#ifndef _TCP_H_
-#define _TCP_H_
+#ifndef TCP_H
+#define TCP_H
 
 typedef        uint32_t tcp_seq;
 

diff --git a/slirp/tcp_timer.h b/slirp/tcp_timer.h
index ff17914f4198d0bfbb8f03dae4fb3a89717487ae..b25b3911d7fa1a19839a4314f7bfc3ed442cd2de 100644 (file)
--- a/slirp/tcp_timer.h
+++ b/slirp/tcp_timer.h
@@ -30,8 +30,8 @@
  * tcp_timer.h,v 1.4 1994/08/21 05:27:38 paul Exp
  */
 
-#ifndef _TCP_TIMER_H_
-#define _TCP_TIMER_H_
+#ifndef TCP_TIMER_H
+#define TCP_TIMER_H
 
 /*
  * Definitions of the TCP timers.  These timers are counted

diff --git a/slirp/tcp_var.h b/slirp/tcp_var.h
index 004193fb6d0073433c93764aa845ba3f2ba45071..0f8f187c5cba8134344093b6b40b5b69f7629f8e 100644 (file)
--- a/slirp/tcp_var.h
+++ b/slirp/tcp_var.h
@@ -30,8 +30,8 @@
  * tcp_var.h,v 1.3 1994/08/21 05:27:39 paul Exp
  */
 
-#ifndef _TCP_VAR_H_
-#define _TCP_VAR_H_
+#ifndef TCP_VAR_H
+#define TCP_VAR_H
 
 #include "tcpip.h"
 #include "tcp_timer.h"

diff --git a/slirp/tcpip.h b/slirp/tcpip.h
index 124b4a9f623f7d298b09b3ea6e863a842f9d7744..7bdb971c5d692fc0223f41387370e99d8036d3f4 100644 (file)
--- a/slirp/tcpip.h
+++ b/slirp/tcpip.h
@@ -30,8 +30,8 @@
  * tcpip.h,v 1.3 1994/08/21 05:27:40 paul Exp
  */
 
-#ifndef _TCPIP_H_
-#define _TCPIP_H_
+#ifndef TCPIP_H
+#define TCPIP_H
 
 /*
  * Tcp+ip header, after ip options removed.

diff --git a/slirp/udp.h b/slirp/udp.h
index 10cc7809b1e7477a02bd84ece8427b936e36bb3c..be657cf9229b3fb0fdea65370cc26627350a6880 100644 (file)
--- a/slirp/udp.h
+++ b/slirp/udp.h
@@ -30,8 +30,8 @@
  * udp.h,v 1.3 1994/08/21 05:27:41 paul Exp
  */
 
-#ifndef _UDP_H_
-#define _UDP_H_
+#ifndef UDP_H
+#define UDP_H
 
 #define UDP_TTL 0x60
 #define UDP_UDPDATALEN 16192

diff --git a/target-i386/svm.h b/target-i386/svm.h
index 04193ed60f2b9a31bdf6f4a6a15cf8b1a6681ee3..922c8fd39cc243c394602a16c66970dec8ae43e4 100644 (file)
--- a/target-i386/svm.h
+++ b/target-i386/svm.h
@@ -1,5 +1,5 @@
-#ifndef __SVM_H
-#define __SVM_H
+#ifndef SVM_H
+#define SVM_H
 
 #define TLB_CONTROL_DO_NOTHING 0
 #define TLB_CONTROL_FLUSH_ALL_ASID 1

diff --git a/target-mips/kvm_mips.h b/target-mips/kvm_mips.h
index 54f59656efb3cefe430736aa5bd6ab0e7524472b..ae957f37f03fd5807ae99e0eb93415aa3b308580 100644 (file)
--- a/target-mips/kvm_mips.h
+++ b/target-mips/kvm_mips.h
@@ -9,8 +9,8 @@
  * Authors: Sanjay Lal <sanjayl@kymasys.com>
 */
 
-#ifndef __KVM_MIPS_H__
-#define __KVM_MIPS_H__
+#ifndef KVM_MIPS_H
+#define KVM_MIPS_H
 
 /**
  * kvm_mips_reset_vcpu:
@@ -23,4 +23,4 @@ void kvm_mips_reset_vcpu(MIPSCPU *cpu);
 int kvm_mips_set_interrupt(MIPSCPU *cpu, int irq, int level);
 int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level);
 
-#endif /* __KVM_MIPS_H__ */
+#endif /* KVM_MIPS_H */

diff --git a/target-mips/mips-defs.h b/target-mips/mips-defs.h
index 53b185ebd3851e995aeea0229934d9985ee170dd..047554ee4503847626b748bed2be9faac44d2abc 100644 (file)
--- a/target-mips/mips-defs.h
+++ b/target-mips/mips-defs.h
@@ -1,5 +1,5 @@
-#if !defined (__QEMU_MIPS_DEFS_H__)
-#define __QEMU_MIPS_DEFS_H__
+#ifndef QEMU_MIPS_DEFS_H
+#define QEMU_MIPS_DEFS_H
 
 /* If we want to use host float regs... */
 //#define USE_HOST_FLOAT_REGS
@@ -88,4 +88,4 @@
    Note that we still maintain Count/Compare to match the host clock. */
 //#define MIPS_STRICT_STANDARD 1
 
-#endif /* !defined (__QEMU_MIPS_DEFS_H__) */
+#endif /* QEMU_MIPS_DEFS_H */

diff --git a/target-ppc/helper_regs.h b/target-ppc/helper_regs.h
index 8fdfa5c7e6ab987e5c199743c35c088d72f53716..8d388289363694301d8cee0e4574b7ff8f3ba78e 100644 (file)
--- a/target-ppc/helper_regs.h
+++ b/target-ppc/helper_regs.h
@@ -17,8 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined(__HELPER_REGS_H__)
-#define __HELPER_REGS_H__
+#ifndef HELPER_REGS_H
+#define HELPER_REGS_H
 
 /* Swap temporary saved registers with GPRs */
 static inline void hreg_swap_gpr_tgpr(CPUPPCState *env)
@@ -168,4 +168,4 @@ static inline void check_tlb_flush(CPUPPCState *env)
 static inline void check_tlb_flush(CPUPPCState *env) { }
 #endif
 
-#endif /* !defined(__HELPER_REGS_H__) */
+#endif /* HELPER_REGS_H */

diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
index 20bfb59b1af68a04e14fe81e4026051047601c57..5461d1082c1a7ca6f81f9d274dd18bf10362b117 100644 (file)
--- a/target-ppc/kvm_ppc.h
+++ b/target-ppc/kvm_ppc.h
@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef __KVM_PPC_H__
-#define __KVM_PPC_H__
+#ifndef KVM_PPC_H
+#define KVM_PPC_H
 
 #define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU
 
@@ -316,4 +316,4 @@ static inline void kvmppc_icbi_range(PowerPCCPU *cpu, uint8_t *addr, int len)
 #define KVM_INTERRUPT_SET_LEVEL -3
 #endif
 
-#endif /* __KVM_PPC_H__ */
+#endif /* KVM_PPC_H */

diff --git a/target-ppc/mmu-hash32.h b/target-ppc/mmu-hash32.h
index aaceacd4d73c04dd7e4cbb4bfeaf4be8d795a42c..5b9fb08d1af57f9fa8c00885f2f0483c90123cd9 100644 (file)
--- a/target-ppc/mmu-hash32.h
+++ b/target-ppc/mmu-hash32.h
@@ -1,5 +1,5 @@
-#if !defined (__MMU_HASH32_H__)
-#define __MMU_HASH32_H__
+#ifndef MMU_HASH32_H
+#define MMU_HASH32_H
 
 #ifndef CONFIG_USER_ONLY
 
@@ -109,4 +109,4 @@ typedef struct {
 
 #endif /* CONFIG_USER_ONLY */
 
-#endif /* __MMU_HASH32_H__ */
+#endif /* MMU_HASH32_H */

diff --git a/target-ppc/mmu-hash64.h b/target-ppc/mmu-hash64.h
index 3a7476b30a4cdef59a78ba9fac17da9ea01d4dbf..db265e30b2eb17186a907fb1ad95df5f5563109c 100644 (file)
--- a/target-ppc/mmu-hash64.h
+++ b/target-ppc/mmu-hash64.h
@@ -1,5 +1,5 @@
-#if !defined (__MMU_HASH64_H__)
-#define __MMU_HASH64_H__
+#ifndef MMU_HASH64_H
+#define MMU_HASH64_H
 
 #ifndef CONFIG_USER_ONLY
 
@@ -134,4 +134,4 @@ typedef struct {
 
 #endif /* CONFIG_USER_ONLY */
 
-#endif /* !defined (__MMU_HASH64_H__) */
+#endif /* MMU_HASH64_H */

diff --git a/target-tricore/tricore-defs.h b/target-tricore/tricore-defs.h
index 4350b030440629bbe0e6abc020ad84850c606556..40abfaac140ccfeb9c869b7973daa2316a87606d 100644 (file)
--- a/target-tricore/tricore-defs.h
+++ b/target-tricore/tricore-defs.h
@@ -15,8 +15,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined(__QEMU_TRICORE_DEFS_H__)
-#define __QEMU_TRICORE_DEFS_H__
+#ifndef QEMU_TRICORE_DEFS_H
+#define QEMU_TRICORE_DEFS_H
 
 #define TARGET_PAGE_BITS 14
 #define TARGET_LONG_BITS 32
@@ -25,4 +25,4 @@
 
 #define TRICORE_TLB_MAX 128
 
-#endif /* __QEMU_TRICORE_DEFS_H__ */
+#endif /* QEMU_TRICORE_DEFS_H */

diff --git a/tests/boot-sector.h b/tests/boot-sector.h
index 38be0290e32cd77a1582a2b76d8ac1d6baecf969..f64b477aa33c2b8fb7949f3d8b76e2bd940b44fd 100644 (file)
--- a/tests/boot-sector.h
+++ b/tests/boot-sector.h
@@ -11,8 +11,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef TEST_BOOT_SECTOR
-#define TEST_BOOT_SECTOR
+#ifndef TEST_BOOT_SECTOR_H
+#define TEST_BOOT_SECTOR_H
 
 /* Create boot disk file.  */
 int boot_sector_init(const char *fname);
@@ -23,4 +23,4 @@ void boot_sector_test(void);
 /* unlink boot disk file.  */
 void boot_sector_cleanup(const char *fname);
 
-#endif /* TEST_BOOT_SECTOR */
+#endif /* TEST_BOOT_SECTOR_H */

diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index 71dd7a6e5a82eb4851aef33dff17b71fe255d0e8..c69fb5ae90d2b4550ff00d0656a6214739883851 100644 (file)
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -1,5 +1,5 @@
-#ifndef __libqos_ahci_h
-#define __libqos_ahci_h
+#ifndef LIBQOS_AHCI_H
+#define LIBQOS_AHCI_H
 
 /*
  * AHCI qtest library functions and definitions

diff --git a/tests/libqos/libqos-pc.h b/tests/libqos/libqos-pc.h
index b1820c57398038a8c6a1dad19619d8539ac3c51d..a0e4c45516fbe32a0182347565d0d279673a81d4 100644 (file)
--- a/tests/libqos/libqos-pc.h
+++ b/tests/libqos/libqos-pc.h
@@ -1,5 +1,5 @@
-#ifndef __libqos_pc_h
-#define __libqos_pc_h
+#ifndef LIBQOS_PC_H
+#define LIBQOS_PC_H
 
 #include "libqos/libqos.h"
 

diff --git a/tests/libqos/libqos.h b/tests/libqos/libqos.h
index ca14d2e9fe53b42e5f1db31145c3832e3b89b4c2..604980d1250430c687a268077d8bfe59562581bc 100644 (file)
--- a/tests/libqos/libqos.h
+++ b/tests/libqos/libqos.h
@@ -1,5 +1,5 @@
-#ifndef __libqos_h
-#define __libqos_h
+#ifndef LIBQOS_H
+#define LIBQOS_H
 
 #include "libqtest.h"
 #include "libqos/pci.h"

diff --git a/ui/keymaps.h b/ui/keymaps.h
index a7600d5751d0305a7acb062fcc253540a889233c..47d061343eb717a8b58f929fa5dc994efdd91a16 100644 (file)
--- a/ui/keymaps.h
+++ b/ui/keymaps.h
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __QEMU_KEYMAPS_H__
-#define __QEMU_KEYMAPS_H__
+#ifndef QEMU_KEYMAPS_H
+#define QEMU_KEYMAPS_H
 
 #include "qemu-common.h"
 
@@ -74,4 +74,4 @@ int keysym2scancode(void *kbd_layout, int keysym);
 int keycode_is_keypad(void *kbd_layout, int keycode);
 int keysym_is_numlock(void *kbd_layout, int keysym);
 
-#endif /* __QEMU_KEYMAPS_H__ */
+#endif /* QEMU_KEYMAPS_H */

diff --git a/ui/sdl_zoom.h b/ui/sdl_zoom.h
index 74955bc944faaa2c1c9799db0e798acb96209691..39696ddb08224524bc2551548a158b387cf0f40b 100644 (file)
--- a/ui/sdl_zoom.h
+++ b/ui/sdl_zoom.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef SDL_zoom_h
-#define SDL_zoom_h
+#ifndef SDL_ZOOM_H
+#define SDL_ZOOM_H
 
 #include <SDL.h>
 
@@ -22,4 +22,4 @@
 int sdl_zoom_blit(SDL_Surface *src_sfc, SDL_Surface *dst_sfc,
                   int smooth, SDL_Rect *src_rect);
 
-#endif /* SDL_zoom_h */
+#endif /* SDL_ZOOM_H */

diff --git a/ui/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h
index 3f59da67ebd9aa28bc25a8566105583f1d605217..cb42745a6b63f44a88f639416ab37f9f3e0c0948 100644 (file)
--- a/ui/vnc-auth-sasl.h
+++ b/ui/vnc-auth-sasl.h
@@ -22,10 +22,8 @@
  * THE SOFTWARE.
  */
 
-
-#ifndef __QEMU_VNC_AUTH_SASL_H__
-#define __QEMU_VNC_AUTH_SASL_H__
-
+#ifndef QEMU_VNC_AUTH_SASL_H
+#define QEMU_VNC_AUTH_SASL_H
 
 #include <sasl/sasl.h>
 
@@ -71,5 +69,4 @@ long vnc_client_write_sasl(VncState *vs);
 
 void start_auth_sasl(VncState *vs);
 
-#endif /* __QEMU_VNC_AUTH_SASL_H__ */
-
+#endif /* QEMU_VNC_AUTH_SASL_H */

diff --git a/ui/vnc-auth-vencrypt.h b/ui/vnc-auth-vencrypt.h
index 9f674c5173f856625967688c7ad11ce57b4bcc2f..1e35406664af145c934b9ca793ad3eab919c7414 100644 (file)
--- a/ui/vnc-auth-vencrypt.h
+++ b/ui/vnc-auth-vencrypt.h
@@ -24,10 +24,9 @@
  * THE SOFTWARE.
  */
 
-
-#ifndef __QEMU_VNC_AUTH_VENCRYPT_H__
-#define __QEMU_VNC_AUTH_VENCRYPT_H__
+#ifndef QEMU_VNC_AUTH_VENCRYPT_H
+#define QEMU_VNC_AUTH_VENCRYPT_H
 
 void start_auth_vencrypt(VncState *vs);
 
-#endif /* __QEMU_VNC_AUTH_VENCRYPT_H__ */
+#endif /* QEMU_VNC_AUTH_VENCRYPT_H */

diff --git a/ui/vnc-ws.h b/ui/vnc-ws.h
index 652b6fc3901650d4ddca8967fad138905e1ab0bc..396cacfcb0bf7a016a1e8b8d7f803c1d7e5faafd 100644 (file)
--- a/ui/vnc-ws.h
+++ b/ui/vnc-ws.h
@@ -18,8 +18,8 @@
  * along with this software; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_UI_VNC_WS_H
-#define __QEMU_UI_VNC_WS_H
+#ifndef QEMU_UI_VNC_WS_H
+#define QEMU_UI_VNC_WS_H
 
 gboolean vncws_tls_handshake_io(QIOChannel *ioc,
                                 GIOCondition condition,
@@ -28,4 +28,4 @@ gboolean vncws_handshake_io(QIOChannel *ioc,
                             GIOCondition condition,
                             void *opaque);
 
-#endif /* __QEMU_UI_VNC_WS_H */
+#endif /* QEMU_UI_VNC_WS_H */

diff --git a/ui/vnc.h b/ui/vnc.h
index 6568bca52038ca423bbe185f3e401d069a8318e3..ab5f244116adc55a9b9dcb883d7ad6137676de24 100644 (file)
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __QEMU_VNC_H
-#define __QEMU_VNC_H
+#ifndef QEMU_VNC_H
+#define QEMU_VNC_H
 
 #include "qemu-common.h"
 #include "qemu/queue.h"
@@ -577,4 +577,4 @@ int vnc_zrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
 int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
 void vnc_zrle_clear(VncState *vs);
 
-#endif /* __QEMU_VNC_H */
+#endif /* QEMU_VNC_H */