提交 2a6a4076 编写于 作者: M Markus Armbruster

Clean up ill-advised or unusual header guards

Cleaned up with scripts/clean-header-guards.pl.
Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
Reviewed-by: NRichard Henderson <rth@twiddle.net>
上级 965379b4
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* top-level directory. * top-level directory.
*/ */
#ifndef _IVSHMEM_CLIENT_H_ #ifndef IVSHMEM_CLIENT_H
#define _IVSHMEM_CLIENT_H_ #define IVSHMEM_CLIENT_H
/** /**
* This file provides helper to implement an ivshmem client. It is used * 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); ...@@ -209,4 +209,4 @@ ivshmem_client_search_peer(IvshmemClient *client, int64_t peer_id);
*/ */
void ivshmem_client_dump(const IvshmemClient *client); void ivshmem_client_dump(const IvshmemClient *client);
#endif /* _IVSHMEM_CLIENT_H_ */ #endif /* IVSHMEM_CLIENT_H */
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* top-level directory. * top-level directory.
*/ */
#ifndef _IVSHMEM_SERVER_H_ #ifndef IVSHMEM_SERVER_H
#define _IVSHMEM_SERVER_H_ #define IVSHMEM_SERVER_H
/** /**
* The ivshmem server is a daemon that creates a unix socket in listen * 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); ...@@ -163,4 +163,4 @@ ivshmem_server_search_peer(IvshmemServer *server, int64_t peer_id);
*/ */
void ivshmem_server_dump(const IvshmemServer *server); void ivshmem_server_dump(const IvshmemServer *server);
#endif /* _IVSHMEM_SERVER_H_ */ #endif /* IVSHMEM_SERVER_H */
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
* *
*/ */
#ifndef QCRYPTO_BLOCK_LUKS_H__ #ifndef QCRYPTO_BLOCK_LUKS_H
#define QCRYPTO_BLOCK_LUKS_H__ #define QCRYPTO_BLOCK_LUKS_H
#include "crypto/blockpriv.h" #include "crypto/blockpriv.h"
extern const QCryptoBlockDriver qcrypto_block_driver_luks; extern const QCryptoBlockDriver qcrypto_block_driver_luks;
#endif /* QCRYPTO_BLOCK_LUKS_H__ */ #endif /* QCRYPTO_BLOCK_LUKS_H */
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
* *
*/ */
#ifndef QCRYPTO_BLOCK_QCOW_H__ #ifndef QCRYPTO_BLOCK_QCOW_H
#define QCRYPTO_BLOCK_QCOW_H__ #define QCRYPTO_BLOCK_QCOW_H
#include "crypto/blockpriv.h" #include "crypto/blockpriv.h"
extern const QCryptoBlockDriver qcrypto_block_driver_qcow; extern const QCryptoBlockDriver qcrypto_block_driver_qcow;
#endif /* QCRYPTO_BLOCK_QCOW_H__ */ #endif /* QCRYPTO_BLOCK_QCOW_H */
#ifndef _QEMU_9P_IOV_MARSHAL_H #ifndef QEMU_9P_IOV_MARSHAL_H
#define _QEMU_9P_IOV_MARSHAL_H #define QEMU_9P_IOV_MARSHAL_H
#include "9p-marshal.h" #include "9p-marshal.h"
......
#ifndef _QEMU_9P_MARSHAL_H #ifndef QEMU_9P_MARSHAL_H
#define _QEMU_9P_MARSHAL_H #define QEMU_9P_MARSHAL_H
typedef struct V9fsString typedef struct V9fsString
{ {
......
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
* This work is licensed under the terms of the GNU GPL, version 2. See * This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory. * 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 PROXY_MAX_IO_SZ (64 * 1024)
#define V9FS_FD_VALID INT_MAX #define V9FS_FD_VALID INT_MAX
......
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
* the COPYING file in the top-level directory. * 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" #include "qemu/xattr.h"
......
#ifndef _QEMU_9P_H #ifndef QEMU_9P_H
#define _QEMU_9P_H #define QEMU_9P_H
#include <dirent.h> #include <dirent.h>
#include <utime.h> #include <utime.h>
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
* *
*/ */
#ifndef _QEMU_9P_COTH_H #ifndef QEMU_9P_COTH_H
#define _QEMU_9P_COTH_H #define QEMU_9P_COTH_H
#include "qemu/thread.h" #include "qemu/thread.h"
#include "qemu/coroutine.h" #include "qemu/coroutine.h"
......
#ifndef _QEMU_VIRTIO_9P_H #ifndef QEMU_VIRTIO_9P_H
#define _QEMU_VIRTIO_9P_H #define QEMU_VIRTIO_9P_H
#include "standard-headers/linux/virtio_9p.h" #include "standard-headers/linux/virtio_9p.h"
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
......
#ifndef _STRONGARM_H #ifndef STRONGARM_H
#define _STRONGARM_H #define STRONGARM_H
#include "exec/memory.h" #include "exec/memory.h"
#include "target-arm/cpu-qom.h" #include "target-arm/cpu-qom.h"
......
#ifndef __FMOPL_H_ #ifndef FMOPL_H
#define __FMOPL_H_ #define FMOPL_H
/* --- select emulation chips --- */ /* --- select emulation chips --- */
#define BUILD_YM3812 (HAS_YM3812) #define BUILD_YM3812 (HAS_YM3812)
......
#ifndef __XEN_BLKIF_H__ #ifndef XEN_BLKIF_H
#define __XEN_BLKIF_H__ #define XEN_BLKIF_H
#include <xen/io/ring.h> #include <xen/io/ring.h>
#include <xen/io/blkif.h> #include <xen/io/blkif.h>
...@@ -143,4 +143,4 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, ...@@ -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 @@ ...@@ -26,8 +26,8 @@
******************************************************************** ********************************************************************
*/ */
#ifndef __UBOOT_IMAGE_H__ #ifndef UBOOT_IMAGE_H
#define __UBOOT_IMAGE_H__ #define UBOOT_IMAGE_H
/* /*
* Operating System Codes * Operating System Codes
...@@ -155,4 +155,4 @@ typedef struct uboot_image_header { ...@@ -155,4 +155,4 @@ typedef struct uboot_image_header {
} uboot_image_header_t; } uboot_image_header_t;
#endif /* __IMAGE_H__ */ #endif /* UBOOT_IMAGE_H */
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* *
*/ */
#ifndef __linux_video_vga_h__ #ifndef LINUX_VIDEO_VGA_H
#define __linux_video_vga_h__ #define LINUX_VIDEO_VGA_H
/* Some of the code below is taken from SVGAlib. The original, /* Some of the code below is taken from SVGAlib. The original,
unmodified copyright notice for that code is below. */ unmodified copyright notice for that code is below. */
...@@ -156,4 +156,4 @@ ...@@ -156,4 +156,4 @@
/* VGA graphics controller bit masks */ /* VGA graphics controller bit masks */
#define VGA_GR06_GRAPHICS_MODE 0x01 #define VGA_GR06_GRAPHICS_MODE 0x01
#endif /* __linux_video_vga_h__ */ #endif /* LINUX_VIDEO_VGA_H */
#ifndef __MICROBLAZE_BOOT__ #ifndef MICROBLAZE_BOOT_H
#define __MICROBLAZE_BOOT__ #define MICROBLAZE_BOOT_H
#include "hw/hw.h" #include "hw/hw.h"
...@@ -9,4 +9,4 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, ...@@ -9,4 +9,4 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
const char *dtb_filename, const char *dtb_filename,
void (*machine_cpu_reset)(MicroBlazeCPU *)); void (*machine_cpu_reset)(MicroBlazeCPU *));
#endif /* __MICROBLAZE_BOOT __ */ #endif /* MICROBLAZE_BOOT_H */
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef _ETSEC_H_
#define _ETSEC_H_ #ifndef ETSEC_H
#define ETSEC_H
#include "hw/qdev.h" #include "hw/qdev.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
...@@ -173,4 +174,4 @@ void etsec_write_miim(eTSEC *etsec, ...@@ -173,4 +174,4 @@ void etsec_write_miim(eTSEC *etsec,
void etsec_miim_link_status(eTSEC *etsec, NetClientState *nc); void etsec_miim_link_status(eTSEC *etsec, NetClientState *nc);
#endif /* ! _ETSEC_H_ */ #endif /* ETSEC_H */
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef _ETSEC_REGISTERS_H_
#define _ETSEC_REGISTERS_H_
#ifndef ETSEC_REGISTERS_H
#define ETSEC_REGISTERS_H
enum eTSEC_Register_Access_Type { enum eTSEC_Register_Access_Type {
ACC_RW = 1, /* Read/Write */ ACC_RW = 1, /* Read/Write */
...@@ -316,4 +316,4 @@ extern const eTSEC_Register_Definition eTSEC_registers_def[]; ...@@ -316,4 +316,4 @@ extern const eTSEC_Register_Definition eTSEC_registers_def[];
#define TMR_ETTS2_H (0xEA8 / 4) #define TMR_ETTS2_H (0xEA8 / 4)
#define TMR_ETTS2_L (0xEAC / 4) #define TMR_ETTS2_L (0xEAC / 4)
#endif /* ! _ETSEC_REGISTERS_H_ */ #endif /* ETSEC_REGISTERS_H */
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef _ROCKER_H_ #ifndef ROCKER_H
#define _ROCKER_H_ #define ROCKER_H
#include "qemu/sockets.h" #include "qemu/sockets.h"
...@@ -81,4 +81,4 @@ int rx_produce(World *world, uint32_t pport, ...@@ -81,4 +81,4 @@ int rx_produce(World *world, uint32_t pport,
int rocker_port_eg(Rocker *r, uint32_t pport, int rocker_port_eg(Rocker *r, uint32_t pport,
const struct iovec *iov, int iovcnt); const struct iovec *iov, int iovcnt);
#endif /* _ROCKER_H_ */ #endif /* ROCKER_H */
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef ROCKER_DESC_H
#ifndef _ROCKER_DESC_H_ #define ROCKER_DESC_H
#define _ROCKER_DESC_H_
#include "rocker_hw.h" #include "rocker_hw.h"
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef _ROCKER_FP_H_ #ifndef ROCKER_FP_H
#define _ROCKER_FP_H_ #define ROCKER_FP_H
#include "net/net.h" #include "net/net.h"
#include "qemu/iov.h" #include "qemu/iov.h"
...@@ -51,4 +51,4 @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name, ...@@ -51,4 +51,4 @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name,
void fp_port_free(FpPort *port); void fp_port_free(FpPort *port);
void fp_port_reset(FpPort *port); void fp_port_reset(FpPort *port);
#endif /* _ROCKER_FP_H_ */ #endif /* ROCKER_FP_H */
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* *
*/ */
#ifndef _ROCKER_HW_ #ifndef ROCKER_HW_H
#define _ROCKER_HW_ #define ROCKER_HW_H
#define __le16 uint16_t #define __le16 uint16_t
#define __le32 uint32_t #define __le32 uint32_t
...@@ -490,4 +490,4 @@ enum rocker_of_dpa_overlay_type { ...@@ -490,4 +490,4 @@ enum rocker_of_dpa_overlay_type {
*/ */
#define ROCKER_CONTROL_RESET (1 << 0) #define ROCKER_CONTROL_RESET (1 << 0)
#endif /* _ROCKER_HW_ */ #endif /* ROCKER_HW_H */
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef _ROCKER_OF_DPA_H_ #ifndef ROCKER_OF_DPA_H
#define _ROCKER_OF_DPA_H_ #define ROCKER_OF_DPA_H
World *of_dpa_world_alloc(Rocker *r); World *of_dpa_world_alloc(Rocker *r);
#endif /* _ROCKER_OF_DPA_H_ */ #endif /* ROCKER_OF_DPA_H */
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef _ROCKER_TLV_H_ #ifndef ROCKER_TLV_H
#define _ROCKER_TLV_H_ #define ROCKER_TLV_H
#define ROCKER_TLV_ALIGNTO 8U #define ROCKER_TLV_ALIGNTO 8U
#define ROCKER_TLV_ALIGN(len) \ #define ROCKER_TLV_ALIGN(len) \
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef _ROCKER_WORLD_H_ #ifndef ROCKER_WORLD_H
#define _ROCKER_WORLD_H_ #define ROCKER_WORLD_H
#include "rocker_hw.h" #include "rocker_hw.h"
...@@ -58,4 +58,4 @@ const char *world_name(World *world); ...@@ -58,4 +58,4 @@ const char *world_name(World *world);
World *rocker_get_world(Rocker *r, enum rocker_world_type type); World *rocker_get_world(Rocker *r, enum rocker_world_type type);
#endif /* _ROCKER_WORLD_H_ */ #endif /* ROCKER_WORLD_H */
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
* *
*/ */
#ifndef _QEMU_VMXNET3_H #ifndef QEMU_VMXNET3_H
#define _QEMU_VMXNET3_H #define QEMU_VMXNET3_H
#define VMXNET3_DEVICE_MAX_TX_QUEUES 8 #define VMXNET3_DEVICE_MAX_TX_QUEUES 8
#define VMXNET3_DEVICE_MAX_RX_QUEUES 8 /* Keep this value as a power of 2 */ #define VMXNET3_DEVICE_MAX_RX_QUEUES 8 /* Keep this value as a power of 2 */
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
* *
*/ */
#ifndef _QEMU_VMXNET_DEBUG_H #ifndef QEMU_VMXNET_DEBUG_H
#define _QEMU_VMXNET_DEBUG_H #define QEMU_VMXNET_DEBUG_H
#define VMXNET_DEVICE_NAME "vmxnet3" #define VMXNET_DEVICE_NAME "vmxnet3"
...@@ -142,4 +142,4 @@ ...@@ -142,4 +142,4 @@
} \ } \
} while (0) } while (0)
#endif /* _QEMU_VMXNET3_DEBUG_H */ #endif /* QEMU_VMXNET_DEBUG_H */
...@@ -22,8 +22,9 @@ ...@@ -22,8 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#if !defined(__PPC_MAC_H__)
#define __PPC_MAC_H__ #ifndef PPC_MAC_H
#define PPC_MAC_H
#include "exec/memory.h" #include "exec/memory.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
...@@ -184,4 +185,4 @@ typedef struct MacIONVRAMState { ...@@ -184,4 +185,4 @@ typedef struct MacIONVRAMState {
} MacIONVRAMState; } MacIONVRAMState;
void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len); void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len);
#endif /* !defined(__PPC_MAC_H__) */ #endif /* PPC_MAC_H */
#ifndef _SH7750_REGNAMES_H #ifndef SH7750_REGNAMES_H
#define _SH7750_REGNAMES_H #define SH7750_REGNAMES_H
const char *regname(uint32_t addr); const char *regname(uint32_t addr);
#endif /* _SH7750_REGNAMES_H */ #endif /* SH7750_REGNAMES_H */
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* @(#) sh7750_regs.h,v 1.2.4.1 2003/09/04 18:46:00 joel Exp * @(#) sh7750_regs.h,v 1.2.4.1 2003/09/04 18:46:00 joel Exp
*/ */
#ifndef __SH7750_REGS_H__ #ifndef SH7750_REGS_H
#define __SH7750_REGS_H__ #define SH7750_REGS_H
/* /*
* All register has 2 addresses: in 0xff000000 - 0xffffffff (P4 address) and * All register has 2 addresses: in 0xff000000 - 0xffffffff (P4 address) and
......
#ifndef HW_XTENSA_BOOTPARAM #ifndef HW_XTENSA_BOOTPARAM_H
#define HW_XTENSA_BOOTPARAM #define HW_XTENSA_BOOTPARAM_H
#define BP_TAG_COMMAND_LINE 0x1001 /* command line (0-terminated string)*/ #define BP_TAG_COMMAND_LINE 0x1001 /* command line (0-terminated string)*/
#define BP_TAG_INITRD 0x1002 /* ramdisk addr and size (bp_meminfo) */ #define BP_TAG_INITRD 0x1002 /* ramdisk addr and size (bp_meminfo) */
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_AFSPLIT_H__ #ifndef QCRYPTO_AFSPLIT_H
#define QCRYPTO_AFSPLIT_H__ #define QCRYPTO_AFSPLIT_H
#include "crypto/hash.h" #include "crypto/hash.h"
...@@ -132,4 +132,4 @@ int qcrypto_afsplit_decode(QCryptoHashAlgorithm hash, ...@@ -132,4 +132,4 @@ int qcrypto_afsplit_decode(QCryptoHashAlgorithm hash,
uint8_t *out, uint8_t *out,
Error **errp); Error **errp);
#endif /* QCRYPTO_AFSPLIT_H__ */ #endif /* QCRYPTO_AFSPLIT_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_BLOCK_H__ #ifndef QCRYPTO_BLOCK_H
#define QCRYPTO_BLOCK_H__ #define QCRYPTO_BLOCK_H
#include "crypto/cipher.h" #include "crypto/cipher.h"
#include "crypto/ivgen.h" #include "crypto/ivgen.h"
...@@ -229,4 +229,4 @@ uint64_t qcrypto_block_get_payload_offset(QCryptoBlock *block); ...@@ -229,4 +229,4 @@ uint64_t qcrypto_block_get_payload_offset(QCryptoBlock *block);
*/ */
void qcrypto_block_free(QCryptoBlock *block); void qcrypto_block_free(QCryptoBlock *block);
#endif /* QCRYPTO_BLOCK_H__ */ #endif /* QCRYPTO_BLOCK_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_CIPHER_H__ #ifndef QCRYPTO_CIPHER_H
#define QCRYPTO_CIPHER_H__ #define QCRYPTO_CIPHER_H
#include "qapi-types.h" #include "qapi-types.h"
...@@ -230,4 +230,4 @@ int qcrypto_cipher_setiv(QCryptoCipher *cipher, ...@@ -230,4 +230,4 @@ int qcrypto_cipher_setiv(QCryptoCipher *cipher,
const uint8_t *iv, size_t niv, const uint8_t *iv, size_t niv,
Error **errp); Error **errp);
#endif /* QCRYPTO_CIPHER_H__ */ #endif /* QCRYPTO_CIPHER_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_HASH_H__ #ifndef QCRYPTO_HASH_H
#define QCRYPTO_HASH_H__ #define QCRYPTO_HASH_H
#include "qapi-types.h" #include "qapi-types.h"
...@@ -189,4 +189,4 @@ int qcrypto_hash_base64(QCryptoHashAlgorithm alg, ...@@ -189,4 +189,4 @@ int qcrypto_hash_base64(QCryptoHashAlgorithm alg,
char **base64, char **base64,
Error **errp); Error **errp);
#endif /* QCRYPTO_HASH_H__ */ #endif /* QCRYPTO_HASH_H */
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
* *
*/ */
#ifndef QCRYPTO_INIT_H__ #ifndef QCRYPTO_INIT_H
#define QCRYPTO_INIT_H__ #define QCRYPTO_INIT_H
int qcrypto_init(Error **errp); int qcrypto_init(Error **errp);
#endif /* QCRYPTO_INIT_H__ */ #endif /* QCRYPTO_INIT_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_IVGEN_H__ #ifndef QCRYPTO_IVGEN_H
#define QCRYPTO_IVGEN_H__ #define QCRYPTO_IVGEN_H
#include "crypto/cipher.h" #include "crypto/cipher.h"
#include "crypto/hash.h" #include "crypto/hash.h"
...@@ -203,4 +203,4 @@ QCryptoHashAlgorithm qcrypto_ivgen_get_hash(QCryptoIVGen *ivgen); ...@@ -203,4 +203,4 @@ QCryptoHashAlgorithm qcrypto_ivgen_get_hash(QCryptoIVGen *ivgen);
*/ */
void qcrypto_ivgen_free(QCryptoIVGen *ivgen); void qcrypto_ivgen_free(QCryptoIVGen *ivgen);
#endif /* QCRYPTO_IVGEN_H__ */ #endif /* QCRYPTO_IVGEN_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_PBKDF_H__ #ifndef QCRYPTO_PBKDF_H
#define QCRYPTO_PBKDF_H__ #define QCRYPTO_PBKDF_H
#include "crypto/hash.h" #include "crypto/hash.h"
...@@ -149,4 +149,4 @@ int qcrypto_pbkdf2_count_iters(QCryptoHashAlgorithm hash, ...@@ -149,4 +149,4 @@ int qcrypto_pbkdf2_count_iters(QCryptoHashAlgorithm hash,
const uint8_t *salt, size_t nsalt, const uint8_t *salt, size_t nsalt,
Error **errp); Error **errp);
#endif /* QCRYPTO_PBKDF_H__ */ #endif /* QCRYPTO_PBKDF_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_RANDOM_H__ #ifndef QCRYPTO_RANDOM_H
#define QCRYPTO_RANDOM_H__ #define QCRYPTO_RANDOM_H
#include "qemu-common.h" #include "qemu-common.h"
#include "qapi/error.h" #include "qapi/error.h"
...@@ -41,4 +41,4 @@ int qcrypto_random_bytes(uint8_t *buf, ...@@ -41,4 +41,4 @@ int qcrypto_random_bytes(uint8_t *buf,
Error **errp); Error **errp);
#endif /* QCRYPTO_RANDOM_H__ */ #endif /* QCRYPTO_RANDOM_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_SECRET_H__ #ifndef QCRYPTO_SECRET_H
#define QCRYPTO_SECRET_H__ #define QCRYPTO_SECRET_H
#include "qom/object.h" #include "qom/object.h"
...@@ -143,4 +143,4 @@ extern char *qcrypto_secret_lookup_as_utf8(const char *secretid, ...@@ -143,4 +143,4 @@ extern char *qcrypto_secret_lookup_as_utf8(const char *secretid,
extern char *qcrypto_secret_lookup_as_base64(const char *secretid, extern char *qcrypto_secret_lookup_as_base64(const char *secretid,
Error **errp); Error **errp);
#endif /* QCRYPTO_SECRET_H__ */ #endif /* QCRYPTO_SECRET_H */
...@@ -23,9 +23,8 @@ ...@@ -23,9 +23,8 @@
* *
*/ */
#ifndef QCRYPTO_XTS_H
#ifndef QCRYPTO_XTS_H_ #define QCRYPTO_XTS_H
#define QCRYPTO_XTS_H_
#include "qemu-common.h" #include "qemu-common.h"
#include "qapi/error.h" #include "qapi/error.h"
...@@ -83,4 +82,4 @@ void xts_encrypt(const void *datactx, ...@@ -83,4 +82,4 @@ void xts_encrypt(const void *datactx,
const uint8_t *src); const uint8_t *src);
#endif /* QCRYPTO_XTS_H_ */ #endif /* QCRYPTO_XTS_H */
#ifndef _QEMU_DISAS_H #ifndef QEMU_DISAS_H
#define _QEMU_DISAS_H #define QEMU_DISAS_H
#include "qemu-common.h" #include "qemu-common.h"
...@@ -42,4 +42,4 @@ struct syminfo { ...@@ -42,4 +42,4 @@ struct syminfo {
/* Filled in by elfload.c. Simplistic, but will do for now. */ /* Filled in by elfload.c. Simplistic, but will do for now. */
extern struct syminfo *syminfos; extern struct syminfo *syminfos;
#endif /* _QEMU_DISAS_H */ #endif /* QEMU_DISAS_H */
#ifndef _QEMU_ELF_H #ifndef QEMU_ELF_H
#define _QEMU_ELF_H #define QEMU_ELF_H
/* 32-bit ELF base types. */ /* 32-bit ELF base types. */
typedef uint32_t Elf32_Addr; typedef uint32_t Elf32_Addr;
...@@ -1573,4 +1572,4 @@ struct elf32_fdpic_loadmap { ...@@ -1573,4 +1572,4 @@ struct elf32_fdpic_loadmap {
#endif /* ELF_CLASS */ #endif /* ELF_CLASS */
#endif /* _QEMU_ELF_H */ #endif /* QEMU_ELF_H */
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _EXEC_ALL_H_ #ifndef EXEC_ALL_H
#define _EXEC_ALL_H_ #define EXEC_ALL_H
#include "qemu-common.h" #include "qemu-common.h"
#include "exec/tb-context.h" #include "exec/tb-context.h"
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef QEMU_TB_CONTEXT_H_ #ifndef QEMU_TB_CONTEXT_H
#define QEMU_TB_CONTEXT_H_ #define QEMU_TB_CONTEXT_H
#include "qemu/thread.h" #include "qemu/thread.h"
#include "qemu/qht.h" #include "qemu/qht.h"
......
...@@ -30,8 +30,9 @@ ...@@ -30,8 +30,9 @@
* You can contact the author at : * You can contact the author at :
* - xxHash source repository : https://github.com/Cyan4973/xxHash * - 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" #include "qemu/bitops.h"
...@@ -91,4 +92,4 @@ uint32_t tb_hash_func5(uint64_t a0, uint64_t b0, uint32_t e) ...@@ -91,4 +92,4 @@ uint32_t tb_hash_func5(uint64_t a0, uint64_t b0, uint32_t e)
return h32; return h32;
} }
#endif /* EXEC_TB_HASH_XX */ #endif /* EXEC_TB_HASH_XX_H */
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef EXEC_TB_HASH #ifndef EXEC_TB_HASH_H
#define EXEC_TB_HASH #define EXEC_TB_HASH_H
#include "exec/tb-hash-xx.h" #include "exec/tb-hash-xx.h"
......
...@@ -22,9 +22,8 @@ ...@@ -22,9 +22,8 @@
* *
*/ */
#ifndef EXYNOS4210_H
#ifndef EXYNOS4210_H_ #define EXYNOS4210_H
#define EXYNOS4210_H_
#include "qemu-common.h" #include "qemu-common.h"
#include "exec/memory.h" #include "exec/memory.h"
...@@ -135,4 +134,4 @@ DeviceState *exynos4210_uart_create(hwaddr addr, ...@@ -135,4 +134,4 @@ DeviceState *exynos4210_uart_create(hwaddr addr,
CharDriverState *chr, CharDriverState *chr,
qemu_irq irq); qemu_irq irq);
#endif /* EXYNOS4210_H_ */ #endif /* EXYNOS4210_H */
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>. * with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __IMX_GPIO_H_ #ifndef IMX_GPIO_H
#define __IMX_GPIO_H_ #define IMX_GPIO_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
...@@ -60,4 +60,4 @@ typedef struct IMXGPIOState { ...@@ -60,4 +60,4 @@ typedef struct IMXGPIOState {
qemu_irq output[IMX_GPIO_PIN_COUNT]; qemu_irq output[IMX_GPIO_PIN_COUNT];
} IMXGPIOState; } IMXGPIOState;
#endif /* __IMX_GPIO_H_ */ #endif /* IMX_GPIO_H */
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>. * with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef I2C_DDC #ifndef I2C_DDC_H
#define I2C_DDC #define I2C_DDC_H
/* A simple I2C slave which just returns the contents of its EDID blob. */ /* A simple I2C slave which just returns the contents of its EDID blob. */
...@@ -35,4 +35,4 @@ typedef struct I2CDDCState I2CDDCState; ...@@ -35,4 +35,4 @@ typedef struct I2CDDCState I2CDDCState;
#define TYPE_I2CDDC "i2c-ddc" #define TYPE_I2CDDC "i2c-ddc"
#define I2CDDC(obj) OBJECT_CHECK(I2CDDCState, (obj), TYPE_I2CDDC) #define I2CDDC(obj) OBJECT_CHECK(I2CDDCState, (obj), TYPE_I2CDDC)
#endif /* !I2C_DDC */ #endif /* I2C_DDC_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef __IMX_I2C_H_ #ifndef IMX_I2C_H
#define __IMX_I2C_H_ #define IMX_I2C_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
...@@ -84,4 +84,4 @@ typedef struct IMXI2CState { ...@@ -84,4 +84,4 @@ typedef struct IMXI2CState {
uint16_t i2dr_write; uint16_t i2dr_write;
} IMXI2CState; } IMXI2CState;
#endif /* __IMX_I2C_H_ */ #endif /* IMX_I2C_H */
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#if !defined(__ADB_H__) #ifndef ADB_H
#define __ADB_H__ #define ADB_H
#include "hw/qdev.h" #include "hw/qdev.h"
...@@ -84,4 +84,4 @@ int adb_poll(ADBBusState *s, uint8_t *buf_out, uint16_t poll_mask); ...@@ -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_KEYBOARD "adb-keyboard"
#define TYPE_ADB_MOUSE "adb-mouse" #define TYPE_ADB_MOUSE "adb-mouse"
#endif /* !defined(__ADB_H__) */ #endif /* ADB_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* *
*/ */
#ifndef _MIPS_GIC_H #ifndef MIPS_GIC_H
#define _MIPS_GIC_H #define MIPS_GIC_H
#include "hw/timer/mips_gictimer.h" #include "hw/timer/mips_gictimer.h"
#include "cpu.h" #include "cpu.h"
...@@ -213,4 +213,4 @@ struct MIPSGICState { ...@@ -213,4 +213,4 @@ struct MIPSGICState {
int32_t num_irq; int32_t num_irq;
}; };
#endif /* _MIPS_GIC_H */ #endif /* MIPS_GIC_H */
#if !defined(__OPENPIC_H__) #ifndef OPENPIC_H
#define __OPENPIC_H__ #define OPENPIC_H
#include "qemu-common.h" #include "qemu-common.h"
#include "hw/qdev-core.h" #include "hw/qdev-core.h"
...@@ -30,4 +30,4 @@ enum { ...@@ -30,4 +30,4 @@ enum {
#define TYPE_KVM_OPENPIC "kvm-openpic" #define TYPE_KVM_OPENPIC "kvm-openpic"
int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs); int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs);
#endif /* __OPENPIC_H__ */ #endif /* OPENPIC_H */
#if !defined(__HW_SPAPR_H__) #ifndef HW_SPAPR_H
#define __HW_SPAPR_H__ #define HW_SPAPR_H
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "hw/boards.h" #include "hw/boards.h"
...@@ -648,4 +648,4 @@ int spapr_rng_populate_dt(void *fdt); ...@@ -648,4 +648,4 @@ int spapr_rng_populate_dt(void *fdt);
#define SPAPR_LMB_FLAGS_DRC_INVALID 0x00000020 #define SPAPR_LMB_FLAGS_DRC_INVALID 0x00000020
#define SPAPR_LMB_FLAGS_RESERVED 0x00000080 #define SPAPR_LMB_FLAGS_RESERVED 0x00000080
#endif /* !defined (__HW_SPAPR_H__) */ #endif /* HW_SPAPR_H */
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later. * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory. * 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 <libfdt.h>
#include "qom/object.h" #include "qom/object.h"
...@@ -202,4 +203,4 @@ sPAPRDRConnector *spapr_dr_connector_by_id(sPAPRDRConnectorType type, ...@@ -202,4 +203,4 @@ sPAPRDRConnector *spapr_dr_connector_by_id(sPAPRDRConnectorType type,
int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner,
uint32_t drc_type_mask); uint32_t drc_type_mask);
#endif /* __HW_SPAPR_DRC_H__ */ #endif /* HW_SPAPR_DRC_H */
#ifndef _HW_SPAPR_VIO_H #ifndef HW_SPAPR_VIO_H
#define _HW_SPAPR_VIO_H #define HW_SPAPR_VIO_H
/* /*
* QEMU sPAPR VIO bus definitions * QEMU sPAPR VIO bus definitions
* *
...@@ -145,4 +146,4 @@ extern const VMStateDescription vmstate_spapr_vio; ...@@ -145,4 +146,4 @@ extern const VMStateDescription vmstate_spapr_vio;
void spapr_vio_set_bypass(VIOsPAPRDevice *dev, bool bypass); void spapr_vio_set_bypass(VIOsPAPRDevice *dev, bool bypass);
#endif /* _HW_SPAPR_VIO_H */ #endif /* HW_SPAPR_VIO_H */
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
* THE SOFTWARE. * THE SOFTWARE.
* *
*/ */
#if !defined(__XICS_H__)
#define __XICS_H__ #ifndef XICS_H
#define XICS_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
...@@ -196,4 +197,4 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi); ...@@ -196,4 +197,4 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi);
int xics_find_source(XICSState *icp, int irq); int xics_find_source(XICSState *icp, int irq);
#endif /* __XICS_H__ */ #endif /* XICS_H */
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* *
*/ */
#ifndef EBCDIC_H_ #ifndef EBCDIC_H
#define EBCDIC_H_ #define EBCDIC_H
/* EBCDIC handling */ /* EBCDIC handling */
static const uint8_t ebcdic2ascii[] = { static const uint8_t ebcdic2ascii[] = {
...@@ -101,4 +101,4 @@ static inline void ascii_put(uint8_t *p, const char *ebcdic, int len) ...@@ -101,4 +101,4 @@ static inline void ascii_put(uint8_t *p, const char *ebcdic, int len)
} }
} }
#endif /* EBCDIC_H_ */ #endif /* EBCDIC_H */
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
* directory. * directory.
*/ */
#ifndef __HW_S390_FLIC_H #ifndef HW_S390_FLIC_H
#define __HW_S390_FLIC_H #define HW_S390_FLIC_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/s390x/adapter.h" #include "hw/s390x/adapter.h"
...@@ -78,4 +78,4 @@ static inline DeviceState *s390_flic_kvm_create(void) ...@@ -78,4 +78,4 @@ static inline DeviceState *s390_flic_kvm_create(void)
} }
#endif #endif
#endif /* __HW_S390_FLIC_H */ #endif /* HW_S390_FLIC_H */
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* directory. * directory.
*/ */
#ifndef __S390_STORAGE_KEYS_H #ifndef S390_STORAGE_KEYS_H
#define __S390_STORAGE_KEYS_H #define S390_STORAGE_KEYS_H
#include "hw/qdev.h" #include "hw/qdev.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
...@@ -57,4 +57,4 @@ S390SKeysState *s390_get_skeys_device(void); ...@@ -57,4 +57,4 @@ S390SKeysState *s390_get_skeys_device(void);
void hmp_dump_skeys(Monitor *mon, const QDict *qdict); void hmp_dump_skeys(Monitor *mon, const QDict *qdict);
void hmp_info_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 */
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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" #include "hw/qdev.h"
...@@ -144,4 +145,4 @@ bool sdbus_get_readonly(SDBus *sd); ...@@ -144,4 +145,4 @@ bool sdbus_get_readonly(SDBus *sd);
void sdbus_set_inserted(SDBus *sd, bool inserted); void sdbus_set_inserted(SDBus *sd, bool inserted);
void sdbus_set_readonly(SDBus *sd, bool inserted); void sdbus_set_readonly(SDBus *sd, bool inserted);
#endif /* __hw_sd_h */ #endif /* HW_SD_H */
#ifndef __SH_INTC_H__ #ifndef SH_INTC_H
#define __SH_INTC_H__ #define SH_INTC_H
#include "qemu-common.h" #include "qemu-common.h"
#include "hw/irq.h" #include "hw/irq.h"
...@@ -80,4 +80,4 @@ int sh_intc_init(MemoryRegion *sysmem, ...@@ -80,4 +80,4 @@ int sh_intc_init(MemoryRegion *sysmem,
void sh_intc_set_irl(void *opaque, int n, int level); void sh_intc_set_irl(void *opaque, int n, int level);
#endif /* __SH_INTC_H__ */ #endif /* SH_INTC_H */
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef _GRLIB_H_ #ifndef GRLIB_H
#define _GRLIB_H_ #define GRLIB_H
#include "hw/qdev.h" #include "hw/qdev.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
...@@ -117,4 +117,4 @@ DeviceState *grlib_apbuart_create(hwaddr base, ...@@ -117,4 +117,4 @@ DeviceState *grlib_apbuart_create(hwaddr base,
return dev; return dev;
} }
#endif /* ! _GRLIB_H_ */ #endif /* GRLIB_H */
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* *
*/ */
#ifndef _MIPS_GICTIMER_H_ #ifndef MIPS_GICTIMER_H
#define _MIPS_GICTIMER_H_ #define MIPS_GICTIMER_H
typedef struct MIPSGICTimerVPState MIPSGICTimerVPState; typedef struct MIPSGICTimerVPState MIPSGICTimerVPState;
typedef struct MIPSGICTimerState MIPSGICTimerState; typedef struct MIPSGICTimerState MIPSGICTimerState;
...@@ -43,4 +43,4 @@ void mips_gictimer_stop_count(MIPSGICTimerState *gic); ...@@ -43,4 +43,4 @@ void mips_gictimer_stop_count(MIPSGICTimerState *gic);
MIPSGICTimerState *mips_gictimer_init(void *opaque, uint32_t nvps, MIPSGICTimerState *mips_gictimer_init(void *opaque, uint32_t nvps,
MIPSGICTimerCB *cb); MIPSGICTimerCB *cb);
#endif /* _MIPS_GICTIMER_H_ */ #endif /* MIPS_GICTIMER_H */
...@@ -8,9 +8,8 @@ ...@@ -8,9 +8,8 @@
* *
*/ */
#ifndef VHOST_BACKEND_H_ #ifndef VHOST_BACKEND_H
#define VHOST_BACKEND_H_ #define VHOST_BACKEND_H
typedef enum VhostBackendType { typedef enum VhostBackendType {
VHOST_BACKEND_TYPE_NONE = 0, VHOST_BACKEND_TYPE_NONE = 0,
...@@ -110,4 +109,4 @@ extern const VhostOps user_ops; ...@@ -110,4 +109,4 @@ extern const VhostOps user_ops;
int vhost_set_backend_type(struct vhost_dev *dev, int vhost_set_backend_type(struct vhost_dev *dev,
VhostBackendType backend_type); VhostBackendType backend_type);
#endif /* VHOST_BACKEND_H_ */ #endif /* VHOST_BACKEND_H */
...@@ -12,8 +12,10 @@ ...@@ -12,8 +12,10 @@
* (at your option) any later version. * (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 "hw/virtio/virtio.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
...@@ -175,4 +177,4 @@ static inline void virtio_tswap64s(VirtIODevice *vdev, uint64_t *s) ...@@ -175,4 +177,4 @@ static inline void virtio_tswap64s(VirtIODevice *vdev, uint64_t *s)
{ {
*s = virtio_tswap64(vdev, *s); *s = virtio_tswap64(vdev, *s);
} }
#endif /* _QEMU_VIRTIO_ACCESS_H */ #endif /* QEMU_VIRTIO_ACCESS_H */
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
* *
*/ */
#ifndef _QEMU_VIRTIO_BALLOON_H #ifndef QEMU_VIRTIO_BALLOON_H
#define _QEMU_VIRTIO_BALLOON_H #define QEMU_VIRTIO_BALLOON_H
#include "standard-headers/linux/virtio_balloon.h" #include "standard-headers/linux/virtio_balloon.h"
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
* *
*/ */
#ifndef _QEMU_VIRTIO_BLK_H #ifndef QEMU_VIRTIO_BLK_H
#define _QEMU_VIRTIO_BLK_H #define QEMU_VIRTIO_BLK_H
#include "standard-headers/linux/virtio_blk.h" #include "standard-headers/linux/virtio_blk.h"
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
......
#ifndef _QEMU_VIRTIO_INPUT_H #ifndef QEMU_VIRTIO_INPUT_H
#define _QEMU_VIRTIO_INPUT_H #define QEMU_VIRTIO_INPUT_H
#include "ui/input.h" #include "ui/input.h"
...@@ -105,4 +105,4 @@ void virtio_input_add_config(VirtIOInput *vinput, ...@@ -105,4 +105,4 @@ void virtio_input_add_config(VirtIOInput *vinput,
void virtio_input_idstr_config(VirtIOInput *vinput, void virtio_input_idstr_config(VirtIOInput *vinput,
uint8_t select, const char *string); uint8_t select, const char *string);
#endif /* _QEMU_VIRTIO_INPUT_H */ #endif /* QEMU_VIRTIO_INPUT_H */
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
* *
*/ */
#ifndef _QEMU_VIRTIO_NET_H #ifndef QEMU_VIRTIO_NET_H
#define _QEMU_VIRTIO_NET_H #define QEMU_VIRTIO_NET_H
#include "standard-headers/linux/virtio_net.h" #include "standard-headers/linux/virtio_net.h"
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* top-level directory. * top-level directory.
*/ */
#ifndef _QEMU_VIRTIO_RNG_H #ifndef QEMU_VIRTIO_RNG_H
#define _QEMU_VIRTIO_RNG_H #define QEMU_VIRTIO_RNG_H
#include "sysemu/rng.h" #include "sysemu/rng.h"
#include "sysemu/rng-random.h" #include "sysemu/rng-random.h"
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
* *
*/ */
#ifndef _QEMU_VIRTIO_SCSI_H #ifndef QEMU_VIRTIO_SCSI_H
#define _QEMU_VIRTIO_SCSI_H #define QEMU_VIRTIO_SCSI_H
/* Override CDB/sense data size: they are dynamic (guest controlled) in QEMU */ /* Override CDB/sense data size: they are dynamic (guest controlled) in QEMU */
#define VIRTIO_SCSI_CDB_SIZE 0 #define VIRTIO_SCSI_CDB_SIZE 0
...@@ -141,4 +141,4 @@ void virtio_scsi_dataplane_start(VirtIOSCSI *s); ...@@ -141,4 +141,4 @@ void virtio_scsi_dataplane_start(VirtIOSCSI *s);
void virtio_scsi_dataplane_stop(VirtIOSCSI *s); void virtio_scsi_dataplane_stop(VirtIOSCSI *s);
void virtio_scsi_dataplane_notify(VirtIODevice *vdev, VirtIOSCSIReq *req); void virtio_scsi_dataplane_notify(VirtIODevice *vdev, VirtIOSCSIReq *req);
#endif /* _QEMU_VIRTIO_SCSI_H */ #endif /* QEMU_VIRTIO_SCSI_H */
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
* the COPYING file in the top-level directory. * 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 "standard-headers/linux/virtio_console.h"
#include "hw/qdev.h" #include "hw/qdev.h"
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
* *
*/ */
#ifndef _QEMU_VIRTIO_H #ifndef QEMU_VIRTIO_H
#define _QEMU_VIRTIO_H #define QEMU_VIRTIO_H
#include "hw/hw.h" #include "hw/hw.h"
#include "net/net.h" #include "net/net.h"
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_CHANNEL_BUFFER_H__ #ifndef QIO_CHANNEL_BUFFER_H
#define QIO_CHANNEL_BUFFER_H__ #define QIO_CHANNEL_BUFFER_H
#include "io/channel.h" #include "io/channel.h"
...@@ -57,4 +57,4 @@ struct QIOChannelBuffer { ...@@ -57,4 +57,4 @@ struct QIOChannelBuffer {
QIOChannelBuffer * QIOChannelBuffer *
qio_channel_buffer_new(size_t capacity); qio_channel_buffer_new(size_t capacity);
#endif /* QIO_CHANNEL_BUFFER_H__ */ #endif /* QIO_CHANNEL_BUFFER_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_CHANNEL_COMMAND_H__ #ifndef QIO_CHANNEL_COMMAND_H
#define QIO_CHANNEL_COMMAND_H__ #define QIO_CHANNEL_COMMAND_H
#include "io/channel.h" #include "io/channel.h"
...@@ -88,4 +88,4 @@ qio_channel_command_new_spawn(const char *const argv[], ...@@ -88,4 +88,4 @@ qio_channel_command_new_spawn(const char *const argv[],
Error **errp); Error **errp);
#endif /* QIO_CHANNEL_COMMAND_H__ */ #endif /* QIO_CHANNEL_COMMAND_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_CHANNEL_FILE_H__ #ifndef QIO_CHANNEL_FILE_H
#define QIO_CHANNEL_FILE_H__ #define QIO_CHANNEL_FILE_H
#include "io/channel.h" #include "io/channel.h"
...@@ -90,4 +90,4 @@ qio_channel_file_new_path(const char *path, ...@@ -90,4 +90,4 @@ qio_channel_file_new_path(const char *path,
mode_t mode, mode_t mode,
Error **errp); Error **errp);
#endif /* QIO_CHANNEL_FILE_H__ */ #endif /* QIO_CHANNEL_FILE_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_CHANNEL_SOCKET_H__ #ifndef QIO_CHANNEL_SOCKET_H
#define QIO_CHANNEL_SOCKET_H__ #define QIO_CHANNEL_SOCKET_H
#include "io/channel.h" #include "io/channel.h"
#include "io/task.h" #include "io/task.h"
...@@ -248,4 +248,4 @@ qio_channel_socket_accept(QIOChannelSocket *ioc, ...@@ -248,4 +248,4 @@ qio_channel_socket_accept(QIOChannelSocket *ioc,
Error **errp); Error **errp);
#endif /* QIO_CHANNEL_SOCKET_H__ */ #endif /* QIO_CHANNEL_SOCKET_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_CHANNEL_TLS_H__ #ifndef QIO_CHANNEL_TLS_H
#define QIO_CHANNEL_TLS_H__ #define QIO_CHANNEL_TLS_H
#include "io/channel.h" #include "io/channel.h"
#include "io/task.h" #include "io/task.h"
...@@ -139,4 +139,4 @@ void qio_channel_tls_handshake(QIOChannelTLS *ioc, ...@@ -139,4 +139,4 @@ void qio_channel_tls_handshake(QIOChannelTLS *ioc,
QCryptoTLSSession * QCryptoTLSSession *
qio_channel_tls_get_session(QIOChannelTLS *ioc); qio_channel_tls_get_session(QIOChannelTLS *ioc);
#endif /* QIO_CHANNEL_TLS_H__ */ #endif /* QIO_CHANNEL_TLS_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_CHANNEL_UTIL_H__ #ifndef QIO_CHANNEL_UTIL_H
#define QIO_CHANNEL_UTIL_H__ #define QIO_CHANNEL_UTIL_H
#include "io/channel.h" #include "io/channel.h"
...@@ -49,4 +49,4 @@ ...@@ -49,4 +49,4 @@
QIOChannel *qio_channel_new_fd(int fd, QIOChannel *qio_channel_new_fd(int fd,
Error **errp); Error **errp);
#endif /* QIO_CHANNEL_UTIL_H__ */ #endif /* QIO_CHANNEL_UTIL_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_CHANNEL_WATCH_H__ #ifndef QIO_CHANNEL_WATCH_H
#define QIO_CHANNEL_WATCH_H__ #define QIO_CHANNEL_WATCH_H
#include "io/channel.h" #include "io/channel.h"
...@@ -87,4 +87,4 @@ GSource *qio_channel_create_fd_pair_watch(QIOChannel *ioc, ...@@ -87,4 +87,4 @@ GSource *qio_channel_create_fd_pair_watch(QIOChannel *ioc,
int fdwrite, int fdwrite,
GIOCondition condition); GIOCondition condition);
#endif /* QIO_CHANNEL_WATCH_H__ */ #endif /* QIO_CHANNEL_WATCH_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_CHANNEL_WEBSOCK_H__ #ifndef QIO_CHANNEL_WEBSOCK_H
#define QIO_CHANNEL_WEBSOCK_H__ #define QIO_CHANNEL_WEBSOCK_H
#include "io/channel.h" #include "io/channel.h"
#include "qemu/buffer.h" #include "qemu/buffer.h"
...@@ -105,4 +105,4 @@ void qio_channel_websock_handshake(QIOChannelWebsock *ioc, ...@@ -105,4 +105,4 @@ void qio_channel_websock_handshake(QIOChannelWebsock *ioc,
gpointer opaque, gpointer opaque,
GDestroyNotify destroy); GDestroyNotify destroy);
#endif /* QIO_CHANNEL_WEBSOCK_H__ */ #endif /* QIO_CHANNEL_WEBSOCK_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_CHANNEL_H__ #ifndef QIO_CHANNEL_H
#define QIO_CHANNEL_H__ #define QIO_CHANNEL_H
#include "qemu-common.h" #include "qemu-common.h"
#include "qom/object.h" #include "qom/object.h"
...@@ -502,4 +502,4 @@ void qio_channel_yield(QIOChannel *ioc, ...@@ -502,4 +502,4 @@ void qio_channel_yield(QIOChannel *ioc,
void qio_channel_wait(QIOChannel *ioc, void qio_channel_wait(QIOChannel *ioc,
GIOCondition condition); GIOCondition condition);
#endif /* QIO_CHANNEL_H__ */ #endif /* QIO_CHANNEL_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QIO_TASK_H__ #ifndef QIO_TASK_H
#define QIO_TASK_H__ #define QIO_TASK_H
#include "qemu-common.h" #include "qemu-common.h"
#include "qom/object.h" #include "qom/object.h"
...@@ -252,4 +252,4 @@ void qio_task_abort(QIOTask *task, ...@@ -252,4 +252,4 @@ void qio_task_abort(QIOTask *task,
*/ */
Object *qio_task_get_source(QIOTask *task); Object *qio_task_get_source(QIOTask *task);
#endif /* QIO_TASK_H__ */ #endif /* QIO_TASK_H */
...@@ -50,8 +50,9 @@ ...@@ -50,8 +50,9 @@
/* */ /* */
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
#if !defined(DECCONTEXT) #ifndef DECCONTEXT_H
#define DECCONTEXT #define DECCONTEXT_H
#define DECCNAME "decContext" /* Short name */ #define DECCNAME "decContext" /* Short name */
#define DECCFULLNAME "Decimal Context Descriptor" /* Verbose name */ #define DECCFULLNAME "Decimal Context Descriptor" /* Verbose name */
#define DECCAUTHOR "Mike Cowlishaw" /* Who to blame */ #define DECCAUTHOR "Mike Cowlishaw" /* Who to blame */
......
...@@ -32,8 +32,9 @@ ...@@ -32,8 +32,9 @@
/* Decimal Number arithmetic module header */ /* Decimal Number arithmetic module header */
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
#if !defined(DECNUMBER) #ifndef DECNUMBER_H
#define DECNUMBER #define DECNUMBER_H
#define DECNAME "decNumber" /* Short name */ #define DECNAME "decNumber" /* Short name */
#define DECFULLNAME "Decimal Number Module" /* Verbose name */ #define DECFULLNAME "Decimal Number Module" /* Verbose name */
#define DECAUTHOR "Mike Cowlishaw" /* Who to blame */ #define DECAUTHOR "Mike Cowlishaw" /* Who to blame */
......
...@@ -32,8 +32,9 @@ ...@@ -32,8 +32,9 @@
/* Decimal 128-bit format module header */ /* Decimal 128-bit format module header */
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
#if !defined(DECIMAL128) #ifndef DECIMAL128_H
#define DECIMAL128 #define DECIMAL128_H
#define DEC128NAME "decimal128" /* Short name */ #define DEC128NAME "decimal128" /* Short name */
#define DEC128FULLNAME "Decimal 128-bit Number" /* Verbose name */ #define DEC128FULLNAME "Decimal 128-bit Number" /* Verbose name */
#define DEC128AUTHOR "Mike Cowlishaw" /* Who to blame */ #define DEC128AUTHOR "Mike Cowlishaw" /* Who to blame */
......
...@@ -32,8 +32,9 @@ ...@@ -32,8 +32,9 @@
/* Decimal 32-bit format module header */ /* Decimal 32-bit format module header */
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
#if !defined(DECIMAL32) #ifndef DECIMAL32_H
#define DECIMAL32 #define DECIMAL32_H
#define DEC32NAME "decimal32" /* Short name */ #define DEC32NAME "decimal32" /* Short name */
#define DEC32FULLNAME "Decimal 32-bit Number" /* Verbose name */ #define DEC32FULLNAME "Decimal 32-bit Number" /* Verbose name */
#define DEC32AUTHOR "Mike Cowlishaw" /* Who to blame */ #define DEC32AUTHOR "Mike Cowlishaw" /* Who to blame */
......
...@@ -32,8 +32,9 @@ ...@@ -32,8 +32,9 @@
/* Decimal 64-bit format module header */ /* Decimal 64-bit format module header */
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
#if !defined(DECIMAL64) #ifndef DECIMAL64_H
#define DECIMAL64 #define DECIMAL64_H
#define DEC64NAME "decimal64" /* Short name */ #define DEC64NAME "decimal64" /* Short name */
#define DEC64FULLNAME "Decimal 64-bit Number" /* Verbose name */ #define DEC64FULLNAME "Decimal 64-bit Number" /* Verbose name */
#define DEC64AUTHOR "Mike Cowlishaw" /* Who to blame */ #define DEC64AUTHOR "Mike Cowlishaw" /* Who to blame */
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
* *
*/ */
#ifndef VHOST_USER_H_ #ifndef VHOST_USER_H
#define VHOST_USER_H_ #define VHOST_USER_H
struct vhost_net; struct vhost_net;
struct vhost_net *vhost_user_get_vhost_net(NetClientState *nc); struct vhost_net *vhost_user_get_vhost_net(NetClientState *nc);
uint64_t vhost_user_get_acked_features(NetClientState *nc); uint64_t vhost_user_get_acked_features(NetClientState *nc);
#endif /* VHOST_USER_H_ */ #endif /* VHOST_USER_H */
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef __QEMU_ACL_H__ #ifndef QEMU_ACL_H
#define __QEMU_ACL_H__ #define QEMU_ACL_H
#include "qemu/queue.h" #include "qemu/queue.h"
...@@ -63,4 +63,4 @@ int qemu_acl_insert(qemu_acl *acl, ...@@ -63,4 +63,4 @@ int qemu_acl_insert(qemu_acl *acl,
int qemu_acl_remove(qemu_acl *acl, int qemu_acl_remove(qemu_acl *acl,
const char *match); const char *match);
#endif /* __QEMU_ACL_H__ */ #endif /* QEMU_ACL_H */
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
* atomic primitive is meant to provide. * atomic primitive is meant to provide.
*/ */
#ifndef __QEMU_ATOMIC_H #ifndef QEMU_ATOMIC_H
#define __QEMU_ATOMIC_H 1 #define QEMU_ATOMIC_H
/* Compiler barrier */ /* Compiler barrier */
#define barrier() ({ asm volatile("" ::: "memory"); (void)0; }) #define barrier() ({ asm volatile("" ::: "memory"); (void)0; })
...@@ -366,4 +364,4 @@ ...@@ -366,4 +364,4 @@
#define atomic_or(ptr, n) ((void) __sync_fetch_and_or(ptr, n)) #define atomic_or(ptr, n) ((void) __sync_fetch_and_or(ptr, n))
#endif /* __ATOMIC_RELAXED */ #endif /* __ATOMIC_RELAXED */
#endif /* __QEMU_ATOMIC_H */ #endif /* QEMU_ATOMIC_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QEMU_BASE64_H__ #ifndef QEMU_BASE64_H
#define QEMU_BASE64_H__ #define QEMU_BASE64_H
#include "qemu-common.h" #include "qemu-common.h"
...@@ -55,4 +55,4 @@ uint8_t *qbase64_decode(const char *input, ...@@ -55,4 +55,4 @@ uint8_t *qbase64_decode(const char *input,
Error **errp); Error **errp);
#endif /* QEMU_BUFFER_H__ */ #endif /* QEMU_BASE64_H */
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* *
*/ */
#ifndef QEMU_BUFFER_H__ #ifndef QEMU_BUFFER_H
#define QEMU_BUFFER_H__ #define QEMU_BUFFER_H
#include "qemu-common.h" #include "qemu-common.h"
...@@ -158,4 +158,4 @@ void buffer_move_empty(Buffer *to, Buffer *from); ...@@ -158,4 +158,4 @@ void buffer_move_empty(Buffer *to, Buffer *from);
*/ */
void buffer_move(Buffer *to, Buffer *from); void buffer_move(Buffer *to, Buffer *from);
#endif /* QEMU_BUFFER_H__ */ #endif /* QEMU_BUFFER_H */
#ifndef QEMU_MMAP_ALLOC #ifndef QEMU_MMAP_ALLOC_H
#define QEMU_MMAP_ALLOC #define QEMU_MMAP_ALLOC_H
#include "qemu-common.h" #include "qemu-common.h"
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
* @(#)queue.h 8.5 (Berkeley) 8/20/94 * @(#)queue.h 8.5 (Berkeley) 8/20/94
*/ */
#ifndef QEMU_SYS_QUEUE_H_ #ifndef QEMU_SYS_QUEUE_H
#define QEMU_SYS_QUEUE_H_ #define QEMU_SYS_QUEUE_H
/* /*
* This file defines four types of data structures: singly-linked lists, * This file defines four types of data structures: singly-linked lists,
...@@ -436,4 +436,4 @@ struct { \ ...@@ -436,4 +436,4 @@ struct { \
#define QTAILQ_PREV(elm, headname, field) \ #define QTAILQ_PREV(elm, headname, field) \
(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
#endif /* !QEMU_SYS_QUEUE_H_ */ #endif /* QEMU_SYS_QUEUE_H */
#ifndef __QEMU_THREAD_POSIX_H #ifndef QEMU_THREAD_POSIX_H
#define __QEMU_THREAD_POSIX_H 1 #define QEMU_THREAD_POSIX_H
#include <pthread.h> #include <pthread.h>
#include <semaphore.h> #include <semaphore.h>
......
#ifndef __QEMU_THREAD_WIN32_H #ifndef QEMU_THREAD_WIN32_H
#define __QEMU_THREAD_WIN32_H 1 #define QEMU_THREAD_WIN32_H
#include <windows.h> #include <windows.h>
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册