mbox

[PULL,00/18] Clean up #include "..." vs <...> and header guards

Message ID 1468333894-419-1-git-send-email-armbru@redhat.com
State New
Headers show

Pull-request

git://repo.or.cz/qemu/armbru.git tags/pull-include-2016-07-12

Message

Markus Armbruster July 12, 2016, 2:31 p.m. UTC
The following changes since commit b35399bb4e9968296a12303b00f9f2066470e987:

  Fix confusing argument names in some common functions (2016-07-12 13:06:08 +0100)

are available in the git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-include-2016-07-12

for you to fetch changes up to 82751a32be872e71c22167234ac88ba52bf96a37:

  cris: Fix broken header guard in hw/cris/boot.h (2016-07-12 16:20:46 +0200)

----------------------------------------------------------------
Clean up #include "..." vs <...> and header guards

----------------------------------------------------------------
Markus Armbruster (18):
      Use #include "..." for our own headers, <...> for others
      scripts: New clean-header-guards.pl
      target-*: Clean up cpu.h header guards
      linux-user: Clean up target_syscall.h header guards
      linux-user: Clean up target_cpu.h header guards
      linux-user: Clean up target_signal.h header guards
      linux-user: Clean up target_structs.h header guards
      linux-user: Clean up hostdep.h header guards
      linux-user: Fix broken header guard in syscall_defs.h
      tcg: Clean up tcg-target.h header guards
      spapr_pci: Include spapr.h instead of playing games with #error
      Drop Emacs local variables lists redundant with .dir-locals.el
      Clean up header guards that don't match their file name
      libdecnumber: Don't fool around with guards to avoid #include
      libdecnumber: Don't error out on decNumberLocal.h re-inclusion
      Clean up ill-advised or unusual header guards
      Clean up decorations and whitespace around header guards
      cris: Fix broken header guard in hw/cris/boot.h

 audio/audio.h                            |   3 +-
 audio/audio_int.h                        |   3 +-
 audio/audio_pt_int.h                     |   2 +-
 audio/mixeng.h                           |   3 +-
 block/iscsi.c                            |   1 -
 bsd-user/i386/target_syscall.h           |   2 +-
 bsd-user/sparc/target_syscall.h          |   2 +-
 bsd-user/sparc64/target_syscall.h        |   2 +-
 bsd-user/x86_64/target_syscall.h         |   2 +-
 contrib/ivshmem-client/ivshmem-client.h  |   6 +-
 contrib/ivshmem-server/ivshmem-server.h  |   6 +-
 crypto/block-luks.h                      |   6 +-
 crypto/block-qcow.h                      |   6 +-
 crypto/blockpriv.h                       |   6 +-
 crypto/hash-gcrypt.c                     |   2 +-
 crypto/ivgenpriv.h                       |   6 +-
 crypto/pbkdf-gcrypt.c                    |   2 +-
 crypto/pbkdf-nettle.c                    |   2 +-
 crypto/tlscredspriv.h                    |   7 +-
 exec.c                                   |   2 +-
 fsdev/9p-iov-marshal.h                   |   4 +-
 fsdev/9p-marshal.h                       |   4 +-
 fsdev/file-op-9p.h                       |   6 +-
 hw/9pfs/9p-proxy.h                       |   5 +-
 hw/9pfs/9p-synth.h                       |   4 +-
 hw/9pfs/9p-xattr.h                       |   5 +-
 hw/9pfs/9p.h                             |   4 +-
 hw/9pfs/coth.h                           |   4 +-
 hw/9pfs/virtio-9p.h                      |   4 +-
 hw/alpha/alpha_sys.h                     |   4 +-
 hw/arm/strongarm.h                       |   4 +-
 hw/audio/fmopl.h                         |   4 +-
 hw/audio/gusemu.h                        |   2 +-
 hw/audio/gustate.h                       |   2 +-
 hw/audio/lm4549.h                        |   2 +-
 hw/audio/pl041.h                         |   2 +-
 hw/block/nvme.c                          |   8 +-
 hw/block/xen_blkif.h                     |   6 +-
 hw/char/sclpconsole.c                    |   2 +-
 hw/core/uboot_image.h                    |   6 +-
 hw/cris/boot.h                           |   4 +-
 hw/display/qxl.h                         |   2 +-
 hw/display/vga.h                         |   6 +-
 hw/display/vga_int.h                     |   5 +-
 hw/display/virtio-gpu-3d.c               |   2 +-
 hw/display/virtio-gpu.c                  |   2 +-
 hw/i386/kvm/i8254.c                      |   3 +-
 hw/i386/kvm/pci-assign.c                 |   3 +-
 hw/ide/ahci.c                            |  14 +-
 hw/ide/cmd646.c                          |  10 +-
 hw/ide/core.c                            |  10 +-
 hw/ide/ich.c                             |  14 +-
 hw/ide/isa.c                             |   8 +-
 hw/ide/macio.c                           |   2 +-
 hw/ide/microdrive.c                      |   8 +-
 hw/ide/mmio.c                            |   2 +-
 hw/ide/pci.c                             |  10 +-
 hw/ide/piix.c                            |  10 +-
 hw/ide/qdev.c                            |   4 +-
 hw/ide/via.c                             |  10 +-
 hw/intc/gic_internal.h                   |   2 +-
 hw/intc/gicv3_internal.h                 |   2 +-
 hw/lm32/lm32.h                           |   2 +-
 hw/lm32/milkymist-hw.h                   |   6 +-
 hw/microblaze/boot.h                     |   6 +-
 hw/misc/hyperv_testdev.c                 |   2 +-
 hw/net/e1000_regs.h                      |   7 +-
 hw/net/fsl_etsec/etsec.h                 |   7 +-
 hw/net/fsl_etsec/registers.h             |   6 +-
 hw/net/ne2000.h                          |   2 +-
 hw/net/pcnet.h                           |   2 +-
 hw/net/rocker/rocker.h                   |   6 +-
 hw/net/rocker/rocker_desc.h              |   5 +-
 hw/net/rocker/rocker_fp.h                |   6 +-
 hw/net/rocker/rocker_hw.h                |   6 +-
 hw/net/rocker/rocker_of_dpa.h            |   6 +-
 hw/net/rocker/rocker_tlv.h               |   4 +-
 hw/net/rocker/rocker_world.h             |   6 +-
 hw/net/vmxnet3.h                         |   4 +-
 hw/net/vmxnet_debug.h                    |   6 +-
 hw/pci-bridge/dec.h                      |   4 +-
 hw/pci-bridge/ioh3420.c                  |   9 --
 hw/pci-bridge/xio3130_downstream.c       |   9 --
 hw/pci-bridge/xio3130_upstream.c         |  10 --
 hw/pci-bridge/xio3130_upstream.h         |   2 +-
 hw/ppc/mac.h                             |   7 +-
 hw/ppc/ppc405.h                          |   6 +-
 hw/ppc/spapr_cpu_core.c                  |   4 +-
 hw/ppc/spapr_pci_vfio.c                  |   2 +-
 hw/s390x/css.c                           |   2 +-
 hw/s390x/s390-pci-bus.c                  |   6 +-
 hw/s390x/s390-pci-bus.h                  |   4 +-
 hw/s390x/s390-pci-inst.c                 |   4 +-
 hw/s390x/s390-pci-inst.h                 |   2 +-
 hw/s390x/s390-virtio.h                   |   2 +-
 hw/s390x/sclpquiesce.c                   |   2 +-
 hw/s390x/virtio-ccw.h                    |  20 +--
 hw/scsi/mfi.h                            |   6 +-
 hw/scsi/vhost-scsi.c                     |   4 +-
 hw/scsi/virtio-scsi-dataplane.c          |   6 +-
 hw/scsi/virtio-scsi.c                    |   6 +-
 hw/scsi/vmw_pvscsi.c                     |   2 +-
 hw/sh4/sh7750_regnames.h                 |   6 +-
 hw/sh4/sh7750_regs.h                     |   4 +-
 hw/tpm/tpm_util.h                        |   7 +-
 hw/usb/hcd-ehci.h                        |   5 +-
 hw/usb/xen-usb.c                         |   2 +-
 hw/vfio/common.c                         |   6 +-
 hw/virtio/vhost-backend.c                |   5 +-
 hw/xen/xen-host-pci-device.h             |   2 +-
 hw/xen/xen_pt.h                          |   2 +-
 hw/xenpv/xen_domainbuild.h               |   2 +-
 hw/xtensa/bootparam.h                    |   4 +-
 include/block/blockjob.h                 |   3 +-
 include/block/scsi.h                     |   5 +-
 include/block/thread-pool.h              |   2 +-
 include/crypto/afsplit.h                 |   6 +-
 include/crypto/block.h                   |   6 +-
 include/crypto/cipher.h                  |   6 +-
 include/crypto/desrfb.h                  |   5 +-
 include/crypto/hash.h                    |   6 +-
 include/crypto/init.h                    |   6 +-
 include/crypto/ivgen.h                   |   6 +-
 include/crypto/pbkdf.h                   |   6 +-
 include/crypto/random.h                  |   6 +-
 include/crypto/secret.h                  |   6 +-
 include/crypto/tlscreds.h                |   7 +-
 include/crypto/tlscredsanon.h            |   7 +-
 include/crypto/tlscredsx509.h            |   7 +-
 include/crypto/tlssession.h              |   6 +-
 include/crypto/xts.h                     |   7 +-
 include/disas/bfd.h                      |   6 +-
 include/disas/disas.h                    |   6 +-
 include/elf.h                            |   7 +-
 include/exec/address-spaces.h            |   4 +-
 include/exec/cpu-common.h                |   4 +-
 include/exec/exec-all.h                  |   4 +-
 include/exec/gen-icount.h                |   2 +-
 include/exec/helper-gen.h                |   4 +-
 include/exec/helper-head.h               |   7 +-
 include/exec/helper-proto.h              |   4 +-
 include/exec/helper-tcg.h                |   4 +-
 include/exec/softmmu-semi.h              |   3 +-
 include/exec/tb-context.h                |   4 +-
 include/exec/tb-hash-xx.h                |   9 +-
 include/exec/tb-hash.h                   |   4 +-
 include/exec/user/abitypes.h             |   5 +-
 include/fpu/softfloat.h                  |   2 +-
 include/hw/acpi/acpi.h                   |   3 +-
 include/hw/acpi/aml-build.h              |   4 +-
 include/hw/acpi/cpu_hotplug.h            |   5 +-
 include/hw/arm/arm.h                     |   6 +-
 include/hw/arm/exynos4210.h              |   7 +-
 include/hw/arm/pxa.h                     |   5 +-
 include/hw/arm/soc_dma.h                 |   3 +-
 include/hw/arm/stm32f205_soc.h           |   4 +-
 include/hw/audio/audio.h                 |   4 +-
 include/hw/audio/pcspk.h                 |   2 +-
 include/hw/block/block.h                 |   4 +-
 include/hw/block/flash.h                 |   2 +-
 include/hw/bt.h                          |   2 +-
 include/hw/char/escc.h                   |   2 +-
 include/hw/char/lm32_juart.h             |   2 +-
 include/hw/char/pl011.h                  |   4 +-
 include/hw/char/serial.h                 |   3 +-
 include/hw/cris/etraxfs.h                |   4 +-
 include/hw/cris/etraxfs_dma.h            |   2 +-
 include/hw/display/dpcd.h                |   2 +-
 include/hw/dma/xlnx_dpdma.h              |   2 +-
 include/hw/empty_slot.h                  |   2 +-
 include/hw/fw-path-provider.h            |   2 +-
 include/hw/gpio/imx_gpio.h               |   8 +-
 include/hw/i2c/i2c-ddc.h                 |   6 +-
 include/hw/i2c/imx_i2c.h                 |   8 +-
 include/hw/i2c/pm_smbus.h                |   2 +-
 include/hw/i386/apic_internal.h          |   3 +-
 include/hw/i386/ioapic.h                 |   2 +-
 include/hw/i386/ioapic_internal.h        |   2 +-
 include/hw/ide/ahci.h                    |   2 +-
 include/hw/ide/internal.h                |   4 +-
 include/hw/ide/pci.h                     |   2 +-
 include/hw/input/adb.h                   |   6 +-
 include/hw/input/ps2.h                   |   2 +-
 include/hw/intc/allwinner-a10-pic.h      |   4 +-
 include/hw/intc/mips_gic.h               |   6 +-
 include/hw/isa/i8257.h                   |   1 -
 include/hw/isa/i8259_internal.h          |   2 +-
 include/hw/misc/arm_integrator_debug.h   |   5 +-
 include/hw/misc/auxbus.h                 |   6 +-
 include/hw/misc/mips_cmgcr.h             |   6 +-
 include/hw/misc/tmp105_regs.h            |   5 +-
 include/hw/net/allwinner_emac.h          |   5 +-
 include/hw/nmi.h                         |   2 +-
 include/hw/nvram/openbios_firmware_abi.h |   6 +-
 include/hw/pci-host/apb.h                |   4 +-
 include/hw/pci-host/ppce500.h            |   4 +-
 include/hw/pci-host/spapr.h              |  10 +-
 include/hw/pci/pci_bridge.h              |   2 +-
 include/hw/pci/pci_ids.h                 |   3 +-
 include/hw/pcmcia.h                      |   2 +-
 include/hw/platform-bus.h                |   4 +-
 include/hw/ppc/mac_dbdma.h               |   3 +-
 include/hw/ppc/openpic.h                 |   6 +-
 include/hw/ppc/ppc.h                     |   2 +-
 include/hw/ppc/ppc4xx.h                  |   6 +-
 include/hw/ppc/spapr.h                   |   6 +-
 include/hw/ppc/spapr_drc.h               |   9 +-
 include/hw/ppc/spapr_vio.h               |   7 +-
 include/hw/ppc/xics.h                    |   7 +-
 include/hw/s390x/ebcdic.h                |   6 +-
 include/hw/s390x/event-facility.h        |   2 +-
 include/hw/s390x/ioinst.h                |   4 +-
 include/hw/s390x/s390_flic.h             |   6 +-
 include/hw/s390x/sclp.h                  |   4 +-
 include/hw/s390x/storage-keys.h          |   8 +-
 include/hw/sd/sd.h                       |   7 +-
 include/hw/sh4/sh_intc.h                 |   6 +-
 include/hw/smbios/smbios.h               |   3 +-
 include/hw/sparc/grlib.h                 |   6 +-
 include/hw/ssi/xilinx_spips.h            |   6 +-
 include/hw/stream.h                      |   2 +-
 include/hw/sysbus.h                      |   4 +-
 include/hw/timer/a9gtimer.h              |   6 +-
 include/hw/timer/allwinner-a10-pit.h     |   4 +-
 include/hw/timer/hpet.h                  |   5 +-
 include/hw/timer/i8254.h                 |   2 +-
 include/hw/timer/i8254_internal.h        |   2 +-
 include/hw/timer/m48t59.h                |   6 +-
 include/hw/timer/mc146818rtc.h           |   2 +-
 include/hw/timer/mc146818rtc_regs.h      |   5 +-
 include/hw/timer/mips_gictimer.h         |   6 +-
 include/hw/tricore/tricore.h             |   4 +-
 include/hw/unicore32/puv3.h              |   3 +-
 include/hw/usb/ehci-regs.h               |   2 +-
 include/hw/usb/uhci-regs.h               |   2 +-
 include/hw/vfio/vfio-common.h            |   3 +-
 include/hw/vfio/vfio-platform.h          |   2 +-
 include/hw/vfio/vfio.h                   |   4 +-
 include/hw/virtio/vhost-backend.h        |   7 +-
 include/hw/virtio/virtio-access.h        |   8 +-
 include/hw/virtio/virtio-balloon.h       |   4 +-
 include/hw/virtio/virtio-blk.h           |   4 +-
 include/hw/virtio/virtio-gpu.h           |   4 +-
 include/hw/virtio/virtio-input.h         |   6 +-
 include/hw/virtio/virtio-net.h           |   4 +-
 include/hw/virtio/virtio-rng.h           |   4 +-
 include/hw/virtio/virtio-scsi.h          |   6 +-
 include/hw/virtio/virtio-serial.h        |   5 +-
 include/hw/virtio/virtio.h               |   4 +-
 include/hw/watchdog/wdt_diag288.h        |   2 +-
 include/hw/xen/xen.h                     |   3 +-
 include/hw/xen/xen_backend.h             |   2 +-
 include/hw/xen/xen_common.h              |   4 +-
 include/io/channel-buffer.h              |   6 +-
 include/io/channel-command.h             |   6 +-
 include/io/channel-file.h                |   6 +-
 include/io/channel-socket.h              |   6 +-
 include/io/channel-tls.h                 |   6 +-
 include/io/channel-util.h                |   6 +-
 include/io/channel-watch.h               |   6 +-
 include/io/channel-websock.h             |   6 +-
 include/io/channel.h                     |   6 +-
 include/io/task.h                        |   6 +-
 include/libdecnumber/decContext.h        |   5 +-
 include/libdecnumber/decNumber.h         |   9 +-
 include/libdecnumber/decNumberLocal.h    |   7 +-
 include/libdecnumber/dpd/decimal128.h    |   9 +-
 include/libdecnumber/dpd/decimal32.h     |   9 +-
 include/libdecnumber/dpd/decimal64.h     |   9 +-
 include/migration/block.h                |   6 +-
 include/migration/qemu-file.h            |   4 +-
 include/migration/vmstate.h              |   5 +-
 include/monitor/hmp-target.h             |   7 +-
 include/monitor/monitor.h                |   2 +-
 include/monitor/qdev.h                   |   4 +-
 include/net/vhost-user.h                 |   6 +-
 include/qapi/qmp/dispatch.h              |   5 +-
 include/qapi/qmp/types.h                 |   6 +-
 include/qapi/visitor.h                   |   5 +-
 include/qemu/acl.h                       |  14 +-
 include/qemu/atomic.h                    |   8 +-
 include/qemu/base64.h                    |   6 +-
 include/qemu/bcd.h                       |   2 +-
 include/qemu/buffer.h                    |   6 +-
 include/qemu/config-file.h               |   6 +-
 include/qemu/cutils.h                    |   2 +-
 include/qemu/error-report.h              |   5 +-
 include/qemu/fifo8.h                     |   6 +-
 include/qemu/fprintf-fn.h                |   3 +-
 include/qemu/hbitmap.h                   |   2 +-
 include/qemu/help_option.h               |   2 +-
 include/qemu/host-utils.h                |   3 +-
 include/qemu/id.h                        |   2 +-
 include/qemu/main-loop.h                 |   2 +-
 include/qemu/mmap-alloc.h                |   4 +-
 include/qemu/option.h                    |   4 +-
 include/qemu/option_int.h                |   4 +-
 include/qemu/path.h                      |   2 +-
 include/qemu/queue.h                     |   6 +-
 include/qemu/ratelimit.h                 |   2 +-
 include/qemu/rcu_queue.h                 |   2 +-
 include/qemu/readline.h                  |   2 +-
 include/qemu/seqlock.h                   |   7 +-
 include/qemu/sockets.h                   |   8 +-
 include/qemu/thread-posix.h              |   7 +-
 include/qemu/thread-win32.h              |   7 +-
 include/qemu/thread.h                    |   4 +-
 include/qemu/unicode.h                   |   2 +-
 include/sysemu/balloon.h                 |   4 +-
 include/sysemu/bt.h                      |   4 +-
 include/sysemu/device_tree.h             |   6 +-
 include/sysemu/hostmem.h                 |   5 +-
 include/sysemu/tpm_backend.h             |   4 +-
 include/sysemu/tpm_backend_int.h         |   7 +-
 include/sysemu/xen-mapcache.h            |   3 +-
 include/trace-tcg.h                      |   2 +-
 include/trace.h                          |   2 +-
 linux-user/aarch64/target_cpu.h          |   4 +-
 linux-user/aarch64/target_signal.h       |   6 +-
 linux-user/aarch64/target_structs.h      |   4 +-
 linux-user/aarch64/target_syscall.h      |   6 +-
 linux-user/alpha/target_cpu.h            |   4 +-
 linux-user/alpha/target_signal.h         |   6 +-
 linux-user/alpha/target_structs.h        |   4 +-
 linux-user/alpha/target_syscall.h        |   6 +-
 linux-user/arm/nwfpe/fpa11.h             |   7 +-
 linux-user/arm/nwfpe/fpopcode.h          |   4 +-
 linux-user/arm/nwfpe/fpsr.h              |   4 +-
 linux-user/arm/target_cpu.h              |   4 +-
 linux-user/arm/target_signal.h           |   6 +-
 linux-user/arm/target_structs.h          |   4 +-
 linux-user/arm/target_syscall.h          |   6 +-
 linux-user/cris/target_cpu.h             |   4 +-
 linux-user/cris/target_signal.h          |   6 +-
 linux-user/cris/target_structs.h         |   4 +-
 linux-user/cris/target_syscall.h         |   4 +-
 linux-user/flatload.c                    |   2 +-
 linux-user/host/aarch64/hostdep.h        |   4 +-
 linux-user/host/arm/hostdep.h            |   4 +-
 linux-user/host/i386/hostdep.h           |   4 +-
 linux-user/host/ia64/hostdep.h           |   4 +-
 linux-user/host/mips/hostdep.h           |   4 +-
 linux-user/host/ppc/hostdep.h            |   4 +-
 linux-user/host/ppc64/hostdep.h          |   4 +-
 linux-user/host/s390/hostdep.h           |   4 +-
 linux-user/host/s390x/hostdep.h          |   4 +-
 linux-user/host/sparc/hostdep.h          |   4 +-
 linux-user/host/sparc64/hostdep.h        |   4 +-
 linux-user/host/x32/hostdep.h            |   4 +-
 linux-user/host/x86_64/hostdep.h         |   4 +-
 linux-user/i386/target_cpu.h             |   6 +-
 linux-user/i386/target_signal.h          |   6 +-
 linux-user/i386/target_structs.h         |   4 +-
 linux-user/i386/target_syscall.h         |   6 +-
 linux-user/linux_loop.h                  |   5 +-
 linux-user/m68k/target_cpu.h             |   4 +-
 linux-user/m68k/target_signal.h          |   6 +-
 linux-user/m68k/target_structs.h         |   4 +-
 linux-user/m68k/target_syscall.h         |   6 +-
 linux-user/microblaze/target_cpu.h       |   4 +-
 linux-user/microblaze/target_signal.h    |   6 +-
 linux-user/microblaze/target_structs.h   |   4 +-
 linux-user/microblaze/target_syscall.h   |   4 +-
 linux-user/mips/target_cpu.h             |   4 +-
 linux-user/mips/target_signal.h          |   6 +-
 linux-user/mips/target_structs.h         |   4 +-
 linux-user/mips/target_syscall.h         |   6 +-
 linux-user/mips64/target_signal.h        |   6 +-
 linux-user/mips64/target_syscall.h       |   6 +-
 linux-user/openrisc/target_cpu.h         |   4 +-
 linux-user/openrisc/target_signal.h      |   6 +-
 linux-user/openrisc/target_structs.h     |   4 +-
 linux-user/openrisc/target_syscall.h     |   6 +-
 linux-user/ppc/target_cpu.h              |   4 +-
 linux-user/ppc/target_signal.h           |   6 +-
 linux-user/ppc/target_structs.h          |   4 +-
 linux-user/ppc/target_syscall.h          |   6 +-
 linux-user/s390x/target_cpu.h            |   4 +-
 linux-user/s390x/target_signal.h         |   6 +-
 linux-user/s390x/target_structs.h        |   4 +-
 linux-user/s390x/target_syscall.h        |   6 +-
 linux-user/sh4/target_cpu.h              |   4 +-
 linux-user/sh4/target_signal.h           |   6 +-
 linux-user/sh4/target_structs.h          |   4 +-
 linux-user/sh4/target_syscall.h          |   6 +-
 linux-user/sparc/target_cpu.h            |   4 +-
 linux-user/sparc/target_signal.h         |   6 +-
 linux-user/sparc/target_structs.h        |   4 +-
 linux-user/sparc/target_syscall.h        |   6 +-
 linux-user/sparc64/target_signal.h       |   6 +-
 linux-user/sparc64/target_structs.h      |   4 +-
 linux-user/sparc64/target_syscall.h      |   6 +-
 linux-user/syscall_defs.h                |   7 +-
 linux-user/tilegx/syscall_nr.h           |   4 +-
 linux-user/tilegx/target_cpu.h           |   4 +-
 linux-user/tilegx/target_signal.h        |   6 +-
 linux-user/tilegx/target_structs.h       |   4 +-
 linux-user/tilegx/target_syscall.h       |   4 +-
 linux-user/uname.h                       |   4 +-
 linux-user/unicore32/target_cpu.h        |   4 +-
 linux-user/unicore32/target_signal.h     |   6 +-
 linux-user/unicore32/target_structs.h    |   4 +-
 linux-user/unicore32/target_syscall.h    |   8 +-
 linux-user/x86_64/target_signal.h        |   6 +-
 linux-user/x86_64/target_structs.h       |   4 +-
 linux-user/x86_64/target_syscall.h       |   6 +-
 monitor.c                                |  11 +-
 net/tap-linux.h                          |   2 +-
 net/tap_int.h                            |   6 +-
 qemu-options.h                           |   4 +-
 qga/service-win32.h                      |   5 +-
 qga/vss-win32/install.cpp                |   3 +-
 qga/vss-win32/provider.cpp               |   4 +-
 qga/vss-win32/requester.cpp              |   4 +-
 qga/vss-win32/vss-common.h               |   6 +-
 scripts/clean-header-guards.pl           | 213 +++++++++++++++++++++++++++++++
 slirp/bootp.c                            |   2 +-
 slirp/bootp.h                            |   3 +-
 slirp/cksum.c                            |   2 +-
 slirp/if.c                               |   2 +-
 slirp/if.h                               |   4 +-
 slirp/ip.h                               |   4 +-
 slirp/ip6.h                              |   4 +-
 slirp/ip6_icmp.h                         |   4 +-
 slirp/ip_icmp.h                          |   4 +-
 slirp/ip_input.c                         |   2 +-
 slirp/ip_output.c                        |   2 +-
 slirp/libslirp.h                         |   4 +-
 slirp/main.h                             |   3 +-
 slirp/mbuf.c                             |   2 +-
 slirp/mbuf.h                             |   4 +-
 slirp/misc.c                             |   5 +-
 slirp/misc.h                             |   4 +-
 slirp/sbuf.c                             |   4 +-
 slirp/sbuf.h                             |   4 +-
 slirp/slirp.h                            |   4 +-
 slirp/socket.c                           |   2 +-
 slirp/socket.h                           |   6 +-
 slirp/tcp.h                              |   4 +-
 slirp/tcp_input.c                        |   2 +-
 slirp/tcp_output.c                       |   2 +-
 slirp/tcp_subr.c                         |   2 +-
 slirp/tcp_timer.c                        |   2 +-
 slirp/tcp_timer.h                        |   4 +-
 slirp/tcp_var.h                          |   4 +-
 slirp/tcpip.h                            |   4 +-
 slirp/tftp.c                             |   2 +-
 slirp/tftp.h                             |   3 +-
 slirp/udp.c                              |   2 +-
 slirp/udp.h                              |   4 +-
 target-alpha/cpu.h                       |   6 +-
 target-arm/arm-powerctl.c                |   4 +-
 target-arm/cpu.h                         |   4 +-
 target-arm/psci.c                        |   8 +-
 target-cris/cpu.h                        |   5 +-
 target-cris/crisv32-decode.h             |   3 +-
 target-i386/cpu.h                        |   7 +-
 target-i386/hyperv.h                     |   4 +-
 target-i386/svm.h                        |   4 +-
 target-lm32/cpu.h                        |   4 +-
 target-m68k/cpu.h                        |   5 +-
 target-microblaze/cpu.h                  |   5 +-
 target-mips/cpu.h                        |   6 +-
 target-mips/kvm_mips.h                   |   6 +-
 target-mips/mips-defs.h                  |   6 +-
 target-moxie/cpu.h                       |   7 +-
 target-openrisc/cpu.h                    |   6 +-
 target-openrisc/exception.h              |   6 +-
 target-ppc/cpu.h                         |   7 +-
 target-ppc/helper_regs.h                 |   6 +-
 target-ppc/kvm_ppc.h                     |   6 +-
 target-ppc/mmu-hash32.h                  |   6 +-
 target-ppc/mmu-hash64.h                  |   6 +-
 target-ppc/translate_init.c              |   2 +-
 target-s390x/cpu.h                       |   7 +-
 target-sh4/cpu.h                         |   7 +-
 target-sparc/cpu.h                       |   4 +-
 target-tilegx/cpu.h                      |   5 +-
 target-tilegx/opcode_tilegx.h            |   6 +-
 target-tricore/cpu-qom.h                 |   2 +-
 target-tricore/cpu.h                     |   7 +-
 target-tricore/tricore-defs.h            |   6 +-
 target-unicore32/cpu.h                   |   7 +-
 target-unicore32/softmmu.c               |   2 +-
 target-xtensa/core-dc232b/core-isa.h     |   7 +-
 target-xtensa/core-dc233c/core-isa.h     |   7 +-
 target-xtensa/core-fsf/core-isa.h        |   7 +-
 target-xtensa/cpu.h                      |   4 +-
 tcg/aarch64/tcg-target.h                 |   6 +-
 tcg/arm/tcg-target.h                     |   5 +-
 tcg/i386/tcg-target.h                    |   5 +-
 tcg/ia64/tcg-target.h                    |   5 +-
 tcg/mips/tcg-target.h                    |   5 +-
 tcg/ppc/tcg-target.h                     |   5 +-
 tcg/s390/tcg-target.h                    |   5 +-
 tcg/sparc/tcg-target.h                   |   5 +-
 tcg/tci/tcg-target.h                     |   3 +-
 tests/boot-sector.h                      |   6 +-
 tests/libqos/ahci.h                      |   4 +-
 tests/libqos/libqos-pc.h                 |   4 +-
 tests/libqos/libqos.h                    |   4 +-
 tests/postcopy-test.c                    |   3 +-
 tests/tcg/xtensa/linker.ld.S             |   2 +-
 tests/vhost-user-bridge.c                |   2 -
 tests/vhost-user-test.c                  |   2 +-
 trace/control-internal.h                 |   4 +-
 trace/control.h                          |   2 +-
 trace/event-internal.h                   |   2 +-
 trace/ftrace.h                           |   4 +-
 trace/mem-internal.h                     |   2 +-
 trace/mem.h                              |   2 +-
 ui/curses_keys.h                         |   2 +-
 ui/keymaps.h                             |   6 +-
 ui/sdl_zoom.h                            |   6 +-
 ui/vnc-auth-sasl.h                       |   9 +-
 ui/vnc-auth-vencrypt.h                   |   7 +-
 ui/vnc-enc-tight.h                       |   6 +-
 ui/vnc-enc-zrle.h                        |   4 +-
 ui/vnc-enc-zywrle.h                      |   4 +-
 ui/vnc-ws.h                              |   6 +-
 ui/vnc.h                                 |   6 +-
 util/acl.c                               |   9 --
 util/mmap-alloc.c                        |   3 +-
 util/oslib-posix.c                       |   2 +-
 524 files changed, 1418 insertions(+), 1226 deletions(-)
 create mode 100755 scripts/clean-header-guards.pl

Comments

Peter Maydell July 12, 2016, 4:21 p.m. UTC | #1
On 12 July 2016 at 15:31, Markus Armbruster <armbru@redhat.com> wrote:
> The following changes since commit b35399bb4e9968296a12303b00f9f2066470e987:
>
>   Fix confusing argument names in some common functions (2016-07-12 13:06:08 +0100)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-include-2016-07-12
>
> for you to fetch changes up to 82751a32be872e71c22167234ac88ba52bf96a37:
>
>   cris: Fix broken header guard in hw/cris/boot.h (2016-07-12 16:20:46 +0200)
>
> ----------------------------------------------------------------
> Clean up #include "..." vs <...> and header guards
>
> ----------------------------------------------------------------
> Markus Armbruster (18):
>       Use #include "..." for our own headers, <...> for others
>       scripts: New clean-header-guards.pl
>       target-*: Clean up cpu.h header guards
>       linux-user: Clean up target_syscall.h header guards
>       linux-user: Clean up target_cpu.h header guards
>       linux-user: Clean up target_signal.h header guards
>       linux-user: Clean up target_structs.h header guards
>       linux-user: Clean up hostdep.h header guards
>       linux-user: Fix broken header guard in syscall_defs.h
>       tcg: Clean up tcg-target.h header guards
>       spapr_pci: Include spapr.h instead of playing games with #error
>       Drop Emacs local variables lists redundant with .dir-locals.el
>       Clean up header guards that don't match their file name
>       libdecnumber: Don't fool around with guards to avoid #include
>       libdecnumber: Don't error out on decNumberLocal.h re-inclusion
>       Clean up ill-advised or unusual header guards
>       Clean up decorations and whitespace around header guards
>       cris: Fix broken header guard in hw/cris/boot.h

Applied to master. Thanks for pushing this one through, this
kind of big change can be a real pain to get into the tree...

-- PMM
Markus Armbruster July 13, 2016, 7:26 a.m. UTC | #2
Peter Maydell <peter.maydell@linaro.org> writes:

> On 12 July 2016 at 15:31, Markus Armbruster <armbru@redhat.com> wrote:
>> The following changes since commit b35399bb4e9968296a12303b00f9f2066470e987:
>>
>>   Fix confusing argument names in some common functions (2016-07-12 13:06:08 +0100)
>>
>> are available in the git repository at:
>>
>>   git://repo.or.cz/qemu/armbru.git tags/pull-include-2016-07-12
>>
>> for you to fetch changes up to 82751a32be872e71c22167234ac88ba52bf96a37:
>>
>>   cris: Fix broken header guard in hw/cris/boot.h (2016-07-12 16:20:46 +0200)
>>
>> ----------------------------------------------------------------
>> Clean up #include "..." vs <...> and header guards
>>
>> ----------------------------------------------------------------
>> Markus Armbruster (18):
>>       Use #include "..." for our own headers, <...> for others
>>       scripts: New clean-header-guards.pl
>>       target-*: Clean up cpu.h header guards
>>       linux-user: Clean up target_syscall.h header guards
>>       linux-user: Clean up target_cpu.h header guards
>>       linux-user: Clean up target_signal.h header guards
>>       linux-user: Clean up target_structs.h header guards
>>       linux-user: Clean up hostdep.h header guards
>>       linux-user: Fix broken header guard in syscall_defs.h
>>       tcg: Clean up tcg-target.h header guards
>>       spapr_pci: Include spapr.h instead of playing games with #error
>>       Drop Emacs local variables lists redundant with .dir-locals.el
>>       Clean up header guards that don't match their file name
>>       libdecnumber: Don't fool around with guards to avoid #include
>>       libdecnumber: Don't error out on decNumberLocal.h re-inclusion
>>       Clean up ill-advised or unusual header guards
>>       Clean up decorations and whitespace around header guards
>>       cris: Fix broken header guard in hw/cris/boot.h
>
> Applied to master. Thanks for pushing this one through, this
> kind of big change can be a real pain to get into the tree...

It can be a real pain to rebase, so thank you for pulling it quickly :)