Browse Source

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>
tags/v2.7.0-rc0
Markus Armbruster 3 years ago
parent
commit
2a6a4076e1
141 changed files with 385 additions and 378 deletions
  1. 3
    3
      contrib/ivshmem-client/ivshmem-client.h
  2. 3
    3
      contrib/ivshmem-server/ivshmem-server.h
  3. 3
    3
      crypto/block-luks.h
  4. 3
    3
      crypto/block-qcow.h
  5. 2
    2
      fsdev/9p-iov-marshal.h
  6. 2
    2
      fsdev/9p-marshal.h
  7. 3
    2
      hw/9pfs/9p-proxy.h
  8. 3
    2
      hw/9pfs/9p-xattr.h
  9. 2
    2
      hw/9pfs/9p.h
  10. 2
    2
      hw/9pfs/coth.h
  11. 2
    2
      hw/9pfs/virtio-9p.h
  12. 2
    2
      hw/arm/strongarm.h
  13. 2
    2
      hw/audio/fmopl.h
  14. 3
    3
      hw/block/xen_blkif.h
  15. 3
    3
      hw/core/uboot_image.h
  16. 3
    3
      hw/display/vga.h
  17. 3
    3
      hw/microblaze/boot.h
  18. 4
    3
      hw/net/fsl_etsec/etsec.h
  19. 3
    3
      hw/net/fsl_etsec/registers.h
  20. 3
    3
      hw/net/rocker/rocker.h
  21. 2
    3
      hw/net/rocker/rocker_desc.h
  22. 3
    3
      hw/net/rocker/rocker_fp.h
  23. 3
    3
      hw/net/rocker/rocker_hw.h
  24. 3
    3
      hw/net/rocker/rocker_of_dpa.h
  25. 2
    2
      hw/net/rocker/rocker_tlv.h
  26. 3
    3
      hw/net/rocker/rocker_world.h
  27. 2
    2
      hw/net/vmxnet3.h
  28. 3
    3
      hw/net/vmxnet_debug.h
  29. 4
    3
      hw/ppc/mac.h
  30. 3
    3
      hw/sh4/sh7750_regnames.h
  31. 2
    2
      hw/sh4/sh7750_regs.h
  32. 2
    2
      hw/xtensa/bootparam.h
  33. 3
    3
      include/crypto/afsplit.h
  34. 3
    3
      include/crypto/block.h
  35. 3
    3
      include/crypto/cipher.h
  36. 3
    3
      include/crypto/hash.h
  37. 3
    3
      include/crypto/init.h
  38. 3
    3
      include/crypto/ivgen.h
  39. 3
    3
      include/crypto/pbkdf.h
  40. 3
    3
      include/crypto/random.h
  41. 3
    3
      include/crypto/secret.h
  42. 3
    4
      include/crypto/xts.h
  43. 3
    3
      include/disas/disas.h
  44. 3
    4
      include/elf.h
  45. 2
    2
      include/exec/exec-all.h
  46. 2
    2
      include/exec/tb-context.h
  47. 4
    3
      include/exec/tb-hash-xx.h
  48. 2
    2
      include/exec/tb-hash.h
  49. 3
    4
      include/hw/arm/exynos4210.h
  50. 3
    3
      include/hw/gpio/imx_gpio.h
  51. 3
    3
      include/hw/i2c/i2c-ddc.h
  52. 3
    3
      include/hw/i2c/imx_i2c.h
  53. 3
    3
      include/hw/input/adb.h
  54. 3
    3
      include/hw/intc/mips_gic.h
  55. 3
    3
      include/hw/ppc/openpic.h
  56. 3
    3
      include/hw/ppc/spapr.h
  57. 4
    3
      include/hw/ppc/spapr_drc.h
  58. 4
    3
      include/hw/ppc/spapr_vio.h
  59. 4
    3
      include/hw/ppc/xics.h
  60. 3
    3
      include/hw/s390x/ebcdic.h
  61. 3
    3
      include/hw/s390x/s390_flic.h
  62. 3
    3
      include/hw/s390x/storage-keys.h
  63. 4
    3
      include/hw/sd/sd.h
  64. 3
    3
      include/hw/sh4/sh_intc.h
  65. 3
    3
      include/hw/sparc/grlib.h
  66. 3
    3
      include/hw/timer/mips_gictimer.h
  67. 3
    4
      include/hw/virtio/vhost-backend.h
  68. 5
    3
      include/hw/virtio/virtio-access.h
  69. 2
    2
      include/hw/virtio/virtio-balloon.h
  70. 2
    2
      include/hw/virtio/virtio-blk.h
  71. 3
    3
      include/hw/virtio/virtio-input.h
  72. 2
    2
      include/hw/virtio/virtio-net.h
  73. 2
    2
      include/hw/virtio/virtio-rng.h
  74. 3
    3
      include/hw/virtio/virtio-scsi.h
  75. 3
    2
      include/hw/virtio/virtio-serial.h
  76. 2
    2
      include/hw/virtio/virtio.h
  77. 3
    3
      include/io/channel-buffer.h
  78. 3
    3
      include/io/channel-command.h
  79. 3
    3
      include/io/channel-file.h
  80. 3
    3
      include/io/channel-socket.h
  81. 3
    3
      include/io/channel-tls.h
  82. 3
    3
      include/io/channel-util.h
  83. 3
    3
      include/io/channel-watch.h
  84. 3
    3
      include/io/channel-websock.h
  85. 3
    3
      include/io/channel.h
  86. 3
    3
      include/io/task.h
  87. 3
    2
      include/libdecnumber/decContext.h
  88. 3
    2
      include/libdecnumber/decNumber.h
  89. 3
    2
      include/libdecnumber/dpd/decimal128.h
  90. 3
    2
      include/libdecnumber/dpd/decimal32.h
  91. 3
    2
      include/libdecnumber/dpd/decimal64.h
  92. 3
    3
      include/net/vhost-user.h
  93. 3
    3
      include/qemu/acl.h
  94. 3
    5
      include/qemu/atomic.h
  95. 3
    3
      include/qemu/base64.h
  96. 3
    3
      include/qemu/buffer.h
  97. 2
    2
      include/qemu/mmap-alloc.h
  98. 3
    3
      include/qemu/queue.h
  99. 2
    2
      include/qemu/thread-posix.h
  100. 2
    2
      include/qemu/thread-win32.h
  101. 2
    2
      include/qemu/thread.h
  102. 2
    2
      include/sysemu/balloon.h
  103. 3
    3
      include/sysemu/device_tree.h
  104. 2
    2
      linux-user/arm/nwfpe/fpa11.h
  105. 2
    2
      linux-user/arm/nwfpe/fpopcode.h
  106. 2
    2
      linux-user/arm/nwfpe/fpsr.h
  107. 3
    2
      linux-user/linux_loop.h
  108. 2
    2
      linux-user/tilegx/syscall_nr.h
  109. 2
    2
      qemu-options.h
  110. 2
    2
      slirp/if.h
  111. 2
    2
      slirp/ip.h
  112. 2
    2
      slirp/ip6.h
  113. 2
    2
      slirp/ip_icmp.h
  114. 2
    2
      slirp/libslirp.h
  115. 2
    2
      slirp/mbuf.h
  116. 2
    2
      slirp/misc.h
  117. 2
    2
      slirp/sbuf.h
  118. 3
    3
      slirp/socket.h
  119. 2
    2
      slirp/tcp.h
  120. 2
    2
      slirp/tcp_timer.h
  121. 2
    2
      slirp/tcp_var.h
  122. 2
    2
      slirp/tcpip.h
  123. 2
    2
      slirp/udp.h
  124. 2
    2
      target-i386/svm.h
  125. 3
    3
      target-mips/kvm_mips.h
  126. 3
    3
      target-mips/mips-defs.h
  127. 3
    3
      target-ppc/helper_regs.h
  128. 3
    3
      target-ppc/kvm_ppc.h
  129. 3
    3
      target-ppc/mmu-hash32.h
  130. 3
    3
      target-ppc/mmu-hash64.h
  131. 3
    3
      target-tricore/tricore-defs.h
  132. 3
    3
      tests/boot-sector.h
  133. 2
    2
      tests/libqos/ahci.h
  134. 2
    2
      tests/libqos/libqos-pc.h
  135. 2
    2
      tests/libqos/libqos.h
  136. 3
    3
      ui/keymaps.h
  137. 3
    3
      ui/sdl_zoom.h
  138. 3
    6
      ui/vnc-auth-sasl.h
  139. 3
    4
      ui/vnc-auth-vencrypt.h
  140. 3
    3
      ui/vnc-ws.h
  141. 3
    3
      ui/vnc.h

+ 3
- 3
contrib/ivshmem-client/ivshmem-client.h View File

@@ -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 */

+ 3
- 3
contrib/ivshmem-server/ivshmem-server.h View File

@@ -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 */

+ 3
- 3
crypto/block-luks.h View File

@@ -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 */

+ 3
- 3
crypto/block-qcow.h View File

@@ -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 */

+ 2
- 2
fsdev/9p-iov-marshal.h View File

@@ -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"


+ 2
- 2
fsdev/9p-marshal.h View File

@@ -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
{

+ 3
- 2
hw/9pfs/9p-proxy.h View File

@@ -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

+ 3
- 2
hw/9pfs/9p-xattr.h View File

@@ -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"


+ 2
- 2
hw/9pfs/9p.h View File

@@ -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>

+ 2
- 2
hw/9pfs/coth.h View File

@@ -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"

+ 2
- 2
hw/9pfs/virtio-9p.h View File

@@ -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"

+ 2
- 2
hw/arm/strongarm.h View File

@@ -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"

+ 2
- 2
hw/audio/fmopl.h View File

@@ -1,5 +1,5 @@
#ifndef __FMOPL_H_
#define __FMOPL_H_
#ifndef FMOPL_H
#define FMOPL_H

/* --- select emulation chips --- */
#define BUILD_YM3812 (HAS_YM3812)

+ 3
- 3
hw/block/xen_blkif.h View File

@@ -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 */

+ 3
- 3
hw/core/uboot_image.h View File

@@ -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 */

+ 3
- 3
hw/display/vga.h View File

@@ -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 */

+ 3
- 3
hw/microblaze/boot.h View File

@@ -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 */

+ 4
- 3
hw/net/fsl_etsec/etsec.h View File

@@ -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 */

+ 3
- 3
hw/net/fsl_etsec/registers.h View File

@@ -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 */

+ 3
- 3
hw/net/rocker/rocker.h View File

@@ -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 */

+ 2
- 3
hw/net/rocker/rocker_desc.h View File

@@ -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"


+ 3
- 3
hw/net/rocker/rocker_fp.h View File

@@ -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 */

+ 3
- 3
hw/net/rocker/rocker_hw.h View File

@@ -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 */

+ 3
- 3
hw/net/rocker/rocker_of_dpa.h View File

@@ -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 */

+ 2
- 2
hw/net/rocker/rocker_tlv.h View File

@@ -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) \

+ 3
- 3
hw/net/rocker/rocker_world.h View File

@@ -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 */

+ 2
- 2
hw/net/vmxnet3.h View File

@@ -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 */

+ 3
- 3
hw/net/vmxnet_debug.h View File

@@ -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 */

+ 4
- 3
hw/ppc/mac.h View File

@@ -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 */

+ 3
- 3
hw/sh4/sh7750_regnames.h View File

@@ -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 */

+ 2
- 2
hw/sh4/sh7750_regs.h View File

@@ -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

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

@@ -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) */

+ 3
- 3
include/crypto/afsplit.h View File

@@ -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 */

+ 3
- 3
include/crypto/block.h View File

@@ -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 */

+ 3
- 3
include/crypto/cipher.h View File

@@ -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 */

+ 3
- 3
include/crypto/hash.h View File

@@ -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 */

+ 3
- 3
include/crypto/init.h View File

@@ -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 */

+ 3
- 3
include/crypto/ivgen.h View File

@@ -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 */

+ 3
- 3
include/crypto/pbkdf.h View File

@@ -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 */

+ 3
- 3
include/crypto/random.h View File

@@ -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 */

+ 3
- 3
include/crypto/secret.h View File

@@ -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 */

+ 3
- 4
include/crypto/xts.h View File

@@ -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 */

+ 3
- 3
include/disas/disas.h View File

@@ -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 */

+ 3
- 4
include/elf.h View File

@@ -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 */

+ 2
- 2
include/exec/exec-all.h View File

@@ -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"

+ 2
- 2
include/exec/tb-context.h View File

@@ -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"

+ 4
- 3
include/exec/tb-hash-xx.h View File

@@ -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 */

+ 2
- 2
include/exec/tb-hash.h View File

@@ -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"


+ 3
- 4
include/hw/arm/exynos4210.h View File

@@ -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 */

+ 3
- 3
include/hw/gpio/imx_gpio.h View File

@@ -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 */

+ 3
- 3
include/hw/i2c/i2c-ddc.h View File

@@ -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 */

+ 3
- 3
include/hw/i2c/imx_i2c.h View File

@@ -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 */

+ 3
- 3
include/hw/input/adb.h View File

@@ -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 */

+ 3
- 3
include/hw/intc/mips_gic.h View File

@@ -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 */

+ 3
- 3
include/hw/ppc/openpic.h View File

@@ -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 */

+ 3
- 3
include/hw/ppc/spapr.h View File

@@ -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 */

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

@@ -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 */

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

@@ -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 */

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

@@ -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 */

+ 3
- 3
include/hw/s390x/ebcdic.h View File

@@ -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 */

+ 3
- 3
include/hw/s390x/s390_flic.h View File

@@ -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 */

+ 3
- 3
include/hw/s390x/storage-keys.h View File

@@ -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 */

+ 4
- 3
include/hw/sd/sd.h View File

@@ -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 */

+ 3
- 3
include/hw/sh4/sh_intc.h View File

@@ -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 */

+ 3
- 3
include/hw/sparc/grlib.h View File

@@ -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 */

+ 3
- 3
include/hw/timer/mips_gictimer.h View File

@@ -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 */

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

@@ -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 */

+ 5
- 3
include/hw/virtio/virtio-access.h View File

@@ -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 */

+ 2
- 2
include/hw/virtio/virtio-balloon.h View File

@@ -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"

+ 2
- 2
include/hw/virtio/virtio-blk.h View File

@@ -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"

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

@@ -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 */

+ 2
- 2
include/hw/virtio/virtio-net.h View File

@@ -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"

+ 2
- 2
include/hw/virtio/virtio-rng.h View File

@@ -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"

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

@@ -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 */

+ 3
- 2
include/hw/virtio/virtio-serial.h View File

@@ -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"

+ 2
- 2
include/hw/virtio/virtio.h View File

@@ -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"

+ 3
- 3
include/io/channel-buffer.h View File

@@ -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 */

+ 3
- 3
include/io/channel-command.h View File

@@ -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 */

+ 3
- 3
include/io/channel-file.h View File

@@ -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 */

+ 3
- 3
include/io/channel-socket.h View File

@@ -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 */

+ 3
- 3
include/io/channel-tls.h View File

@@ -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 */

+ 3
- 3
include/io/channel-util.h View File

@@ -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 */

+ 3
- 3
include/io/channel-watch.h View File

@@ -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 */

+ 3
- 3
include/io/channel-websock.h View File

@@ -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 */

+ 3
- 3
include/io/channel.h View File

@@ -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 */

+ 3
- 3
include/io/task.h View File

@@ -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 */

+ 3
- 2
include/libdecnumber/decContext.h View File

@@ -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 */

+ 3
- 2
include/libdecnumber/decNumber.h View File

@@ -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 */

+ 3
- 2
include/libdecnumber/dpd/decimal128.h View File

@@ -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 */

+ 3
- 2
include/libdecnumber/dpd/decimal32.h View File

@@ -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 */

+ 3
- 2
include/libdecnumber/dpd/decimal64.h View File

@@ -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 */

+ 3
- 3
include/net/vhost-user.h View File

@@ -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 */

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

@@ -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 */

+ 3
- 5
include/qemu/atomic.h View File

@@ -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 */

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

@@ -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 */

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

@@ -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 */

+ 2
- 2
include/qemu/mmap-alloc.h View File

@@ -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"


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

@@ -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 */

+ 2
- 2
include/qemu/thread-posix.h View File

@@ -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>

+ 2
- 2
include/qemu/thread-win32.h View File

@@ -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>


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

@@ -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"

+ 2
- 2
include/sysemu/balloon.h View File

@@ -11,8 +11,8 @@
*
*/

#ifndef _QEMU_BALLOON_H
#define _QEMU_BALLOON_H
#ifndef QEMU_BALLOON_H
#define QEMU_BALLOON_H

#include "qapi-types.h"


+ 3
- 3
include/sysemu/device_tree.h View File

@@ -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 */

+ 2
- 2
linux-user/arm/nwfpe/fpa11.h View File

@@ -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"


+ 2
- 2
linux-user/arm/nwfpe/fpopcode.h View File

@@ -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

+ 2
- 2
linux-user/arm/nwfpe/fpsr.h View File

@@ -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

+ 3
- 2
linux-user/linux_loop.h View File

@@ -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

+ 2
- 2
linux-user/tilegx/syscall_nr.h View File

@@ -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.

+ 2
- 2
qemu-options.h View File

@@ -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

+ 2
- 2
slirp/if.h View File

@@ -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 */

+ 2
- 2
slirp/ip.h View File

@@ -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

+ 2
- 2
slirp/ip6.h View File

@@ -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"


+ 2
- 2
slirp/ip_icmp.h View File

@@ -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.

+ 2
- 2
slirp/libslirp.h View File

@@ -1,5 +1,5 @@
#ifndef _LIBSLIRP_H
#define _LIBSLIRP_H
#ifndef LIBSLIRP_H
#define LIBSLIRP_H

#include "qemu-common.h"


+ 2
- 2
slirp/mbuf.h View File

@@ -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 */


+ 2
- 2
slirp/misc.h View File

@@ -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? */

+ 2
- 2
slirp/sbuf.h View File

@@ -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)

+ 3
- 3
slirp/socket.h View File

@@ -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 */

+ 2
- 2
slirp/tcp.h View File

@@ -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;


+ 2
- 2
slirp/tcp_timer.h View File

@@ -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

+ 2
- 2
slirp/tcp_var.h View File

@@ -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"

+ 2
- 2
slirp/tcpip.h View File

@@ -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.

+ 2
- 2
slirp/udp.h View File

@@ -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

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

@@ -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

+ 3
- 3
target-mips/kvm_mips.h View File

@@ -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 */

+ 3
- 3
target-mips/mips-defs.h View File

@@ -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 */

+ 3
- 3
target-ppc/helper_regs.h View File

@@ -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) { }