+1 -1

authz/base.c

··· 20 20 21 21 #include "qemu/osdep.h" 22 22 #include "authz/base.h" 23 23 - #include "authz/trace.h" 23 23 + #include "trace.h" 24 24 25 25 bool qauthz_is_allowed(QAuthZ *authz, 26 26 const char *identity,

+1 -1

authz/list.c

··· 20 20 21 21 #include "qemu/osdep.h" 22 22 #include "authz/list.h" 23 23 - #include "authz/trace.h" 23 23 + #include "trace.h" 24 24 #include "qom/object_interfaces.h" 25 25 #include "qapi/qapi-visit-authz.h" 26 26

+1 -1

authz/listfile.c

··· 20 20 21 21 #include "qemu/osdep.h" 22 22 #include "authz/listfile.h" 23 23 - #include "authz/trace.h" 23 23 + #include "trace.h" 24 24 #include "qemu/error-report.h" 25 25 #include "qemu/main-loop.h" 26 26 #include "qemu/sockets.h"

+1 -1

authz/pamacct.c

··· 20 20 21 21 #include "qemu/osdep.h" 22 22 #include "authz/pamacct.h" 23 23 - #include "authz/trace.h" 23 23 + #include "trace.h" 24 24 #include "qom/object_interfaces.h" 25 25 26 26 #include <security/pam_appl.h>

+1 -1

authz/simple.c

··· 20 20 21 21 #include "qemu/osdep.h" 22 22 #include "authz/simple.h" 23 23 - #include "authz/trace.h" 23 23 + #include "trace.h" 24 24 #include "qom/object_interfaces.h" 25 25 26 26 static bool qauthz_simple_is_allowed(QAuthZ *authz,

+3 -3

block/crypto.h

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

+1 -2

contrib/elf2dmp/main.c

··· 5 5 * 6 6 */ 7 7 8 8 - #include <inttypes.h> 8 8 + #include "qemu/osdep.h" 9 9 10 10 - #include "qemu/osdep.h" 11 10 #include "err.h" 12 11 #include "addrspace.h" 13 12 #include "pe.h"

+1 -2

contrib/elf2dmp/pdb.c

··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 21 - #include <inttypes.h> 21 21 + #include "qemu/osdep.h" 22 22 23 23 - #include "qemu/osdep.h" 24 23 #include "pdb.h" 25 24 #include "err.h" 26 25

+3 -3

contrib/elf2dmp/qemu_elf.h

··· 5 5 * 6 6 */ 7 7 8 8 - #ifndef ELF2DMP_ELF_H 9 9 - #define ELF2DMP_ELF_H 8 8 + #ifndef EMPF2DMP_QEMU_ELF_H 9 9 + #define EMPF2DMP_QEMU_ELF_H 10 10 11 11 #include "elf.h" 12 12 ··· 47 47 Elf64_Phdr *elf64_getphdr(void *map); 48 48 Elf64_Half elf_getphdrnum(void *map); 49 49 50 50 - #endif /* ELF2DMP_ELF_H */ 50 50 + #endif /* ELF2DMP_QEMU_ELF_H */

+9 -9

contrib/rdmacm-mux/main.c

··· 14 14 */ 15 15 16 16 #include "qemu/osdep.h" 17 17 - #include "sys/poll.h" 18 18 - #include "sys/ioctl.h" 19 19 - #include "pthread.h" 20 20 - #include "syslog.h" 17 17 + #include <sys/poll.h> 18 18 + #include <sys/ioctl.h> 19 19 + #include <pthread.h> 20 20 + #include <syslog.h> 21 21 22 22 - #include "infiniband/verbs.h" 23 23 - #include "infiniband/umad.h" 24 24 - #include "infiniband/umad_types.h" 25 25 - #include "infiniband/umad_sa.h" 26 26 - #include "infiniband/umad_cm.h" 22 22 + #include <infiniband/verbs.h> 23 23 + #include <infiniband/umad.h> 24 24 + #include <infiniband/umad_types.h> 25 25 + #include <infiniband/umad_sa.h> 26 26 + #include <infiniband/umad_cm.h> 27 27 28 28 #include "rdmacm-mux.h" 29 29

+3 -3

contrib/rdmacm-mux/rdmacm-mux.h

··· 17 17 #define RDMACM_MUX_H 18 18 19 19 #include "linux/if.h" 20 20 - #include "infiniband/verbs.h" 21 21 - #include "infiniband/umad.h" 22 22 - #include "rdma/rdma_user_cm.h" 20 20 + #include <infiniband/verbs.h> 21 21 + #include <infiniband/umad.h> 22 22 + #include <rdma/rdma_user_cm.h> 23 23 24 24 typedef enum RdmaCmMuxMsgType { 25 25 RDMACM_MUX_MSG_TYPE_REQ = 0,

+2 -2

disas/nanomips.h

··· 20 20 * 21 21 */ 22 22 23 23 - #ifndef NANOMIPS_DISASSEMBLER_H 24 24 - #define NANOMIPS_DISASSEMBLER_H 23 23 + #ifndef DISAS_NANOMIPS_H 24 24 + #define DISAS_NANOMIPS_H 25 25 26 26 #include <string> 27 27

+4 -3

fsdev/qemu-fsdev-throttle.h

··· 12 12 * 13 13 */ 14 14 15 15 - #ifndef _FSDEV_THROTTLE_H 16 16 - #define _FSDEV_THROTTLE_H 15 15 + #ifndef QEMU_FSDEV_THROTTLE_H 16 16 + #define QEMU_FSDEV_THROTTLE_H 17 17 18 18 #include "block/aio.h" 19 19 #include "qemu/main-loop.h" ··· 35 35 struct iovec *, int); 36 36 37 37 void fsdev_throttle_cleanup(FsThrottle *); 38 38 - #endif /* _FSDEV_THROTTLE_H */ 38 38 + 39 39 + #endif /* QEMU_FSDEV_THROTTLE_H */

+2 -2

hw/arm/smmuv3-internal.h

··· 18 18 * with this program; if not, see <http://www.gnu.org/licenses/>. 19 19 */ 20 20 21 21 - #ifndef HW_ARM_SMMU_V3_INTERNAL_H 22 22 - #define HW_ARM_SMMU_V3_INTERNAL_H 21 21 + #ifndef HW_ARM_SMMUV3_INTERNAL_H 22 22 + #define HW_ARM_SMMUV3_INTERNAL_H 23 23 24 24 #include "hw/arm/smmu-common.h" 25 25

+1

hw/display/ati.c

··· 16 16 * No 3D at all yet (maybe after 2D works, but feel free to improve it) 17 17 */ 18 18 19 19 + #include "qemu/osdep.h" 19 20 #include "ati_int.h" 20 21 #include "ati_regs.h" 21 22 #include "vga_regs.h"

+1

hw/display/ati_2d.c

··· 7 7 * This work is licensed under the GNU GPL license version 2 or later. 8 8 */ 9 9 10 10 + #include "qemu/osdep.h" 10 11 #include "ati_int.h" 11 12 #include "ati_regs.h" 12 13 #include "qemu/log.h"

+1

hw/display/ati_dbg.c

··· 1 1 + #include "qemu/osdep.h" 1 2 #include "ati_int.h" 2 3 3 4 #ifdef DEBUG_ATI

-1

hw/display/ati_int.h

··· 9 9 #ifndef ATI_INT_H 10 10 #define ATI_INT_H 11 11 12 12 - #include "qemu/osdep.h" 13 12 #include "hw/pci/pci.h" 14 13 #include "vga_int.h" 15 14

+3 -3

hw/display/vga_regs.h

··· 14 14 * 15 15 */ 16 16 17 17 - #ifndef LINUX_VIDEO_VGA_H 18 18 - #define LINUX_VIDEO_VGA_H 17 17 + #ifndef HW_VGA_REGS_H 18 18 + #define HW_VGA_REGS_H 19 19 20 20 /* Some of the code below is taken from SVGAlib. The original, 21 21 unmodified copyright notice for that code is below. */ ··· 156 156 /* VGA graphics controller bit masks */ 157 157 #define VGA_GR06_GRAPHICS_MODE 0x01 158 158 159 159 - #endif /* LINUX_VIDEO_VGA_H */ 159 159 + #endif /* HW_VGA_REGS_H */

+2 -2

hw/i386/amd_iommu.h

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

+1 -1

hw/ide/ahci_internal.h

··· 394 394 395 395 #define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI) 396 396 397 397 - #endif /* HW_IDE_AHCI_H */ 397 397 + #endif /* HW_IDE_AHCI_INTERNAL_H */

-1

hw/rdma/rdma_utils.h

··· 20 20 #include "qemu/error-report.h" 21 21 #include "hw/pci/pci.h" 22 22 #include "sysemu/dma.h" 23 23 - #include "stdio.h" 24 23 25 24 #define rdma_error_report(fmt, ...) \ 26 25 error_report("%s: " fmt, "rdma", ## __VA_ARGS__)

+2 -2

hw/rdma/vmw/pvrdma_qp_ops.h

··· 13 13 * 14 14 */ 15 15 16 16 - #ifndef PVRDMA_QP_H 17 17 - #define PVRDMA_QP_H 16 16 + #ifndef PVRDMA_QP_OPS_H 17 17 + #define PVRDMA_QP_OPS_H 18 18 19 19 #include "pvrdma.h" 20 20

+3 -2

hw/sd/sdmmc-internal.h

··· 7 7 * See the COPYING file in the top-level directory. 8 8 * SPDX-License-Identifier: GPL-2.0-or-later 9 9 */ 10 10 - #ifndef SD_INTERNAL_H 11 11 - #define SD_INTERNAL_H 10 10 + 11 11 + #ifndef SDMMC_INTERNAL_H 12 12 + #define SDMMC_INTERNAL_H 12 13 13 14 #define SDMMC_CMD_MAX 64 14 15

+2 -1

hw/timer/m48t59-internal.h

··· 22 22 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 23 23 * THE SOFTWARE. 24 24 */ 25 25 + 25 26 #ifndef HW_M48T59_INTERNAL_H 26 26 - #define HW_M48T59_INTERNAL_H 1 27 27 + #define HW_M48T59_INTERNAL_H 27 28 28 29 #define M48T59_DEBUG 0 29 30

+4 -3

hw/tpm/tpm_ioctl.h

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

+2 -2

hw/xtensa/xtensa_memory.h

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

+3 -4

include/authz/base.h

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

+3 -4

include/authz/list.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QAUTHZ_LIST_H__ 22 22 - #define QAUTHZ_LIST_H__ 21 21 + #ifndef QAUTHZ_LIST_H 22 22 + #define QAUTHZ_LIST_H 23 23 24 24 #include "authz/base.h" 25 25 #include "qapi/qapi-types-authz.h" ··· 102 102 const char *match); 103 103 104 104 105 105 - #endif /* QAUTHZ_LIST_H__ */ 106 106 - 105 105 + #endif /* QAUTHZ_LIST_H */

+3 -5

include/authz/listfile.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QAUTHZ_LIST_FILE_H__ 22 22 - #define QAUTHZ_LIST_FILE_H__ 21 21 + #ifndef QAUTHZ_LISTFILE_H 22 22 + #define QAUTHZ_LISTFILE_H 23 23 24 24 #include "authz/list.h" 25 25 #include "qapi/qapi-types-authz.h" ··· 106 106 bool refresh, 107 107 Error **errp); 108 108 109 109 - 110 110 - #endif /* QAUTHZ_LIST_FILE_H__ */ 111 111 - 109 109 + #endif /* QAUTHZ_LISTFILE_H */

+3 -4

include/authz/pamacct.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QAUTHZ_PAM_H__ 22 22 - #define QAUTHZ_PAM_H__ 21 21 + #ifndef QAUTHZ_PAMACCT_H 22 22 + #define QAUTHZ_PAMACCT_H 23 23 24 24 #include "authz/base.h" 25 25 ··· 96 96 const char *service, 97 97 Error **errp); 98 98 99 99 - 100 100 - #endif /* QAUTHZ_PAM_H__ */ 99 99 + #endif /* QAUTHZ_PAMACCT_H */

+3 -4

include/authz/simple.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QAUTHZ_SIMPLE_H__ 22 22 - #define QAUTHZ_SIMPLE_H__ 21 21 + #ifndef QAUTHZ_SIMPLE_H 22 22 + #define QAUTHZ_SIMPLE_H 23 23 24 24 #include "authz/base.h" 25 25 ··· 80 80 Error **errp); 81 81 82 82 83 83 - #endif /* QAUTHZ_SIMPLE_H__ */ 84 84 - 83 83 + #endif /* QAUTHZ_SIMPLE_H */

+1 -1

include/block/aio-wait.h

··· 124 124 */ 125 125 void aio_wait_bh_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque); 126 126 127 127 - #endif /* QEMU_AIO_WAIT */ 127 127 + #endif /* QEMU_AIO_WAIT_H */

+2 -2

include/chardev/spice.h

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

+1 -1

include/disas/capstone.h

··· 1 1 #ifndef QEMU_CAPSTONE_H 2 2 - #define QEMU_CAPSTONE_H 1 2 2 + #define QEMU_CAPSTONE_H 3 3 4 4 #ifdef CONFIG_CAPSTONE 5 5

+1 -1

include/exec/translator.h

··· 142 142 143 143 void translator_loop_temp_check(DisasContextBase *db); 144 144 145 145 - #endif /* EXEC__TRANSLATOR_H */ 145 145 + #endif /* EXEC__TRANSLATOR_H */

-1

include/hw/arm/nrf51_soc.h

··· 53 53 } NRF51State; 54 54 55 55 #endif 56 56 -

+1 -1

include/hw/arm/smmu-common.h

··· 163 163 /* Unmap the range of all the notifiers registered to @mr */ 164 164 void smmu_inv_notifiers_mr(IOMMUMemoryRegion *mr); 165 165 166 166 - #endif /* HW_ARM_SMMU_COMMON */ 166 166 + #endif /* HW_ARM_SMMU_COMMON_H */

+2 -2

include/hw/audio/soundhw.h

··· 1 1 - #ifndef HW_AUDIO_H 2 2 - #define HW_AUDIO_H 1 1 + #ifndef HW_SOUNDHW_H 2 2 + #define HW_SOUNDHW_H 3 3 4 4 void isa_register_soundhw(const char *name, const char *descr, 5 5 int (*init_isa)(ISABus *bus));

-1

include/hw/cpu/cluster.h

··· 20 20 #ifndef HW_CPU_CLUSTER_H 21 21 #define HW_CPU_CLUSTER_H 22 22 23 23 - #include "qemu/osdep.h" 24 23 #include "hw/qdev.h" 25 24 26 25 /*

+2 -2

include/hw/i386/x86-iommu.h

··· 17 17 * with this program; if not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #ifndef IOMMU_COMMON_H 21 21 - #define IOMMU_COMMON_H 20 20 + #ifndef HW_I386_X86_IOMMU_H 21 21 + #define HW_I386_X86_IOMMU_H 22 22 23 23 #include "hw/sysbus.h" 24 24 #include "hw/pci/pci.h"

+3 -3

include/hw/intc/heathrow_pic.h

··· 23 23 * THE SOFTWARE. 24 24 */ 25 25 26 26 - #ifndef HEATHROW_H 27 27 - #define HEATHROW_H 26 26 + #ifndef HW_INTC_HEATHROW_PIC_H 27 27 + #define HW_INTC_HEATHROW_PIC_H 28 28 29 29 #define TYPE_HEATHROW "heathrow" 30 30 #define HEATHROW(obj) OBJECT_CHECK(HeathrowState, (obj), TYPE_HEATHROW) ··· 46 46 47 47 #define HEATHROW_NUM_IRQS 64 48 48 49 49 - #endif /* HEATHROW_H */ 49 49 + #endif /* HW_INTC_HEATHROW_PIC_H */

+3 -3

include/hw/intc/xlnx-pmu-iomod-intc.h

··· 22 22 * THE SOFTWARE. 23 23 */ 24 24 25 25 - #ifndef XLNX_PMU_IO_INTC_H 26 26 - #define XLNX_PMU_IO_INTC_H 25 25 + #ifndef HW_INTC_XLNX_PMU_IOMOD_INTC_H 26 26 + #define HW_INTC_XLNX_PMU_IOMOD_INTC_H 27 27 28 28 #include "hw/sysbus.h" 29 29 #include "hw/register.h" ··· 54 54 RegisterInfo regs_info[XLNXPMUIOINTC_R_MAX]; 55 55 } XlnxPMUIOIntc; 56 56 57 57 - #endif /* XLNX_PMU_IO_INTC_H */ 57 57 + #endif /* HW_INTC_XLNX_PMU_IOMOD_INTC_H */

+2 -2

include/hw/misc/armsse-mhu.h

··· 20 20 * + sysbus IRQ 1: interrupt for CPU 1 21 21 */ 22 22 23 23 - #ifndef HW_MISC_SSE_MHU_H 24 24 - #define HW_MISC_SSE_MHU_H 23 23 + #ifndef HW_MISC_ARMSSE_MHU_H 24 24 + #define HW_MISC_ARMSSE_MHU_H 25 25 26 26 #include "hw/sysbus.h" 27 27

+1 -1

include/hw/misc/imx2_wdt.h

··· 30 30 MemoryRegion mmio; 31 31 } IMX2WdtState; 32 32 33 33 - #endif /* IMX7_SNVS_H */ 33 33 + #endif /* IMX2_WDT_H */

+2 -1

include/hw/misc/nrf51_rng.h

··· 30 30 * the COPYING file in the top-level directory. 31 31 * 32 32 */ 33 33 + 33 34 #ifndef NRF51_RNG_H 34 35 #define NRF51_RNG_H 35 36 ··· 80 81 } NRF51RNGState; 81 82 82 83 83 83 - #endif /* NRF51_RNG_H_ */ 84 84 + #endif /* NRF51_RNG_H */

+2 -2

include/hw/net/ne2000-isa.h

··· 7 7 * See the COPYING file in the top-level directory. 8 8 */ 9 9 10 10 - #ifndef HW_NET_NE2K_ISA_H 11 11 - #define HW_NET_NE2K_ISA_H 10 10 + #ifndef HW_NET_NE2000_ISA_H 11 11 + #define HW_NET_NE2000_ISA_H 12 12 13 13 #include "hw/hw.h" 14 14 #include "hw/qdev.h"

+1 -1

include/hw/pci-host/designware.h

··· 99 99 MemoryRegion mmio; 100 100 } DesignwarePCIEHost; 101 101 102 102 - #endif /* DESIGNWARE_H */ 102 102 + #endif /* DESIGNWARE_H */

+2 -2

include/hw/pci-host/sabre.h

··· 1 1 - #ifndef PCI_HOST_APB_H 2 2 - #define PCI_HOST_APB_H 1 1 + #ifndef HW_PCI_HOST_SABRE_H 2 2 + #define HW_PCI_HOST_SABRE_H 3 3 4 4 #include "hw/sparc/sun4u_iommu.h" 5 5

+4 -3

include/hw/ppc/pnv.h

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

+4 -3

include/hw/ppc/pnv_core.h

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

+4 -3

include/hw/ppc/pnv_lpc.h

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

+4 -3

include/hw/ppc/pnv_occ.h

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

+4 -3

include/hw/ppc/pnv_psi.h

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

+4 -3

include/hw/ppc/pnv_xscom.h

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

+4 -3

include/hw/ppc/spapr_ovec.h

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

-1

include/hw/riscv/sifive_plic.h

··· 80 80 uint32_t aperture_size); 81 81 82 82 #endif 83 83 -

+1 -1

include/hw/scsi/emulation.h

··· 1 1 #ifndef HW_SCSI_EMULATION_H 2 2 - #define HW_SCSI_EMULATION_H 1 2 2 + #define HW_SCSI_EMULATION_H 3 3 4 4 typedef struct SCSIBlockLimits { 5 5 bool wsnz;

+2 -2

include/hw/timer/pl031.h

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

+3 -3

include/hw/virtio/vhost-vsock.h

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

+3 -3

include/hw/virtio/virtio-crypto.h

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

+4 -3

include/hw/watchdog/wdt_aspeed.h

··· 6 6 * This code is licensed under the GPL version 2 or later. See the 7 7 * COPYING file in the top-level directory. 8 8 */ 9 9 - #ifndef ASPEED_WDT_H 10 10 - #define ASPEED_WDT_H 9 9 + 10 10 + #ifndef WDT_ASPEED_H 11 11 + #define WDT_ASPEED_H 11 12 12 13 #include "hw/sysbus.h" 13 14 ··· 31 32 uint32_t ext_pulse_width_mask; 32 33 } AspeedWDTState; 33 34 34 34 - #endif /* ASPEED_WDT_H */ 35 35 + #endif /* WDT_ASPEED_H */

+3 -3

include/hw/xen/start_info.h

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

+3 -3

include/hw/xen/xen-legacy-backend.h

··· 1 1 - #ifndef QEMU_HW_XEN_BACKEND_H 2 2 - #define QEMU_HW_XEN_BACKEND_H 1 1 + #ifndef HW_XEN_LEGACY_BACKEND_H 2 2 + #define HW_XEN_LEGACY_BACKEND_H 3 3 4 4 #include "hw/xen/xen_common.h" 5 5 #include "hw/xen/xen_pvdev.h" ··· 101 101 int xen_config_dev_vkbd(int vdev); 102 102 int xen_config_dev_console(int vdev); 103 103 104 104 - #endif /* QEMU_HW_XEN_BACKEND_H */ 104 104 + #endif /* HW_XEN_LEGACY_BACKEND_H */

+2 -2

include/hw/xtensa/mx_pic.h

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

+3 -3

include/hw/xtensa/xtensa-isa.h

··· 22 22 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 23 23 */ 24 24 25 25 - #ifndef XTENSA_LIBISA_H 26 26 - #define XTENSA_LIBISA_H 25 25 + #ifndef HW_XTENSA_XTENSA_ISA_H 26 26 + #define HW_XTENSA_XTENSA_ISA_H 27 27 28 28 #ifdef __cplusplus 29 29 extern "C" { ··· 833 833 #ifdef __cplusplus 834 834 } 835 835 #endif 836 836 - #endif /* XTENSA_LIBISA_H */ 836 836 + #endif /* HW_XTENSA_XTENSA_ISA_H */

+2 -2

include/migration/qemu-file-types.h

··· 22 22 * THE SOFTWARE. 23 23 */ 24 24 25 25 - #ifndef QEMU_FILE_H 26 26 - #define QEMU_FILE_H 25 25 + #ifndef MIGRATION_QEMU_FILE_TYPES_H 26 26 + #define MIGRATION_QEMU_FILE_TYPES_H 27 27 28 28 int qemu_file_get_error(QEMUFile *f); 29 29

+2 -2

include/qemu/drm.h

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

+3 -3

include/qemu/filemonitor.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QEMU_FILE_MONITOR_H 22 22 - #define QEMU_FILE_MONITOR_H 21 21 + #ifndef QEMU_FILEMONITOR_H 22 22 + #define QEMU_FILEMONITOR_H 23 23 24 24 #include "qemu-common.h" 25 25 ··· 125 125 const char *dirpath, 126 126 int64_t id); 127 127 128 128 - #endif /* QEMU_FILE_MONITOR_H */ 128 128 + #endif /* QEMU_FILEMONITOR_H */

+3 -3

include/qemu/jhash.h

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

+1 -1

include/qemu/pmem.h

··· 33 33 34 34 #endif /* CONFIG_LIBPMEM */ 35 35 36 36 - #endif /* !QEMU_PMEM_H */ 36 36 + #endif /* QEMU_PMEM_H */

+1 -1

include/qemu/stats64.h

··· 10 10 */ 11 11 12 12 #ifndef QEMU_STATS64_H 13 13 - #define QEMU_STATS64_H 1 13 13 + #define QEMU_STATS64_H 14 14 15 15 #include "qemu/atomic.h" 16 16

+1 -1

include/qemu/sys_membarrier.h

··· 7 7 */ 8 8 9 9 #ifndef QEMU_SYS_MEMBARRIER_H 10 10 - #define QEMU_SYS_MEMBARRIER_H 1 10 10 + #define QEMU_SYS_MEMBARRIER_H 11 11 12 12 #ifdef CONFIG_MEMBARRIER 13 13 /* Only block reordering at the compiler level in the performance-critical

+1 -1

include/qemu/systemd.h

··· 11 11 */ 12 12 13 13 #ifndef QEMU_SYSTEMD_H 14 14 - #define QEMU_SYSTEMD_H 1 14 14 + #define QEMU_SYSTEMD_H 15 15 16 16 #define FIRST_SOCKET_ACTIVATION_FD 3 /* defined by systemd ABI */ 17 17

+2 -2

include/scsi/constants.h

··· 20 20 * the scsi code for linux. 21 21 */ 22 22 23 23 - #ifndef BLOCK_SCSI_H 24 24 - #define BLOCK_SCSI_H 23 23 + #ifndef SCSI_CONSTANTS_H 24 24 + #define SCSI_CONSTANTS_H 25 25 26 26 /* 27 27 * SCSI opcodes

+1 -1

include/scsi/utils.h

··· 1 1 #ifndef SCSI_UTILS_H 2 2 - #define SCSI_UTILS_H 1 2 2 + #define SCSI_UTILS_H 3 3 4 4 #ifdef CONFIG_LINUX 5 5 #include <scsi/sg.h>

+3 -2

include/sysemu/hvf.h

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

+2 -1

include/ui/kbd-state.h

··· 3 3 * (at your option) any later version. See the COPYING file in the 4 4 * top-level directory. 5 5 */ 6 6 + 6 7 #ifndef QEMU_UI_KBD_STATE_H 7 7 - #define QEMU_UI_KBD_STATE_H 1 8 8 + #define QEMU_UI_KBD_STATE_H 8 9 9 10 #include "qapi/qapi-types-ui.h" 10 11

+2 -2

linux-user/nios2/target_cpu.h

··· 17 17 * License along with this library; if not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #ifndef TARGET_CPU_H 21 21 - #define TARGET_CPU_H 20 20 + #ifndef NIOS2_TARGET_CPU_H 21 21 + #define NIOS2_TARGET_CPU_H 22 22 23 23 static inline void cpu_clone_regs(CPUNios2State *env, target_ulong newsp) 24 24 {

+3 -3

linux-user/nios2/target_signal.h

··· 1 1 - #ifndef TARGET_SIGNAL_H 2 2 - #define TARGET_SIGNAL_H 1 1 + #ifndef NIOS2_TARGET_SIGNAL_H 2 2 + #define NIOS2_TARGET_SIGNAL_H 3 3 4 4 /* this struct defines a stack used during syscall handling */ 5 5 ··· 18 18 19 19 #include "../generic/signal.h" 20 20 21 21 - #endif /* TARGET_SIGNAL_H */ 21 21 + #endif /* NIOS2_TARGET_SIGNAL_H */

+2 -2

linux-user/nios2/target_structs.h

··· 16 16 * You should have received a copy of the GNU Lesser General Public 17 17 * License along with this library; if not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 - #ifndef TARGET_STRUCTS_H 20 20 - #define TARGET_STRUCTS_H 19 19 + #ifndef NIOS2_TARGET_STRUCTS_H 20 20 + #define NIOS2_TARGET_STRUCTS_H 21 21 22 22 struct target_ipc_perm { 23 23 abi_int __key; /* Key. */

+3 -3

linux-user/nios2/target_syscall.h

··· 1 1 - #ifndef TARGET_SYSCALL_H 2 2 - #define TARGET_SYSCALL_H 1 1 + #ifndef NIOS2_TARGET_SYSCALL_H 2 2 + #define NIOS2_TARGET_SYSCALL_H 3 3 4 4 #define UNAME_MACHINE "nios2" 5 5 #define UNAME_MINIMUM_RELEASE "3.19.0" ··· 34 34 #define TARGET_MLOCKALL_MCL_CURRENT 1 35 35 #define TARGET_MLOCKALL_MCL_FUTURE 2 36 36 37 37 - #endif /* TARGET_SYSCALL_H */ 37 37 + #endif /* NIOS2_TARGET_SYSCALL_H */

+2 -2

linux-user/riscv/target_cpu.h

··· 1 1 - #ifndef TARGET_CPU_H 2 2 - #define TARGET_CPU_H 1 1 + #ifndef RISCV_TARGET_CPU_H 2 2 + #define RISCV_TARGET_CPU_H 3 3 4 4 static inline void cpu_clone_regs(CPURISCVState *env, target_ulong newsp) 5 5 {

+3 -3

linux-user/riscv/target_signal.h

··· 1 1 - #ifndef TARGET_SIGNAL_H 2 2 - #define TARGET_SIGNAL_H 1 1 + #ifndef RISCV_TARGET_SIGNAL_H 2 2 + #define RISCV_TARGET_SIGNAL_H 3 3 4 4 typedef struct target_sigaltstack { 5 5 abi_ulong ss_sp; ··· 15 15 16 16 #include "../generic/signal.h" 17 17 18 18 - #endif /* TARGET_SIGNAL_H */ 18 18 + #endif /* RISCV_TARGET_SIGNAL_H */

+2 -2

linux-user/riscv/target_structs.h

··· 4 4 * This is a copy of ../aarch64/target_structs.h atm. 5 5 * 6 6 */ 7 7 - #ifndef TARGET_STRUCTS_H 8 8 - #define TARGET_STRUCTS_H 7 7 + #ifndef RISCV_TARGET_STRUCTS_H 8 8 + #define RISCV_TARGET_STRUCTS_H 9 9 10 10 struct target_ipc_perm { 11 11 abi_int __key; /* Key. */

+3 -3

linux-user/xtensa/syscall_nr.h

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

+2 -2

linux-user/xtensa/target_structs.h

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

+3 -3

linux-user/xtensa/termbits.h

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

+3 -3

net/colo.h

··· 12 12 * later. See the COPYING file in the top-level directory. 13 13 */ 14 14 15 15 - #ifndef QEMU_COLO_PROXY_H 16 16 - #define QEMU_COLO_PROXY_H 15 15 + #ifndef NET_COLO_H 16 16 + #define NET_COLO_H 17 17 18 18 #include "qemu/jhash.h" 19 19 #include "qemu/timer.h" ··· 103 103 Packet *packet_new(const void *data, int size, int vnet_hdr_len); 104 104 void packet_destroy(void *opaque, void *user_data); 105 105 106 106 - #endif /* QEMU_COLO_PROXY_H */ 106 106 + #endif /* NET_COLO_H */

+2 -2

qga/vss-win32/vss-handles.h

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

+2 -1

scsi/pr-helper.h

··· 23 23 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 24 24 * IN THE SOFTWARE. 25 25 */ 26 26 + 26 27 #ifndef QEMU_PR_HELPER_H 27 27 - #define QEMU_PR_HELPER_H 1 28 28 + #define QEMU_PR_HELPER_H 28 29 29 30 #define PR_HELPER_CDB_SIZE 16 30 31 #define PR_HELPER_SENSE_SIZE 96

+2 -2

target/i386/hax-i386.h

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

+2 -2

target/i386/hax-interface.h

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

+3 -3

target/i386/hax-posix.h

··· 12 12 * 13 13 */ 14 14 15 15 - #ifndef TARGET_I386_HAX_DARWIN_H 16 16 - #define TARGET_I386_HAX_DARWIN_H 15 15 + #ifndef TARGET_I386_HAX_POSIX_H 16 16 + #define TARGET_I386_HAX_POSIX_H 17 17 18 18 #include <sys/ioctl.h> 19 19 ··· 58 58 #define HAX_VCPU_SET_REGS _IOWR(0, 0xc7, struct vcpu_state_t) 59 59 #define HAX_VCPU_GET_REGS _IOWR(0, 0xc8, struct vcpu_state_t) 60 60 61 61 - #endif /* TARGET_I386_HAX_DARWIN_H */ 61 61 + #endif /* TARGET_I386_HAX_POSIX_H */

+2 -2

target/i386/hvf/hvf-i386.h

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

+2 -2

target/i386/hvf/vmcs.h

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

+1 -1

target/i386/hvf/x86.h

··· 17 17 */ 18 18 19 19 #ifndef HVF_X86_H 20 20 - #define HVF_X86_H 1 20 20 + #define HVF_X86_H 21 21 22 22 typedef struct x86_register { 23 23 union {

+1 -1

target/i386/hvf/x86_decode.h

··· 16 16 */ 17 17 18 18 #ifndef HVF_X86_DECODE_H 19 19 - #define HVF_X86_DECODE_H 1 19 19 + #define HVF_X86_DECODE_H 20 20 21 21 #include "cpu.h" 22 22 #include "x86.h"

+1 -1

target/i386/hvf/x86_descr.h

··· 17 17 */ 18 18 19 19 #ifndef HVF_X86_DESCR_H 20 20 - #define HVF_X86_DESCR_H 1 20 20 + #define HVF_X86_DESCR_H 21 21 22 22 #include "x86.h" 23 23

+3 -2

target/i386/hvf/x86_emu.h

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

+4 -3

target/i386/hvf/x86_flags.h

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

+4 -3

target/i386/hvf/x86_mmu.h

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

+4 -2

target/i386/hvf/x86_task.h

··· 11 11 * You should have received a copy of the GNU General Public License along 12 12 * with this program; if not, see <http://www.gnu.org/licenses/>. 13 13 */ 14 14 - #ifndef HVF_TASK 15 15 - #define HVF_TASK 14 14 + 15 15 + #ifndef HVF_X86_TASK_H 16 16 + #define HVF_X86_TASK_H 17 17 + 16 18 void vmx_handle_task_switch(CPUState *cpu, x68_segment_selector tss_sel, 17 19 int reason, bool gate_valid, uint8_t gate, uint64_t gate_type); 18 20 #endif

+1 -1

target/i386/whp-dispatch.h

··· 1 1 - #include "windows.h" 1 1 + #include <windows.h> 2 2 3 3 #include <WinHvPlatform.h> 4 4 #include <WinHvEmulation.h>

-1

target/i386/whpx-all.c

··· 13 13 #include "exec/address-spaces.h" 14 14 #include "exec/ioport.h" 15 15 #include "qemu-common.h" 16 16 - #include "strings.h" 17 16 #include "sysemu/accel.h" 18 17 #include "sysemu/whpx.h" 19 18 #include "sysemu/sysemu.h"

+4 -3

target/nios2/cpu.h

··· 17 17 * License along with this library; if not, see 18 18 * <http://www.gnu.org/licenses/lgpl-2.1.html> 19 19 */ 20 20 - #ifndef CPU_NIOS2_H 21 21 - #define CPU_NIOS2_H 20 20 + 21 21 + #ifndef NIOS2_CPU_H 22 22 + #define NIOS2_CPU_H 22 23 23 24 #include "qemu-common.h" 24 25 ··· 270 271 *flags = (env->regs[CR_STATUS] & (CR_STATUS_EH | CR_STATUS_U)); 271 272 } 272 273 273 273 - #endif /* CPU_NIOS2_H */ 274 274 + #endif /* NIOS2_CPU_H */

+4 -3

target/nios2/mmu.h

··· 17 17 * License along with this library; if not, see 18 18 * <http://www.gnu.org/licenses/lgpl-2.1.html> 19 19 */ 20 20 - #ifndef MMU_NIOS2_H 21 21 - #define MMU_NIOS2_H 20 20 + 21 21 + #ifndef NIOS2_MMU_H 22 22 + #define NIOS2_MMU_H 22 23 23 24 typedef struct Nios2TLBEntry { 24 25 target_ulong tag; ··· 47 48 void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v); 48 49 void mmu_init(CPUNios2State *env); 49 50 50 50 - #endif /* MMU_NIOS2_H */ 51 51 + #endif /* NIOS2_MMU_H */

+3 -3

target/ppc/mmu-book3s-v3.h

··· 17 17 * License along with this library; if not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #ifndef MMU_BOOOK3S_V3_H 21 21 - #define MMU_BOOOK3S_V3_H 20 20 + #ifndef PPC_MMU_BOOK3S_V3_H 21 21 + #define PPC_MMU_BOOK3S_V3_H 22 22 23 23 #include "mmu-hash64.h" 24 24 ··· 118 118 119 119 #endif /* CONFIG_USER_ONLY */ 120 120 121 121 - #endif /* MMU_BOOOK3S_V3_H */ 121 121 + #endif /* PPC_MMU_BOOK3S_V3_H */

+2 -2

target/riscv/pmp.h

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

+3 -3

target/sparc/asi.h

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

+3 -5

target/xtensa/core-de212/core-isa.h

··· 28 28 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 29 29 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 30 30 31 31 - #ifndef _XTENSA_CORE_CONFIGURATION_H 32 32 - #define _XTENSA_CORE_CONFIGURATION_H 33 33 - 31 31 + #ifndef XTENSA_CORE_DE212_CORE_ISA_H 32 32 + #define XTENSA_CORE_DE212_CORE_ISA_H 34 33 35 34 /**************************************************************************** 36 35 Parameters Useful for Any Code, USER or PRIVILEGED ··· 618 617 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ 619 618 620 619 621 621 - #endif /* _XTENSA_CORE_CONFIGURATION_H */ 622 622 - 620 620 + #endif /* XTENSA_CORE_DE212_CORE_ISA_H */

+3 -5

target/xtensa/core-sample_controller/core-isa.h

··· 28 28 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 29 29 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 30 30 31 31 - #ifndef _XTENSA_CORE_CONFIGURATION_H 32 32 - #define _XTENSA_CORE_CONFIGURATION_H 33 33 - 31 31 + #ifndef XTENSA_CORE_SAMPLE_CONTROLLER_CORE_ISA_H 32 32 + #define XTENSA_CORE_SAMPLE_CONTROLLER_CORE_ISA_H 34 33 35 34 /**************************************************************************** 36 35 Parameters Useful for Any Code, USER or PRIVILEGED ··· 640 639 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ 641 640 642 641 643 643 - #endif /* _XTENSA_CORE_CONFIGURATION_H */ 644 644 - 642 642 + #endif /* XTENSA_CORE_SAMPLE_CONTROLLER_CORE_ISA_H */

+3 -5

target/xtensa/core-test_kc705_be/core-isa.h

··· 28 28 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 29 29 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 30 30 31 31 - #ifndef _XTENSA_CORE_CONFIGURATION_H 32 32 - #define _XTENSA_CORE_CONFIGURATION_H 33 33 - 31 31 + #ifndef XTENSA_CORE_TEST_KC705_BE_CORE_ISA_H 32 32 + #define XTENSA_CORE_TEST_KC705_BE_CORE_ISA_H 34 33 35 34 /**************************************************************************** 36 35 Parameters Useful for Any Code, USER or PRIVILEGED ··· 571 570 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ 572 571 573 572 574 574 - #endif /* _XTENSA_CORE_CONFIGURATION_H */ 575 575 - 573 573 + #endif /* XTENSA_CORE_TEST_KC705_BE_CORE_ISA_H */

+3 -5

target/xtensa/core-test_mmuhifi_c3/core-isa.h

··· 7 7 * Copyright (c) 1999-2009 Tensilica Inc. 8 8 */ 9 9 10 10 - #ifndef _XTENSA_CORE_CONFIGURATION_H 11 11 - #define _XTENSA_CORE_CONFIGURATION_H 12 12 - 10 10 + #ifndef XTENSA_CORE_TEST_MMUHIFI_C3_CORE_ISA_H 11 11 + #define XTENSA_CORE_TEST_MMUHIFI_C3_CORE_ISA_H 13 12 14 13 /**************************************************************************** 15 14 Parameters Useful for Any Code, USER or PRIVILEGED ··· 380 379 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ 381 380 382 381 383 383 - #endif /* _XTENSA_CORE_CONFIGURATION_H */ 384 384 - 382 382 + #endif /* XTENSA_CORE_TEST_MMUHIFI_C3_CORE_ISA_H */

+1 -1

target/xtensa/xtensa-isa-internal.h

··· 228 228 extern xtensa_isa_status xtisa_errno; 229 229 extern char xtisa_error_msg[]; 230 230 231 231 - #endif /* !XTENSA_ISA_INTERNAL_H */ 231 231 + #endif /* XTENSA_ISA_INTERNAL_H */

+1 -1

tests/acpi-utils.h

··· 52 52 const uint8_t *addr_ptr, const char *sig, 53 53 bool verify_checksum); 54 54 55 55 - #endif /* TEST_ACPI_UTILS_H */ 55 55 + #endif /* TEST_ACPI_UTILS_H */

+2 -2

tests/libqos/e1000e.h

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

-4

tests/libqos/qgraph.h

··· 19 19 #ifndef QGRAPH_H 20 20 #define QGRAPH_H 21 21 22 22 - #include <stdio.h> 23 23 - #include <stdlib.h> 24 24 - #include <stdbool.h> 25 22 #include <gmodule.h> 26 26 - #include <glib.h> 27 23 #include "qemu/module.h" 28 24 #include "malloc.h" 29 25

+2 -2

tests/libqos/qgraph_internal.h

··· 16 16 * License along with this library; if not, see <http://www.gnu.org/licenses/> 17 17 */ 18 18 19 19 - #ifndef QGRAPH_EXTRA_H 20 20 - #define QGRAPH_EXTRA_H 19 19 + #ifndef QGRAPH_INTERNAL_H 20 20 + #define QGRAPH_INTERNAL_H 21 21 22 22 /* This header is declaring additional helper functions defined in 23 23 * libqos/qgraph.c

+2 -2

tests/libqos/sdhci.h

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

+4 -3

tests/migration/migration-test.h

··· 4 4 * This work is licensed under the terms of the GNU GPL, version 2 or later. 5 5 * See the COPYING file in the top-level directory. 6 6 */ 7 7 - #ifndef _TEST_MIGRATION_H_ 8 8 - #define _TEST_MIGRATION_H_ 7 7 + 8 8 + #ifndef MIGRATION_TEST_H 9 9 + #define MIGRATION_TEST_H 9 10 10 11 /* Common */ 11 12 #define TEST_MEM_PAGE_SIZE 4096 ··· 31 32 */ 32 33 #define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024) 33 34 34 34 - #endif /* _TEST_MIGRATION_H_ */ 35 35 + #endif /* _MIGRATION_TEST_H */

+1 -1

tests/qos-test.c

··· 16 16 * License along with this library; if not, see <http://www.gnu.org/licenses/> 17 17 */ 18 18 19 19 - #include <getopt.h> 20 19 #include "qemu/osdep.h" 20 20 + #include <getopt.h> 21 21 #include "libqtest.h" 22 22 #include "qapi/qmp/qdict.h" 23 23 #include "qapi/qmp/qbool.h"

+1 -1

tests/tpm-emu.h

··· 36 36 void tpm_emu_test_wait_cond(TestState *s); 37 37 void *tpm_emu_ctrl_thread(void *data); 38 38 39 39 - #endif /* TEST_TPM_EMU_H */ 39 39 + #endif /* TESTS_TPM_EMU_H */