Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: bbfff19688d2e1d10ea1becdfe82f7b8c068ede9
https://github.com/qemu/qemu/commit/bbfff19688d2e1d10ea1becdfe82f7b8c068ede9
Author: Markus Armbruster <arm...@redhat.com>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M contrib/elf2dmp/main.c
M contrib/elf2dmp/pdb.c
M hw/display/ati.c
M hw/display/ati_2d.c
M hw/display/ati_dbg.c
M hw/display/ati_int.h
M include/hw/cpu/cluster.h
M tests/libqos/qgraph.h
M tests/qos-test.c
Log Message:
-----------
Clean up includes
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes, with the changes
to the following files manually reverted:
contrib/libvhost-user/libvhost-user-glib.h
contrib/libvhost-user/libvhost-user.c
contrib/libvhost-user/libvhost-user.h
linux-user/mips64/cpu_loop.c
linux-user/mips64/signal.c
linux-user/sparc64/cpu_loop.c
linux-user/sparc64/signal.c
linux-user/x86_64/cpu_loop.c
linux-user/x86_64/signal.c
slirp/src/*
target/s390x/gen-features.c
tests/fp/platform.h
tests/migration/s390x/a-b-bios.c
tests/test-rcu-simpleq.c
tests/test-rcu-tailq.c
tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
We're in the process of spinning out slirp/. tests/fp/platform.h is
has to include qemu/osdep.h because tests/fp/berkeley-softfloat-3/ and
tests/fp/berkeley-testfloat-3/ don't. tests/uefi-test-tools/ is guest
software. The remaining reverts are the same as in commit
b7d89466dde.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20190313162812.8885-1-arm...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
[Revert change to tests/fp/platform.h, adjust commit message]
Commit: 1b6d3b517dea540ee3bf1b7434d5ee455ab226e0
https://github.com/qemu/qemu/commit/1b6d3b517dea540ee3bf1b7434d5ee455ab226e0
Author: Markus Armbruster <arm...@redhat.com>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M contrib/rdmacm-mux/main.c
M contrib/rdmacm-mux/rdmacm-mux.h
M hw/rdma/rdma_utils.h
M target/i386/whp-dispatch.h
M target/i386/whpx-all.c
Log Message:
-----------
Use #include "..." for our own headers, <...> for others
Also delete a few redundant #include.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20190315145123.28030-2-arm...@redhat.com>
Commit: 45b1f68ca521aca241d7e67ef74ebf3e8800bce0
https://github.com/qemu/qemu/commit/45b1f68ca521aca241d7e67ef74ebf3e8800bce0
Author: Markus Armbruster <arm...@redhat.com>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M authz/base.c
M authz/list.c
M authz/listfile.c
M authz/pamacct.c
M authz/simple.c
Log Message:
-----------
authz: Normalize #include "authz/trace.h" to "trace.h"
Include the generated trace.h the same way as we do everywhere else.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20190315145123.28030-3-arm...@redhat.com>
Acked-by: Daniel P. Berrangé <berra...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Commit: 43e0c3515d51c62d334e860dc045dba7b86814dd
https://github.com/qemu/qemu/commit/43e0c3515d51c62d334e860dc045dba7b86814dd
Author: Markus Armbruster <arm...@redhat.com>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M linux-user/nios2/target_cpu.h
M linux-user/nios2/target_signal.h
M linux-user/nios2/target_structs.h
M linux-user/nios2/target_syscall.h
M linux-user/riscv/target_cpu.h
M linux-user/riscv/target_signal.h
M linux-user/riscv/target_structs.h
Log Message:
-----------
linux-user/nios2 linux-user/riscv: Clean up header guards
Reuse of the same guard symbol in multiple headers is okay as long as
they cannot be included together. scripts/clean-header-guards.pl
can't tell, so it warns.
Since we can avoid guard symbol reuse easily, do so: use guard symbol
${target^^}_${fname^^} for linux-user/$target/$fname, just like we did
in commit a9c94277f0..3500385697.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20190315145123.28030-4-arm...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Commit: 814167479a4c7cccc3f5d532fc234dc75ab8961c
https://github.com/qemu/qemu/commit/814167479a4c7cccc3f5d532fc234dc75ab8961c
Author: Markus Armbruster <arm...@redhat.com>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M target/xtensa/core-de212/core-isa.h
M target/xtensa/core-sample_controller/core-isa.h
M target/xtensa/core-test_kc705_be/core-isa.h
M target/xtensa/core-test_mmuhifi_c3/core-isa.h
Log Message:
-----------
target/xtensa: Clean up core-isa.h header guards
scripts/clean-header-guards.pl warns these headers use reserved
identifier _XTENSA_CORE_CONFIGURATION_H as header guard symbol. It
additionally warns the guard doesn't match the file name.
Reuse of the same guard symbol in multiple headers is okay as long as
they cannot be included together.
Since we can avoid guard symbol reuse easily, do so: use the guard
symbol scripts/clean-header-guards.pl picks, less the TARGET_ prefix.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20190315145123.28030-5-arm...@redhat.com>
Commit: 58ea30f5145fc8c7ebb80ee0b0c812a3a958c762
https://github.com/qemu/qemu/commit/58ea30f5145fc8c7ebb80ee0b0c812a3a958c762
Author: Markus Armbruster <arm...@redhat.com>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M contrib/elf2dmp/qemu_elf.h
M disas/nanomips.h
M fsdev/qemu-fsdev-throttle.h
M hw/arm/smmuv3-internal.h
M hw/display/vga_regs.h
M hw/rdma/vmw/pvrdma_qp_ops.h
M hw/sd/sdmmc-internal.h
M include/authz/listfile.h
M include/authz/pamacct.h
M include/hw/audio/soundhw.h
M include/hw/i386/x86-iommu.h
M include/hw/intc/heathrow_pic.h
M include/hw/intc/xlnx-pmu-iomod-intc.h
M include/hw/misc/armsse-mhu.h
M include/hw/net/ne2000-isa.h
M include/hw/pci-host/sabre.h
M include/hw/watchdog/wdt_aspeed.h
M include/hw/xen/xen-legacy-backend.h
M include/hw/xtensa/xtensa-isa.h
M include/migration/qemu-file-types.h
M include/qemu/filemonitor.h
M include/scsi/constants.h
M net/colo.h
M target/i386/hax-posix.h
M target/i386/hvf/x86_task.h
M target/nios2/cpu.h
M target/nios2/mmu.h
M target/ppc/mmu-book3s-v3.h
M tests/libqos/qgraph_internal.h
M tests/migration/migration-test.h
Log Message:
-----------
Clean up header guards that don't match their file name
Header guard symbols should match their file name to make guard
collisions less likely.
Cleaned up with scripts/clean-header-guards.pl, followed by some
renaming of new guard symbols picked by the script to better ones.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20190315145123.28030-6-arm...@redhat.com>
[Rebase to master: update include/hw/net/ne2000-isa.h]
Commit: a8b991b52dcde75ab5065046653626951aac666d
https://github.com/qemu/qemu/commit/a8b991b52dcde75ab5065046653626951aac666d
Author: Markus Armbruster <arm...@redhat.com>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M block/crypto.h
M hw/i386/amd_iommu.h
M hw/tpm/tpm_ioctl.h
M hw/xtensa/xtensa_memory.h
M include/authz/base.h
M include/authz/list.h
M include/authz/simple.h
M include/chardev/spice.h
M include/hw/ppc/pnv.h
M include/hw/ppc/pnv_core.h
M include/hw/ppc/pnv_lpc.h
M include/hw/ppc/pnv_occ.h
M include/hw/ppc/pnv_psi.h
M include/hw/ppc/pnv_xscom.h
M include/hw/ppc/spapr_ovec.h
M include/hw/timer/pl031.h
M include/hw/virtio/vhost-vsock.h
M include/hw/virtio/virtio-crypto.h
M include/hw/xen/start_info.h
M include/hw/xtensa/mx_pic.h
M include/qemu/drm.h
M include/qemu/jhash.h
M include/sysemu/hvf.h
M linux-user/xtensa/syscall_nr.h
M linux-user/xtensa/target_structs.h
M linux-user/xtensa/termbits.h
M qga/vss-win32/vss-handles.h
M target/i386/hax-i386.h
M target/i386/hax-interface.h
M target/i386/hvf/hvf-i386.h
M target/i386/hvf/vmcs.h
M target/i386/hvf/x86_emu.h
M target/i386/hvf/x86_flags.h
M target/i386/hvf/x86_mmu.h
M target/riscv/pmp.h
M target/sparc/asi.h
M tests/libqos/e1000e.h
M tests/libqos/sdhci.h
Log Message:
-----------
Clean up ill-advised or unusual header guards
Leading underscores are ill-advised because such identifiers are
reserved. Trailing underscores are merely ugly. Strip both.
Our header guards commonly end in _H. Normalize the exceptions.
Done with scripts/clean-header-guards.pl.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20190315145123.28030-7-arm...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
[Changes to slirp/ dropped, as we're about to spin it off]
Commit: 177d9e0da094efb0fadb8daf54b340729b452c8f
https://github.com/qemu/qemu/commit/177d9e0da094efb0fadb8daf54b340729b452c8f
Author: Markus Armbruster <arm...@redhat.com>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M hw/timer/m48t59-internal.h
M include/disas/capstone.h
M include/hw/scsi/emulation.h
M include/qemu/stats64.h
M include/qemu/sys_membarrier.h
M include/qemu/systemd.h
M include/scsi/utils.h
M include/ui/kbd-state.h
M scsi/pr-helper.h
M target/i386/hvf/x86.h
M target/i386/hvf/x86_decode.h
M target/i386/hvf/x86_descr.h
Log Message:
-----------
Normalize header guard symbol definition.
We commonly define the header guard symbol without an explicit value.
Normalize the exceptions.
Done with scripts/clean-header-guards.pl.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20190315145123.28030-8-arm...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Commit: 6834c3f410f6ce77dd9cad78f3a9a864e7fc8ec5
https://github.com/qemu/qemu/commit/6834c3f410f6ce77dd9cad78f3a9a864e7fc8ec5
Author: Markus Armbruster <arm...@redhat.com>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M hw/ide/ahci_internal.h
M include/block/aio-wait.h
M include/exec/translator.h
M include/hw/arm/nrf51_soc.h
M include/hw/arm/smmu-common.h
M include/hw/misc/imx2_wdt.h
M include/hw/misc/nrf51_rng.h
M include/hw/pci-host/designware.h
M include/hw/riscv/sifive_plic.h
M include/qemu/pmem.h
M target/xtensa/xtensa-isa-internal.h
M tests/acpi-utils.h
M tests/tpm-emu.h
Log Message:
-----------
Clean up decorations and whitespace around header guards
Cleaned up with scripts/clean-header-guards.pl.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20190315145123.28030-9-arm...@redhat.com>
Commit: 01807c8b0e9f5da6981c2e62a3c1d8f661fb178e
https://github.com/qemu/qemu/commit/01807c8b0e9f5da6981c2e62a3c1d8f661fb178e
Author: Peter Maydell <peter.mayd...@linaro.org>
Date: 2019-05-13 (Mon, 13 May 2019)
Changed paths:
M authz/base.c
M authz/list.c
M authz/listfile.c
M authz/pamacct.c
M authz/simple.c
M block/crypto.h
M contrib/elf2dmp/main.c
M contrib/elf2dmp/pdb.c
M contrib/elf2dmp/qemu_elf.h
M contrib/rdmacm-mux/main.c
M contrib/rdmacm-mux/rdmacm-mux.h
M disas/nanomips.h
M fsdev/qemu-fsdev-throttle.h
M hw/arm/smmuv3-internal.h
M hw/display/ati.c
M hw/display/ati_2d.c
M hw/display/ati_dbg.c
M hw/display/ati_int.h
M hw/display/vga_regs.h
M hw/i386/amd_iommu.h
M hw/ide/ahci_internal.h
M hw/rdma/rdma_utils.h
M hw/rdma/vmw/pvrdma_qp_ops.h
M hw/sd/sdmmc-internal.h
M hw/timer/m48t59-internal.h
M hw/tpm/tpm_ioctl.h
M hw/xtensa/xtensa_memory.h
M include/authz/base.h
M include/authz/list.h
M include/authz/listfile.h
M include/authz/pamacct.h
M include/authz/simple.h
M include/block/aio-wait.h
M include/chardev/spice.h
M include/disas/capstone.h
M include/exec/translator.h
M include/hw/arm/nrf51_soc.h
M include/hw/arm/smmu-common.h
M include/hw/audio/soundhw.h
M include/hw/cpu/cluster.h
M include/hw/i386/x86-iommu.h
M include/hw/intc/heathrow_pic.h
M include/hw/intc/xlnx-pmu-iomod-intc.h
M include/hw/misc/armsse-mhu.h
M include/hw/misc/imx2_wdt.h
M include/hw/misc/nrf51_rng.h
M include/hw/net/ne2000-isa.h
M include/hw/pci-host/designware.h
M include/hw/pci-host/sabre.h
M include/hw/ppc/pnv.h
M include/hw/ppc/pnv_core.h
M include/hw/ppc/pnv_lpc.h
M include/hw/ppc/pnv_occ.h
M include/hw/ppc/pnv_psi.h
M include/hw/ppc/pnv_xscom.h
M include/hw/ppc/spapr_ovec.h
M include/hw/riscv/sifive_plic.h
M include/hw/scsi/emulation.h
M include/hw/timer/pl031.h
M include/hw/virtio/vhost-vsock.h
M include/hw/virtio/virtio-crypto.h
M include/hw/watchdog/wdt_aspeed.h
M include/hw/xen/start_info.h
M include/hw/xen/xen-legacy-backend.h
M include/hw/xtensa/mx_pic.h
M include/hw/xtensa/xtensa-isa.h
M include/migration/qemu-file-types.h
M include/qemu/drm.h
M include/qemu/filemonitor.h
M include/qemu/jhash.h
M include/qemu/pmem.h
M include/qemu/stats64.h
M include/qemu/sys_membarrier.h
M include/qemu/systemd.h
M include/scsi/constants.h
M include/scsi/utils.h
M include/sysemu/hvf.h
M include/ui/kbd-state.h
M linux-user/nios2/target_cpu.h
M linux-user/nios2/target_signal.h
M linux-user/nios2/target_structs.h
M linux-user/nios2/target_syscall.h
M linux-user/riscv/target_cpu.h
M linux-user/riscv/target_signal.h
M linux-user/riscv/target_structs.h
M linux-user/xtensa/syscall_nr.h
M linux-user/xtensa/target_structs.h
M linux-user/xtensa/termbits.h
M net/colo.h
M qga/vss-win32/vss-handles.h
M scsi/pr-helper.h
M target/i386/hax-i386.h
M target/i386/hax-interface.h
M target/i386/hax-posix.h
M target/i386/hvf/hvf-i386.h
M target/i386/hvf/vmcs.h
M target/i386/hvf/x86.h
M target/i386/hvf/x86_decode.h
M target/i386/hvf/x86_descr.h
M target/i386/hvf/x86_emu.h
M target/i386/hvf/x86_flags.h
M target/i386/hvf/x86_mmu.h
M target/i386/hvf/x86_task.h
M target/i386/whp-dispatch.h
M target/i386/whpx-all.c
M target/nios2/cpu.h
M target/nios2/mmu.h
M target/ppc/mmu-book3s-v3.h
M target/riscv/pmp.h
M target/sparc/asi.h
M target/xtensa/core-de212/core-isa.h
M target/xtensa/core-sample_controller/core-isa.h
M target/xtensa/core-test_kc705_be/core-isa.h
M target/xtensa/core-test_mmuhifi_c3/core-isa.h
M target/xtensa/xtensa-isa-internal.h
M tests/acpi-utils.h
M tests/libqos/e1000e.h
M tests/libqos/qgraph.h
M tests/libqos/qgraph_internal.h
M tests/libqos/sdhci.h
M tests/migration/migration-test.h
M tests/qos-test.c
M tests/tpm-emu.h
Log Message:
-----------
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-05-13' into
staging
Miscellaneous patches for 2019-05-13
# gpg: Signature made Mon 13 May 2019 08:04:02 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <arm...@redhat.com>" [full]
# gpg: aka "Markus Armbruster <arm...@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2019-05-13:
Clean up decorations and whitespace around header guards
Normalize header guard symbol definition.
Clean up ill-advised or unusual header guards
Clean up header guards that don't match their file name
target/xtensa: Clean up core-isa.h header guards
linux-user/nios2 linux-user/riscv: Clean up header guards
authz: Normalize #include "authz/trace.h" to "trace.h"
Use #include "..." for our own headers, <...> for others
Clean up includes
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Compare: https://github.com/qemu/qemu/compare/082b4061a4a2...01807c8b0e9f
