Commit 2a6a4076 authored by Markus Armbruster's avatar Markus Armbruster

Clean up ill-advised or unusual header guards

Cleaned up with scripts/clean-header-guards.pl.
Signed-off-by: 's avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: 's avatarRichard Henderson <rth@twiddle.net>
parent 965379b4
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
#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"
......
#ifndef _QEMU_9P_MARSHAL_H
#define _QEMU_9P_MARSHAL_H
#ifndef QEMU_9P_MARSHAL_H
#define QEMU_9P_MARSHAL_H
typedef struct V9fsString
{
......
......@@ -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
......
......@@ -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"
......
#ifndef _QEMU_9P_H
#define _QEMU_9P_H
#ifndef QEMU_9P_H
#define QEMU_9P_H
#include <dirent.h>
#include <utime.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"
......
#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"
......
#ifndef _STRONGARM_H
#define _STRONGARM_H
#ifndef STRONGARM_H
#define STRONGARM_H
#include "exec/memory.h"
#include "target-arm/cpu-qom.h"
......
#ifndef __FMOPL_H_
#define __FMOPL_H_
#ifndef FMOPL_H
#define FMOPL_H
/* --- select emulation chips --- */
#define BUILD_YM3812 (HAS_YM3812)
......
#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 */
......@@ -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 */
......@@ -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 */
#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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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"
......
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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) \
......
......@@ -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 */
......@@ -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 */
......
......@@ -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 */
......@@ -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 */
#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 */
......@@ -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
......
#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) */
......
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
#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 */
#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 */
......@@ -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"
......
......@@ -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"
......
......@@ -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 */
......@@ -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"
......
......@@ -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 */
......@@ -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 */
......@@ -16,8 +16,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/