This is actually a fixed rebase of "[PULL for-4.1 0/9] Miscellaneous patches for 2019-04-18", but that subject has since become misleading, so I changed it.
v2: * Back out the change to tests/fp/platform.h that breaks big endian * Rebase The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-05-10 14:49:36 +0100) are available in the Git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-misc-2019-05-13 for you to fetch changes up to 6834c3f410f6ce77dd9cad78f3a9a864e7fc8ec5: Clean up decorations and whitespace around header guards (2019-05-13 08:58:55 +0200) ---------------------------------------------------------------- Miscellaneous patches for 2019-05-13 ---------------------------------------------------------------- Markus Armbruster (9): Clean up includes Use #include "..." for our own headers, <...> for others authz: Normalize #include "authz/trace.h" to "trace.h" linux-user/nios2 linux-user/riscv: Clean up header guards target/xtensa: Clean up core-isa.h header guards Clean up header guards that don't match their file name Clean up ill-advised or unusual header guards Normalize header guard symbol definition. Clean up decorations and whitespace around header guards authz/base.c | 2 +- authz/list.c | 2 +- authz/listfile.c | 2 +- authz/pamacct.c | 2 +- authz/simple.c | 2 +- block/crypto.h | 6 +++--- contrib/elf2dmp/main.c | 3 +-- contrib/elf2dmp/pdb.c | 3 +-- contrib/elf2dmp/qemu_elf.h | 6 +++--- contrib/rdmacm-mux/main.c | 18 +++++++++--------- contrib/rdmacm-mux/rdmacm-mux.h | 6 +++--- disas/nanomips.h | 4 ++-- fsdev/qemu-fsdev-throttle.h | 7 ++++--- hw/arm/smmuv3-internal.h | 4 ++-- hw/display/ati.c | 1 + hw/display/ati_2d.c | 1 + hw/display/ati_dbg.c | 1 + hw/display/ati_int.h | 1 - hw/display/vga_regs.h | 6 +++--- hw/i386/amd_iommu.h | 4 ++-- hw/ide/ahci_internal.h | 2 +- hw/rdma/rdma_utils.h | 1 - hw/rdma/vmw/pvrdma_qp_ops.h | 4 ++-- hw/sd/sdmmc-internal.h | 5 +++-- hw/timer/m48t59-internal.h | 3 ++- hw/tpm/tpm_ioctl.h | 7 ++++--- hw/xtensa/xtensa_memory.h | 4 ++-- include/authz/base.h | 7 +++---- include/authz/list.h | 7 +++---- include/authz/listfile.h | 8 +++----- include/authz/pamacct.h | 7 +++---- include/authz/simple.h | 7 +++---- include/block/aio-wait.h | 2 +- include/chardev/spice.h | 4 ++-- include/disas/capstone.h | 2 +- include/exec/translator.h | 2 +- include/hw/arm/nrf51_soc.h | 1 - include/hw/arm/smmu-common.h | 2 +- include/hw/audio/soundhw.h | 4 ++-- include/hw/cpu/cluster.h | 1 - include/hw/i386/x86-iommu.h | 4 ++-- include/hw/intc/heathrow_pic.h | 6 +++--- include/hw/intc/xlnx-pmu-iomod-intc.h | 6 +++--- include/hw/misc/armsse-mhu.h | 4 ++-- include/hw/misc/imx2_wdt.h | 2 +- include/hw/misc/nrf51_rng.h | 3 ++- include/hw/net/ne2000-isa.h | 4 ++-- include/hw/pci-host/designware.h | 2 +- include/hw/pci-host/sabre.h | 4 ++-- include/hw/ppc/pnv.h | 7 ++++--- include/hw/ppc/pnv_core.h | 7 ++++--- include/hw/ppc/pnv_lpc.h | 7 ++++--- include/hw/ppc/pnv_occ.h | 7 ++++--- include/hw/ppc/pnv_psi.h | 7 ++++--- include/hw/ppc/pnv_xscom.h | 7 ++++--- include/hw/ppc/spapr_ovec.h | 7 ++++--- include/hw/riscv/sifive_plic.h | 1 - include/hw/scsi/emulation.h | 2 +- include/hw/timer/pl031.h | 4 ++-- include/hw/virtio/vhost-vsock.h | 6 +++--- include/hw/virtio/virtio-crypto.h | 6 +++--- include/hw/watchdog/wdt_aspeed.h | 7 ++++--- include/hw/xen/start_info.h | 6 +++--- include/hw/xen/xen-legacy-backend.h | 6 +++--- include/hw/xtensa/mx_pic.h | 4 ++-- include/hw/xtensa/xtensa-isa.h | 6 +++--- include/migration/qemu-file-types.h | 4 ++-- include/qemu/drm.h | 4 ++-- include/qemu/filemonitor.h | 6 +++--- include/qemu/jhash.h | 6 +++--- include/qemu/pmem.h | 2 +- include/qemu/stats64.h | 2 +- include/qemu/sys_membarrier.h | 2 +- include/qemu/systemd.h | 2 +- include/scsi/constants.h | 4 ++-- include/scsi/utils.h | 2 +- include/sysemu/hvf.h | 5 +++-- include/ui/kbd-state.h | 3 ++- linux-user/nios2/target_cpu.h | 4 ++-- linux-user/nios2/target_signal.h | 6 +++--- linux-user/nios2/target_structs.h | 4 ++-- linux-user/nios2/target_syscall.h | 6 +++--- linux-user/riscv/target_cpu.h | 4 ++-- linux-user/riscv/target_signal.h | 6 +++--- linux-user/riscv/target_structs.h | 4 ++-- linux-user/xtensa/syscall_nr.h | 6 +++--- linux-user/xtensa/target_structs.h | 4 ++-- linux-user/xtensa/termbits.h | 6 +++--- net/colo.h | 6 +++--- qga/vss-win32/vss-handles.h | 4 ++-- scsi/pr-helper.h | 3 ++- target/i386/hax-i386.h | 4 ++-- target/i386/hax-interface.h | 4 ++-- target/i386/hax-posix.h | 6 +++--- target/i386/hvf/hvf-i386.h | 4 ++-- target/i386/hvf/vmcs.h | 4 ++-- target/i386/hvf/x86.h | 2 +- target/i386/hvf/x86_decode.h | 2 +- target/i386/hvf/x86_descr.h | 2 +- target/i386/hvf/x86_emu.h | 5 +++-- target/i386/hvf/x86_flags.h | 7 ++++--- target/i386/hvf/x86_mmu.h | 7 ++++--- target/i386/hvf/x86_task.h | 6 ++++-- target/i386/whp-dispatch.h | 2 +- target/i386/whpx-all.c | 1 - target/nios2/cpu.h | 7 ++++--- target/nios2/mmu.h | 7 ++++--- target/ppc/mmu-book3s-v3.h | 6 +++--- target/riscv/pmp.h | 4 ++-- target/sparc/asi.h | 6 +++--- target/xtensa/core-de212/core-isa.h | 8 +++----- target/xtensa/core-sample_controller/core-isa.h | 8 +++----- target/xtensa/core-test_kc705_be/core-isa.h | 8 +++----- target/xtensa/core-test_mmuhifi_c3/core-isa.h | 8 +++----- target/xtensa/xtensa-isa-internal.h | 2 +- tests/acpi-utils.h | 2 +- tests/libqos/e1000e.h | 4 ++-- tests/libqos/qgraph.h | 4 ---- tests/libqos/qgraph_internal.h | 4 ++-- tests/libqos/sdhci.h | 4 ++-- tests/migration/migration-test.h | 7 ++++--- tests/qos-test.c | 2 +- tests/tpm-emu.h | 2 +- 123 files changed, 274 insertions(+), 273 deletions(-) -- 2.17.2