Baby steps towards saner headers
Subsystems (14)
v5 cover Baby steps towards saner headers
Back in 2016, we discussed rules for headers, and these were generally liked:
1. Have a carefully curated header that's included everywhere first. We got that already thanks to Peter: osdep.h.
2. Headers should normally include everything they need beyond osdep.h. If exceptions are needed for some reason, they must be documented in the header. If all that's needed from a header is typedefs, put those into qemu/typedefs.h instead of including the header.
3. Cyclic inclusion is forbidden.
Message-ID: <[email protected]>
http://lists.nongnu.org/archive/html/qemu-devel/2016-03/msg03345.html
Trouble is we're not exactly close to obeying 2. This series demonstrates a possible path towards obeying it: enforce it in "make check", except for known-bad headers. We can then whittle down known-bad headers step by step in future patches.
PATCH 1 adds the tests, but only for include/. 764 headers, 179 known-bad.
PATCH 2 cleans up include/ somewhat. The work remaining should be fairly obvious now. I plan to spin out my cleanups as a separate non-RFC patch submission.
PATCH 3 makes the tests more thorough in a simple and stupid way. Massive overkill, painfully slow. I'm open for better ideas.
Previous iterations had additional patches to test all headers, not just include/. I decided to focus in include/ and shelve them for now.
Testing:
I tested various configurations on an x86 host (everything enabled, everything disabled, KVM only (TCG disabled), user only, MinGW). I also tested lightly on ARM and PPC hosts. Exhaustive testing is not practical. I can't exclude the possibility that the new test fails in configurations I didn't test.
Known issues:
(1) Many headers are (meant to be) only included into certain contexts. In two places, the code makes its intent explicit:
* include/exec/cpu-defs.h #errors out when included into target-independent code (#ifndef NEED_CPU_H)
* include/hw/hw.h #errors out when included into user emulation code (#ifdef CONFIG_USER_ONLY)
I manually marked headers including them, so that the test can treat them specially. Better ideas welcome.
Such #erroring isn't done for other contexts (perhaps it should be). Inclusion into the wrong context fails in various ways instead. The resulting test failures are marked FIXME. The ones that fail by accident (if any) should be fixed. The ones that aren't meant to succeed need to be treated specially by the test.
(2) A few headers are only included into code that's compiled with special CFLAGS. The test doesn't know, and the resulting test failures are marked FIXME. Known instances: include/ui/gtk.h and GTK_CFLAGS, include/ui/sdl2.h and SDL_CFLAGS.
Please have a look and tell me what you think.
v5:
* Old PATCH 1-4: Merged in commit 234e256511e
* Old PATCH 6-7: Shelved for now
* PATCH 1:
- Rebased (uff)
- Suppress debug info to save disk space
- Fix .SECONDARY for $(check-bad-target-header-tests)
- Minor tweaks to make PATCH 3 simpler
- Add include/hw/xen/interface/ to excluded-headers
- Rewrite the Make code to find magic comments
- Test with -Wunused-function to cope with static inline functions
* PATCH 2-3: New
v4:
* PATCH 1-4: New.
* PATCH 5:
- Implement testing of target-dependent headers
- Replace crude "expected to fail with WIN32" by a set of "expected to fail without FOO".
* Old PATCH 3-5: Dropped. These were examples for whittling down known-bad headers.
v3:
* Old PATH 1 moved to another series
* PATCH 1:
- Skip the test unless $(SRC_PATH)/.git exists
- Exclude third-party headers [Peter]
- Exclude Coccinelle header
- Fix egrep vs. fgrep typos
- Mark and exclude headers that die due to poison.h, because testing them isn't implemented, yet
- tests/header-test-template.c not omitted (d'oh)
* PATCH 3: Replaced
* PATCH 5: New
v2:
* PATCH 2:
- Use fixed-format FIXME comments in headers instead of a blacklist in the makefile [Paolo]
- Make target check-source [Peter]
- Special-case CONFIG_WIN32
* PATCH 3:
- replaced by an unrelated one that makes actual sense (I hope)
Markus Armbruster (3):
tests: New make target check-source
include: Make headers more self-contained
tests: Check target-independent headers for each target, too
Makefile | 4 +- Makefile.target | 20 ++++ include/block/raw-aio.h | 2 + include/block/write-threshold.h | 2 + include/chardev/char-win.h | 3 + include/chardev/spice.h | 2 + include/disas/disas.h | 1 + include/exec/cpu-all.h | 4 + include/exec/cpu-defs.h | 3 + include/exec/cpu_ldst.h | 4 + include/exec/cpu_ldst_template.h | 3 + include/exec/cpu_ldst_useronly_template.h | 3 + include/exec/cputlb.h | 3 + include/exec/exec-all.h | 3 + include/exec/gen-icount.h | 2 + include/exec/helper-gen.h | 2 + include/exec/helper-proto.h | 2 + include/exec/helper-tcg.h | 2 + include/exec/ioport.h | 4 + include/exec/memory-internal.h | 4 + include/exec/memory_ldst.inc.h | 2 + include/exec/memory_ldst_cached.inc.h | 2 + include/exec/memory_ldst_phys.inc.h | 2 + include/exec/ram_addr.h | 3 + include/exec/softmmu-semi.h | 4 + include/exec/tb-hash.h | 4 + include/exec/tb-lookup.h | 3 + include/exec/translator.h | 2 + include/exec/user/abitypes.h | 2 + include/exec/user/thunk.h | 4 + include/fpu/softfloat-macros.h | 4 + include/fpu/softfloat.h | 2 + include/hw/acpi/acpi.h | 2 + include/hw/acpi/acpi_dev_interface.h | 2 + include/hw/acpi/cpu.h | 3 + include/hw/acpi/cpu_hotplug.h | 2 + include/hw/acpi/ich9.h | 2 + include/hw/acpi/memory_hotplug.h | 2 + include/hw/acpi/pci.h | 3 + include/hw/acpi/pcihp.h | 2 + include/hw/acpi/tco.h | 5 + include/hw/acpi/utils.h | 2 + include/hw/acpi/vmgenid.h | 2 + include/hw/adc/stm32f2xx_adc.h | 4 + include/hw/arm/allwinner-a10.h | 5 + include/hw/arm/armsse.h | 4 + include/hw/arm/armv7m.h | 4 + include/hw/arm/aspeed.h | 3 + include/hw/arm/aspeed_soc.h | 5 + include/hw/arm/bcm2835_peripherals.h | 2 + include/hw/arm/bcm2836.h | 5 + include/hw/arm/digic.h | 4 + include/hw/arm/exynos4210.h | 5 +- include/hw/arm/fsl-imx25.h | 5 + include/hw/arm/fsl-imx31.h | 5 + include/hw/arm/fsl-imx6.h | 4 + include/hw/arm/fsl-imx6ul.h | 4 + include/hw/arm/fsl-imx7.h | 4 + include/hw/arm/msf2-soc.h | 4 + include/hw/arm/nrf51_soc.h | 4 + include/hw/arm/omap.h | 2 + include/hw/arm/pxa.h | 2 + include/hw/arm/sharpsl.h | 3 + include/hw/arm/smmu-common.h | 3 +- include/hw/arm/smmuv3.h | 2 + include/hw/arm/soc_dma.h | 2 + include/hw/arm/stm32f205_soc.h | 4 + include/hw/arm/virt.h | 2 + include/hw/arm/xlnx-versal.h | 2 + include/hw/arm/xlnx-zynqmp.h | 5 + include/hw/audio/pcspk.h | 2 + include/hw/audio/wm8750.h | 3 + include/hw/block/fdc.h | 2 + include/hw/block/flash.h | 3 + include/hw/boards.h | 2 + include/hw/char/bcm2835_aux.h | 2 + include/hw/char/cadence_uart.h | 2 + include/hw/char/cmsdk-apb-uart.h | 2 + include/hw/char/digic-uart.h | 3 +- include/hw/char/escc.h | 3 + include/hw/char/imx_serial.h | 2 + include/hw/char/lm32_juart.h | 2 + include/hw/char/nrf51_uart.h | 2 + include/hw/char/parallel.h | 2 + include/hw/char/pl011.h | 2 + include/hw/char/serial.h | 2 + include/hw/char/stm32f2xx_usart.h | 2 + include/hw/char/xilinx_uartlite.h | 4 + include/hw/core/generic-loader.h | 1 + include/hw/core/split-irq.h | 3 + include/hw/cpu/a15mpcore.h | 3 + include/hw/cpu/a9mpcore.h | 3 + include/hw/cpu/arm11mpcore.h | 2 + include/hw/cpu/cluster.h | 3 + include/hw/cpu/core.h | 3 + include/hw/cris/etraxfs.h | 3 + include/hw/cris/etraxfs_dma.h | 3 + include/hw/display/bcm2835_fb.h | 2 + include/hw/display/edid.h | 2 + include/hw/display/i2c-ddc.h | 3 + include/hw/display/milkymist_tmu2.h | 3 +- include/hw/display/vga.h | 3 + include/hw/display/xlnx_dp.h | 2 + include/hw/dma/bcm2835_dma.h | 2 + include/hw/dma/i8257.h | 2 + include/hw/dma/pl080.h | 2 + include/hw/dma/xlnx-zdma.h | 2 + include/hw/dma/xlnx-zynq-devcfg.h | 2 + include/hw/dma/xlnx_dpdma.h | 2 + include/hw/elf_ops.h | 2 + include/hw/empty_slot.h | 2 + include/hw/gpio/bcm2835_gpio.h | 3 + include/hw/gpio/imx_gpio.h | 2 + include/hw/gpio/nrf51_gpio.h | 4 +- include/hw/hw.h | 2 + include/hw/hyperv/hyperv.h | 2 + include/hw/i2c/aspeed_i2c.h | 4 + include/hw/i2c/bitbang_i2c.h | 2 + include/hw/i2c/i2c.h | 2 + include/hw/i2c/imx_i2c.h | 3 +- include/hw/i2c/microbit_i2c.h | 2 + include/hw/i2c/pm_smbus.h | 2 + include/hw/i2c/ppc4xx_i2c.h | 2 + include/hw/i2c/smbus_eeprom.h | 2 + include/hw/i2c/smbus_master.h | 2 + include/hw/i2c/smbus_slave.h | 2 + include/hw/i386/apic_internal.h | 5 + include/hw/i386/ich9.h | 2 + include/hw/i386/intel_iommu.h | 2 + include/hw/i386/ioapic_internal.h | 3 + include/hw/i386/pc.h | 2 + include/hw/i386/x86-iommu.h | 2 + include/hw/ide.h | 2 + include/hw/ide/ahci.h | 3 +- include/hw/ide/internal.h | 2 + include/hw/ide/pci.h | 2 + include/hw/input/adb.h | 2 + include/hw/input/i8042.h | 3 + include/hw/input/tsc2xxx.h | 2 + include/hw/intc/allwinner-a10-pic.h | 4 + include/hw/intc/arm_gic.h | 2 + include/hw/intc/arm_gic_common.h | 2 + include/hw/intc/arm_gicv3.h | 2 + include/hw/intc/arm_gicv3_common.h | 2 + include/hw/intc/arm_gicv3_its_common.h | 2 + include/hw/intc/armv7m_nvic.h | 4 + include/hw/intc/aspeed_vic.h | 3 + include/hw/intc/bcm2835_ic.h | 2 + include/hw/intc/bcm2836_control.h | 2 + include/hw/intc/heathrow_pic.h | 4 + include/hw/intc/imx_avic.h | 3 + include/hw/intc/imx_gpcv2.h | 2 + include/hw/intc/mips_gic.h | 5 + include/hw/intc/realview_gic.h | 2 + include/hw/intc/xlnx-pmu-iomod-intc.h | 2 + include/hw/intc/xlnx-zynqmp-ipi.h | 2 + include/hw/ipack/ipack.h | 2 + include/hw/ipmi/ipmi.h | 2 + include/hw/isa/apm.h | 2 + include/hw/isa/i8259_internal.h | 2 + include/hw/isa/isa.h | 2 + include/hw/isa/pc87312.h | 3 + include/hw/isa/superio.h | 3 + include/hw/isa/vt82c686.h | 2 + include/hw/kvm/clock.h | 2 + include/hw/loader.h | 2 + include/hw/mem/memory-device.h | 2 + include/hw/mem/nvdimm.h | 2 + include/hw/mem/pc-dimm.h | 3 +- include/hw/mips/bios.h | 2 + include/hw/mips/cps.h | 5 + include/hw/mips/cpudevs.h | 2 + include/hw/misc/a9scu.h | 3 + include/hw/misc/arm11scu.h | 2 + include/hw/misc/armsse-cpuid.h | 2 + include/hw/misc/armsse-mhu.h | 2 + include/hw/misc/aspeed_scu.h | 3 + include/hw/misc/aspeed_sdmc.h | 3 + include/hw/misc/aspeed_xdma.h | 2 + include/hw/misc/auxbus.h | 3 +- include/hw/misc/bcm2835_mbox.h | 2 + include/hw/misc/bcm2835_property.h | 2 + include/hw/misc/bcm2835_rng.h | 2 + include/hw/misc/imx25_ccm.h | 2 + include/hw/misc/imx2_wdt.h | 2 + include/hw/misc/imx31_ccm.h | 2 + include/hw/misc/imx6_ccm.h | 2 + include/hw/misc/imx6_src.h | 2 + include/hw/misc/imx6ul_ccm.h | 2 + include/hw/misc/imx7_ccm.h | 2 + include/hw/misc/imx7_gpr.h | 2 + include/hw/misc/imx7_snvs.h | 2 + include/hw/misc/imx_ccm.h | 2 + include/hw/misc/iotkit-secctl.h | 2 + include/hw/misc/iotkit-sysctl.h | 2 + include/hw/misc/iotkit-sysinfo.h | 2 + include/hw/misc/macio/cuda.h | 4 + include/hw/misc/macio/gpio.h | 5 + include/hw/misc/macio/macio.h | 4 + include/hw/misc/macio/pmu.h | 5 + include/hw/misc/mips_cmgcr.h | 5 +- include/hw/misc/mips_cpc.h | 4 + include/hw/misc/mips_itu.h | 2 + include/hw/misc/mos6522.h | 2 + include/hw/misc/mps2-fpgaio.h | 2 + include/hw/misc/mps2-scc.h | 2 + include/hw/misc/msf2-sysreg.h | 2 + include/hw/misc/nrf51_rng.h | 3 +- include/hw/misc/pca9552.h | 3 + include/hw/misc/pvpanic.h | 3 + include/hw/misc/stm32f2xx_syscfg.h | 2 + include/hw/misc/tz-mpc.h | 2 + include/hw/misc/tz-msc.h | 2 + include/hw/misc/tz-ppc.h | 2 + include/hw/misc/unimp.h | 2 + include/hw/misc/vmcoreinfo.h | 4 +- include/hw/misc/zynq-xadc.h | 2 + include/hw/net/allwinner_emac.h | 4 +- include/hw/net/cadence_gem.h | 2 + include/hw/net/ftgmac100.h | 2 + include/hw/net/imx_fec.h | 2 + include/hw/net/lance.h | 3 + include/hw/net/ne2000-isa.h | 2 + include/hw/nvram/chrp_nvram.h | 2 + include/hw/nvram/fw_cfg.h | 2 + include/hw/nvram/nrf51_nvm.h | 4 +- include/hw/or-irq.h | 2 + include/hw/pci-bridge/simba.h | 2 + include/hw/pci-host/designware.h | 2 + include/hw/pci-host/gpex.h | 2 + include/hw/pci-host/pam.h | 2 + include/hw/pci-host/q35.h | 2 + include/hw/pci-host/sabre.h | 4 + include/hw/pci-host/spapr.h | 3 + include/hw/pci-host/uninorth.h | 4 +- include/hw/pci-host/xilinx-pcie.h | 2 + include/hw/pci/msi.h | 2 + include/hw/pci/msix.h | 2 + include/hw/pci/pci.h | 2 + include/hw/pci/pci_bridge.h | 3 +- include/hw/pci/pci_bus.h | 2 + include/hw/pci/pci_host.h | 2 + include/hw/pci/pcie.h | 2 + include/hw/pci/pcie_aer.h | 3 + include/hw/pci/pcie_host.h | 2 + include/hw/pci/pcie_port.h | 2 + include/hw/pci/shpc.h | 2 + include/hw/pcmcia.h | 2 + include/hw/platform-bus.h | 2 + include/hw/ppc/fdt.h | 2 + include/hw/ppc/mac_dbdma.h | 2 + include/hw/ppc/openpic.h | 2 + include/hw/ppc/pnv.h | 3 + include/hw/ppc/pnv_core.h | 4 + include/hw/ppc/pnv_lpc.h | 2 + include/hw/ppc/pnv_occ.h | 2 + include/hw/ppc/pnv_psi.h | 2 + include/hw/ppc/pnv_xive.h | 2 + include/hw/ppc/pnv_xscom.h | 2 + include/hw/ppc/ppc.h | 2 + include/hw/ppc/ppc4xx.h | 7 ++ include/hw/ppc/spapr.h | 3 + include/hw/ppc/spapr_cpu_core.h | 4 + include/hw/ppc/spapr_drc.h | 2 + include/hw/ppc/spapr_irq.h | 5 + include/hw/ppc/spapr_ovec.h | 2 + include/hw/ppc/spapr_vio.h | 11 +- include/hw/ppc/spapr_xive.h | 5 + include/hw/ppc/xics.h | 3 +- include/hw/ppc/xics_spapr.h | 3 + include/hw/ppc/xive.h | 3 +- include/hw/ppc/xive_regs.h | 3 + include/hw/qdev.h | 2 + include/hw/register.h | 2 + include/hw/riscv/boot.h | 4 + include/hw/riscv/riscv_hart.h | 6 ++ include/hw/riscv/riscv_htif.h | 3 + include/hw/riscv/sifive_clint.h | 4 + include/hw/riscv/sifive_e.h | 4 + include/hw/riscv/sifive_gpio.h | 3 + include/hw/riscv/sifive_plic.h | 4 +- include/hw/riscv/sifive_prci.h | 4 + include/hw/riscv/sifive_test.h | 4 + include/hw/riscv/sifive_u.h | 4 + include/hw/riscv/sifive_uart.h | 5 + include/hw/riscv/spike.h | 6 ++ include/hw/riscv/virt.h | 6 ++ include/hw/s390x/3270-ccw.h | 3 + include/hw/s390x/ap-device.h | 3 + include/hw/s390x/css-bridge.h | 5 +- include/hw/s390x/css.h | 4 + include/hw/s390x/event-facility.h | 3 +- include/hw/s390x/s390-ccw.h | 3 + include/hw/s390x/s390-virtio-ccw.h | 3 + include/hw/s390x/s390_flic.h | 2 + include/hw/s390x/sclp.h | 3 +- include/hw/s390x/storage-attributes.h | 3 + include/hw/s390x/storage-keys.h | 2 + include/hw/s390x/tod.h | 4 +- include/hw/s390x/vfio-ccw.h | 3 + include/hw/scsi/esp.h | 2 + include/hw/scsi/scsi.h | 2 + include/hw/sd/bcm2835_sdhost.h | 2 + include/hw/sd/sd.h | 2 + include/hw/sd/sdhci.h | 2 + include/hw/semihosting/console.h | 4 + include/hw/sh4/sh.h | 2 + include/hw/sh4/sh_intc.h | 3 + include/hw/sparc/grlib.h | 2 + include/hw/sparc/sparc32_dma.h | 2 + include/hw/sparc/sparc64.h | 4 + include/hw/sparc/sun4m_iommu.h | 2 + include/hw/sparc/sun4u_iommu.h | 2 + include/hw/ssi/aspeed_smc.h | 3 + include/hw/ssi/imx_spi.h | 2 + include/hw/ssi/mss-spi.h | 2 + include/hw/ssi/pl022.h | 2 + include/hw/ssi/ssi.h | 2 + include/hw/ssi/stm32f2xx_spi.h | 2 + include/hw/ssi/xilinx_spips.h | 3 + include/hw/sysbus.h | 2 + include/hw/timer/a9gtimer.h | 2 + include/hw/timer/allwinner-a10-pit.h | 3 + include/hw/timer/arm_mptimer.h | 3 + include/hw/timer/armv7m_systick.h | 2 + include/hw/timer/aspeed_rtc.h | 3 + include/hw/timer/aspeed_timer.h | 3 + include/hw/timer/cmsdk-apb-dualtimer.h | 2 + include/hw/timer/cmsdk-apb-timer.h | 2 + include/hw/timer/digic-timer.h | 3 +- include/hw/timer/i8254.h | 2 + include/hw/timer/i8254_internal.h | 3 + include/hw/timer/imx_epit.h | 2 + include/hw/timer/imx_gpt.h | 2 + include/hw/timer/m48t59.h | 2 + include/hw/timer/mc146818rtc.h | 2 + include/hw/timer/mc146818rtc_regs.h | 2 + include/hw/timer/mss-timer.h | 2 + include/hw/timer/nrf51_timer.h | 3 + include/hw/timer/pl031.h | 2 + include/hw/timer/stm32f2xx_timer.h | 2 + include/hw/timer/sun4v-rtc.h | 7 ++ include/hw/timer/xlnx-zynqmp-rtc.h | 3 + include/hw/usb.h | 2 + include/hw/usb/chipidea.h | 2 + include/hw/vfio/vfio-amd-xgbe.h | 2 + include/hw/vfio/vfio-calxeda-xgmac.h | 2 + include/hw/vfio/vfio-common.h | 2 + include/hw/vfio/vfio-platform.h | 2 + include/hw/virtio/vhost-backend.h | 3 +- include/hw/virtio/vhost-scsi-common.h | 3 +- include/hw/virtio/vhost-scsi.h | 3 +- include/hw/virtio/vhost-user-blk.h | 3 +- include/hw/virtio/vhost-user-scsi.h | 3 +- include/hw/virtio/vhost-user.h | 2 + include/hw/virtio/vhost-vsock.h | 2 + include/hw/virtio/vhost.h | 2 + include/hw/virtio/virtio-access.h | 4 + include/hw/virtio/virtio-balloon.h | 3 +- include/hw/virtio/virtio-blk.h | 3 +- include/hw/virtio/virtio-bus.h | 3 +- include/hw/virtio/virtio-crypto.h | 2 + include/hw/virtio/virtio-gpu-bswap.h | 1 + include/hw/virtio/virtio-gpu-pci.h | 2 + include/hw/virtio/virtio-gpu-pixman.h | 2 + include/hw/virtio/virtio-gpu.h | 2 + include/hw/virtio/virtio-input.h | 2 + include/hw/virtio/virtio-net.h | 3 +- include/hw/virtio/virtio-pmem.h | 2 + include/hw/virtio/virtio-rng.h | 3 + include/hw/virtio/virtio-scsi.h | 3 +- include/hw/virtio/virtio-serial.h | 3 +- include/hw/virtio/virtio.h | 3 +- include/hw/watchdog/cmsdk-apb-watchdog.h | 2 + include/hw/watchdog/wdt_aspeed.h | 3 + include/hw/watchdog/wdt_diag288.h | 2 + include/hw/xen/xen-backend.h | 3 + include/hw/xen/xen-block.h | 3 + include/hw/xen/xen-bus-helper.h | 3 + include/hw/xen/xen-bus.h | 3 + include/hw/xen/xen-legacy-backend.h | 3 + include/hw/xen/xen.h | 2 + include/hw/xen/xen_common.h | 3 + include/hw/xen/xen_pvdev.h | 3 + include/libdecnumber/decNumberLocal.h | 1 + include/migration/cpu.h | 5 + include/monitor/hmp-target.h | 4 + include/net/vhost_net.h | 2 + include/qemu/atomic128.h | 2 + include/qemu/cpuid.h | 2 + include/qemu/futex.h | 2 + include/qemu/iova-tree.h | 3 + include/qemu/ratelimit.h | 2 + include/qemu/thread-win32.h | 4 +- include/qemu/xattr.h | 3 + include/sysemu/balloon.h | 4 +- include/sysemu/cryptodev-vhost-user.h | 6 +- include/sysemu/cryptodev-vhost.h | 4 +- include/sysemu/dma.h | 2 + include/sysemu/dump.h | 3 + include/sysemu/hostmem.h | 2 + include/sysemu/hvf.h | 3 + include/sysemu/iothread.h | 1 + include/sysemu/kvm_int.h | 5 +- include/sysemu/memory_mapping.h | 5 + include/sysemu/numa.h | 2 + include/sysemu/os-posix.h | 2 + include/sysemu/os-win32.h | 2 + include/sysemu/vhost-user-backend.h | 3 + include/sysemu/xen-mapcache.h | 5 +- include/trace-tcg.h | 2 + include/ui/console.h | 2 + include/ui/egl-context.h | 3 + include/ui/egl-helpers.h | 6 ++ include/ui/gtk.h | 2 + include/ui/input.h | 1 + include/ui/pixel_ops.h | 5 + include/ui/qemu-pixman.h | 2 + include/ui/sdl2.h | 2 + include/ui/shader.h | 2 + include/ui/spice-display.h | 4 + target/hppa/cpu.h | 2 +- tests/Makefile.include | 33 +++++- tests/check-headers.mak | 116 ++++++++++++++++++++++ tests/header-test-template.c | 23 +++++ 425 files changed, 1292 insertions(+), 50 deletions(-) create mode 100644 tests/check-headers.mak create mode 100644 tests/header-test-template.c
Signature · 1 line
2.21.0
RFC PATCH v5 1/3 tests: New make target check-source
Make target check-source is for checking the source code itself. For now, there's just one such check, make target check-headers. It checks basic header sanity: for each header "FOO.h", test whether
#include "qemu/osdep.h" #include "FOO.h" #include "FOO.h"
compiles.
The test works only in a git tree, with git installed. It is skipped unless $(SRC_PATH)/.git exists.
Third-party headers we don't intend to clean up are excluded from this test. So are a few "funny" headers. See make variable excluded-headers.
Numerous headers don't pass this test, by design or by accident. To keep things more manageable, exclude all headers outside include/ for now.
Headers known to fail the test are marked with
/* FIXME Does not pass make check-headers, yet! */
Headers known to work only in certain configurations are marked like
/* FIXME Does not pass make check-headers without CONFIG_WIN32, yet! */
I tried to find and mark all of them by testing various configurations. Still, "make check" might fail for configurations I didn't test.
Known issue: some of these don't actually need fixing; they're *meant* to work only in certain configurations. We'll want to invent a suitable marker that doesn't claim FIXME.
Some headers may only be included into target-dependent code: they use identifiers poisoned by exec/poison.h, or include cpu.h. These headers are marked with a comment
/* NOTE: May only be included into target-dependent code */
The test treats them specially.
Known issue: some of these are intended for specific targets. The test should skip them for other targets, but doesn't. They're marked FIXME instead, which is wrong.
New make target check-bad-headers runs the test for headers expected to fail it. This helps with examining the failures.
--- Makefile | 4 +- Makefile.target | 20 +++++ include/block/raw-aio.h | 3 + include/block/write-threshold.h | 3 + include/chardev/char-win.h | 3 + include/chardev/spice.h | 2 + include/disas/disas.h | 2 + include/exec/cpu-all.h | 4 + include/exec/cpu-defs.h | 3 + include/exec/cpu_ldst.h | 4 + include/exec/cpu_ldst_template.h | 3 + include/exec/cpu_ldst_useronly_template.h | 3 + include/exec/cputlb.h | 3 + include/exec/exec-all.h | 3 + include/exec/gen-icount.h | 2 + include/exec/helper-gen.h | 2 + include/exec/helper-proto.h | 2 + include/exec/helper-tcg.h | 2 + include/exec/ioport.h | 2 + include/exec/memory-internal.h | 2 + include/exec/memory_ldst.inc.h | 2 + include/exec/memory_ldst_cached.inc.h | 2 + include/exec/memory_ldst_phys.inc.h | 2 + include/exec/ram_addr.h | 3 + include/exec/softmmu-semi.h | 3 + include/exec/tb-hash.h | 3 + include/exec/tb-lookup.h | 3 + include/exec/translator.h | 3 + include/exec/user/abitypes.h | 2 + include/exec/user/thunk.h | 4 + include/fpu/softfloat-macros.h | 2 + include/fpu/softfloat.h | 2 + include/hw/acpi/pci.h | 3 + include/hw/acpi/tco.h | 3 + include/hw/adc/stm32f2xx_adc.h | 2 + include/hw/arm/allwinner-a10.h | 2 + include/hw/arm/armsse.h | 3 + include/hw/arm/armv7m.h | 3 + include/hw/arm/aspeed_soc.h | 2 + include/hw/arm/bcm2835_peripherals.h | 2 + include/hw/arm/bcm2836.h | 2 + include/hw/arm/digic.h | 3 + include/hw/arm/exynos4210.h | 3 +- include/hw/arm/fsl-imx25.h | 2 + include/hw/arm/fsl-imx31.h | 2 + include/hw/arm/fsl-imx6.h | 3 + include/hw/arm/fsl-imx6ul.h | 3 + include/hw/arm/fsl-imx7.h | 3 + include/hw/arm/msf2-soc.h | 3 + include/hw/arm/nrf51_soc.h | 3 + include/hw/arm/omap.h | 2 + include/hw/arm/sharpsl.h | 3 + include/hw/arm/stm32f205_soc.h | 3 + include/hw/arm/xlnx-zynqmp.h | 2 + include/hw/block/fdc.h | 2 + include/hw/block/flash.h | 2 + include/hw/char/escc.h | 2 + include/hw/char/xilinx_uartlite.h | 2 + include/hw/core/generic-loader.h | 2 + include/hw/cris/etraxfs.h | 2 + include/hw/cris/etraxfs_dma.h | 2 + include/hw/display/bcm2835_fb.h | 2 + include/hw/display/i2c-ddc.h | 2 + include/hw/display/xlnx_dp.h | 2 + include/hw/dma/xlnx_dpdma.h | 2 + include/hw/elf_ops.h | 2 + include/hw/empty_slot.h | 2 + include/hw/gpio/bcm2835_gpio.h | 2 + include/hw/hyperv/hyperv.h | 2 + include/hw/i2c/aspeed_i2c.h | 3 + include/hw/i386/apic_internal.h | 3 + include/hw/i386/ioapic_internal.h | 2 + include/hw/input/hid.h | 2 + include/hw/input/tsc2xxx.h | 2 + include/hw/intc/allwinner-a10-pic.h | 2 + include/hw/intc/armv7m_nvic.h | 3 + include/hw/intc/heathrow_pic.h | 2 + include/hw/intc/mips_gic.h | 3 + include/hw/isa/vt82c686.h | 2 + include/hw/kvm/clock.h | 2 + include/hw/mips/bios.h | 2 + include/hw/mips/cps.h | 3 + include/hw/mips/cpudevs.h | 2 + include/hw/misc/bcm2835_property.h | 2 + include/hw/misc/macio/cuda.h | 2 + include/hw/misc/macio/gpio.h | 2 + include/hw/misc/macio/macio.h | 2 + include/hw/misc/macio/pmu.h | 2 + include/hw/misc/mips_cmgcr.h | 2 + include/hw/misc/mips_cpc.h | 2 + include/hw/misc/pvpanic.h | 3 + include/hw/net/allwinner_emac.h | 2 + include/hw/net/lance.h | 2 + include/hw/nvram/chrp_nvram.h | 2 + include/hw/pci-host/sabre.h | 2 + include/hw/pci-host/spapr.h | 3 + include/hw/pci-host/uninorth.h | 2 + include/hw/pci/pcie_aer.h | 2 + include/hw/ppc/fdt.h | 2 + include/hw/ppc/pnv.h | 2 + include/hw/ppc/pnv_core.h | 2 + include/hw/ppc/pnv_xscom.h | 2 + include/hw/ppc/ppc.h | 2 + include/hw/ppc/ppc4xx.h | 2 + include/hw/ppc/spapr.h | 3 + include/hw/ppc/spapr_cpu_core.h | 4 + include/hw/ppc/spapr_irq.h | 2 + include/hw/ppc/spapr_ovec.h | 2 + include/hw/ppc/spapr_vio.h | 2 + include/hw/ppc/spapr_xive.h | 2 + include/hw/ppc/xics_spapr.h | 3 + include/hw/ppc/xive_regs.h | 2 + include/hw/riscv/boot.h | 2 + include/hw/riscv/riscv_hart.h | 2 + include/hw/riscv/riscv_htif.h | 3 + include/hw/riscv/sifive_clint.h | 2 + include/hw/riscv/sifive_e.h | 2 + include/hw/riscv/sifive_plic.h | 2 + include/hw/riscv/sifive_prci.h | 2 + include/hw/riscv/sifive_test.h | 2 + include/hw/riscv/sifive_u.h | 2 + include/hw/riscv/sifive_uart.h | 2 + include/hw/riscv/spike.h | 2 + include/hw/riscv/virt.h | 2 + include/hw/s390x/3270-ccw.h | 3 + include/hw/s390x/ap-device.h | 3 + include/hw/s390x/css-bridge.h | 2 + include/hw/s390x/css.h | 3 + include/hw/s390x/s390-ccw.h | 3 + include/hw/s390x/storage-attributes.h | 3 + include/hw/s390x/tod.h | 2 + include/hw/s390x/vfio-ccw.h | 3 + include/hw/semihosting/console.h | 3 + include/hw/sh4/sh.h | 2 + include/hw/sh4/sh_intc.h | 2 + include/hw/sparc/sparc64.h | 2 + include/hw/ssi/aspeed_smc.h | 2 + include/hw/ssi/xilinx_spips.h | 2 + include/hw/timer/allwinner-a10-pit.h | 2 + include/hw/timer/i8254_internal.h | 2 + include/hw/timer/m48t59.h | 2 + include/hw/timer/mc146818rtc.h | 2 + include/hw/timer/mc146818rtc_regs.h | 2 + include/hw/timer/sun4v-rtc.h | 2 + include/hw/timer/xlnx-zynqmp-rtc.h | 2 + include/hw/vfio/vfio-amd-xgbe.h | 2 + include/hw/vfio/vfio-calxeda-xgmac.h | 2 + include/hw/vfio/vfio-common.h | 2 + include/hw/vfio/vfio-platform.h | 2 + include/hw/virtio/virtio-access.h | 3 + include/hw/virtio/virtio-gpu-bswap.h | 2 + include/hw/virtio/virtio-gpu-pci.h | 2 + include/hw/virtio/virtio-gpu-pixman.h | 2 + include/hw/virtio/virtio-gpu.h | 2 + include/hw/virtio/virtio-input.h | 2 + include/hw/virtio/virtio-rng.h | 2 + include/hw/watchdog/wdt_aspeed.h | 2 + include/hw/xen/xen-backend.h | 3 + include/hw/xen/xen-block.h | 3 + include/hw/xen/xen-bus-helper.h | 3 + include/hw/xen/xen-bus.h | 3 + include/hw/xen/xen-legacy-backend.h | 3 + include/hw/xen/xen_common.h | 3 + include/hw/xen/xen_pvdev.h | 3 + include/libdecnumber/decNumberLocal.h | 2 + include/migration/cpu.h | 4 + include/monitor/hmp-target.h | 3 + include/qemu/atomic128.h | 2 + include/qemu/cpuid.h | 2 + include/qemu/futex.h | 2 + include/qemu/ratelimit.h | 2 + include/qemu/thread-win32.h | 2 + include/qemu/xattr.h | 3 + include/sysemu/balloon.h | 2 + include/sysemu/cryptodev-vhost-user.h | 3 + include/sysemu/dump.h | 2 + include/sysemu/hvf.h | 3 + include/sysemu/iothread.h | 2 + include/sysemu/kvm_int.h | 2 + include/sysemu/memory_mapping.h | 2 + include/sysemu/os-posix.h | 2 + include/sysemu/os-win32.h | 2 + include/sysemu/xen-mapcache.h | 2 + include/trace-tcg.h | 2 + include/ui/console.h | 2 + include/ui/egl-context.h | 3 + include/ui/egl-helpers.h | 2 + include/ui/gtk.h | 2 + include/ui/input.h | 2 + include/ui/pixel_ops.h | 2 + include/ui/qemu-pixman.h | 2 + include/ui/sdl2.h | 2 + include/ui/shader.h | 2 + include/ui/spice-display.h | 2 + tests/Makefile.include | 33 +++++++- tests/check-headers.mak | 92 +++++++++++++++++++++++ tests/header-test-template.c | 23 ++++++ 197 files changed, 618 insertions(+), 4 deletions(-) create mode 100644 tests/check-headers.mak create mode 100644 tests/header-test-template.c
Makefile +3 -1
@@ -434,6 +434,8 @@ dummy := $(call unnest-vars,, \ audio-obj-m \ trace-obj-y) +RECURSIVE_TARGETS := all clean install + include $(SRC_PATH)/tests/Makefile.include all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules $(vhost-user-json-y)
@@ -454,7 +456,7 @@ config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@") -TARGET_DIRS_RULES := $(foreach t, all clean install, $(addsuffix /$(t), $(TARGET_DIRS))) +TARGET_DIRS_RULES:=$(foreach t, $(RECURSIVE_TARGETS), $(addsuffix /$(t), $(TARGET_DIRS))) SOFTMMU_ALL_RULES=$(filter %-softmmu/all, $(TARGET_DIRS_RULES)) $(SOFTMMU_ALL_RULES): $(authz-obj-y)
Makefile.target +20 -0
@@ -41,6 +41,7 @@ STPFILES= # Makefile Tests include $(SRC_PATH)/tests/tcg/Makefile.include +include $(SRC_PATH)/tests/check-headers.mak config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak
@@ -220,6 +221,23 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") +.PHONY: check-headers +ifeq ($(wildcard $(SRC_PATH)/.git),) +check-headers check-bad-headers: + @echo " SKIP $@ (requires a git tree)" +else +check-headers: CFLAGS += -g0 # save disk space +check-headers: $(check-target-header-tests:.c=.o) + +# Expected to fail: +check-bad-headers: $(check-bad-target-header-tests:.c=.o) + +.SECONDARY: $(check-target-header-tests) $(check-bad-target-header-tests) +$(check-target-header-tests) $(check-bad-target-header-tests): tests/header-test-template.c + @mkdir -p $(dir $@) + @sed 's,@header@,$(subst tests/headers-tgt/,,$(@:.c=.h)),' <$< >$@ +endif + clean: clean-target rm -f *.a *~ $(PROGS) rm -f $(shell find . -name '*.[od]')
@@ -258,3 +276,5 @@ Makefile: $(generated-files-y) .PHONY: coverage-report coverage-report: $(CURDIR)/reports/coverage/coverage-report.html + +-include $(check-target-header-tests:.c=.d) $(check-bad-target-header-tests:.c=.d)
include/block/raw-aio.h +3 -0
@@ -12,6 +12,9 @@* Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_RAW_AIO_H #define QEMU_RAW_AIO_H
include/block/write-threshold.h +3 -0
@@ -9,6 +9,9 @@* This work is licensed under the terms of the GNU LGPL, version 2 or later. * See the COPYING.LIB file in the top-level directory. */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef BLOCK_WRITE_THRESHOLD_H #define BLOCK_WRITE_THRESHOLD_H
include/chardev/char-win.h +3 -0
@@ -21,6 +21,9 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +/* FIXME Does not pass make check-headers without CONFIG_WIN32, yet! */ +#ifndef CHAR_WIN_H #define CHAR_WIN_H
include/chardev/spice.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers without CONFIG_SPICE, yet! */ +#ifndef CHARDEV_SPICE_H #define CHARDEV_SPICE_H
include/disas/disas.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_DISAS_H #define QEMU_DISAS_H
include/exec/cpu-all.h +4 -0
@@ -16,6 +16,10 @@* You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef CPU_ALL_H #define CPU_ALL_H
include/exec/cpu-defs.h +3 -0
@@ -16,6 +16,9 @@* You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + +/* NOTE: May only be included into target-dependent code */ +#ifndef CPU_DEFS_H #define CPU_DEFS_H
include/exec/cpu_ldst.h +4 -0
@@ -44,6 +44,10 @@* (for softmmu configs) a target-specific MMU mode suffix as defined * in target cpu.h. */ + +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef CPU_LDST_H #define CPU_LDST_H
include/exec/cpu_ldst_template.h +3 -0
@@ -24,6 +24,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#if !defined(SOFTMMU_CODE_ACCESS )#include "trace-root.h" #endif
include/exec/cpu_ldst_useronly_template.h +3 -0
@@ -23,6 +23,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#if !defined(CODE_ACCESS )#include "trace-root.h" #endif
include/exec/cputlb.h +3 -0
@@ -16,6 +16,9 @@* You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef CPUTLB_H #define CPUTLB_H
include/exec/exec-all.h +3 -0
@@ -17,6 +17,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef EXEC_ALL_H #define EXEC_ALL_H
include/exec/gen-icount.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef GEN_ICOUNT_H #define GEN_ICOUNT_H
include/exec/helper-gen.h +2 -0
@@ -1,6 +1,8 @@/* Helper file for declaring TCG helper functions. This one expands generation functions for tcg opcodes. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HELPER_GEN_H #define HELPER_GEN_H
include/exec/helper-proto.h +2 -0
@@ -1,6 +1,8 @@/* Helper file for declaring TCG helper functions. This one expands prototypes for the helper functions. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HELPER_PROTO_H #define HELPER_PROTO_H
include/exec/helper-tcg.h +2 -0
@@ -1,6 +1,8 @@/* Helper file for declaring TCG helper functions. This one defines data structures private to tcg.c. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HELPER_TCG_H #define HELPER_TCG_H
include/exec/ioport.h +2 -0
@@ -21,6 +21,8 @@* IO ports API */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef IOPORT_H #define IOPORT_H
include/exec/memory-internal.h +2 -0
@@ -17,6 +17,8 @@* internals and the TCG TLB code. Do not include it from elsewhere. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H
include/exec/memory_ldst.inc.h +2 -0
@@ -19,6 +19,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifdef TARGET_ENDIANNESS extern uint32_t glue (address_space_lduw ,SUFFIX )(ARG1_DECL ,hwaddr addr,MemTxAttrs attrs,MemTxResult *result);
include/exec/memory_ldst_cached.inc.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#define ADDRESS_SPACE_LD_CACHED (size) \ glue(glue(address_space_ld, size), glue(ENDIANNESS, _cached))#define ADDRESS_SPACE_LD_CACHED_SLOW (size) \
include/exec/memory_ldst_phys.inc.h +2 -0
@@ -19,6 +19,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifdef TARGET_ENDIANNESS static inline uint32_t glue (ldl_phys ,SUFFIX )(ARG1_DECL ,hwaddr addr) {
include/exec/ram_addr.h +3 -0
@@ -16,6 +16,9 @@* The functions declared here will be removed soon. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef RAM_ADDR_H #define RAM_ADDR_H
include/exec/softmmu-semi.h +3 -0
@@ -7,6 +7,9 @@* This code is licensed under the GPL */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef SOFTMMU_SEMI_H #define SOFTMMU_SEMI_H
include/exec/tb-hash.h +3 -0
@@ -17,6 +17,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef EXEC_TB_HASH_H #define EXEC_TB_HASH_H
include/exec/tb-lookup.h +3 -0
@@ -4,6 +4,9 @@* License: GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + +/* NOTE: May only be included into target-dependent code */ +#ifndef EXEC_TB_LOOKUP_H #define EXEC_TB_LOOKUP_H
include/exec/translator.h +3 -0
@@ -7,6 +7,9 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef EXEC__TRANSLATOR_H #define EXEC__TRANSLATOR_H
include/exec/user/abitypes.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May only be included into target-dependent code */ +#ifndef EXEC_USER_ABITYPES_H #define EXEC_USER_ABITYPES_H
include/exec/user/thunk.h +4 -0
@@ -16,6 +16,10 @@* You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef THUNK_H #define THUNK_H
include/fpu/softfloat-macros.h +2 -0
@@ -79,6 +79,8 @@ this code that are retained.* version 2 or later. See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef FPU_SOFTFLOAT_MACROS_H #define FPU_SOFTFLOAT_MACROS_H
include/fpu/softfloat.h +2 -0
@@ -79,6 +79,8 @@ this code that are retained.* version 2 or later. See the COPYING file in the top-level directory. */ +/* NOTE: May only be included into target-dependent code */ +#ifndef SOFTFLOAT_H #define SOFTFLOAT_H
include/hw/acpi/pci.h +3 -0
@@ -22,6 +22,9 @@* You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ACPI_PCI_H #define HW_ACPI_PCI_H
include/hw/acpi/tco.h +3 -0
@@ -6,6 +6,9 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ACPI_TCO_H #define HW_ACPI_TCO_H
include/hw/adc/stm32f2xx_adc.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_STM32F2XX_ADC_H #define HW_STM32F2XX_ADC_H
include/hw/arm/allwinner-a10.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ARM_ALLWINNER_A10_H #define HW_ARM_ALLWINNER_A10_H
include/hw/arm/armsse.h +3 -0
@@ -86,6 +86,9 @@* + named GPIO outputs mscexp_ns[0..15] */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef ARMSSE_H #define ARMSSE_H
include/hw/arm/armv7m.h +3 -0
@@ -7,6 +7,9 @@* This code is licensed under the GPL version 2 or later. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ARM_ARMV7M_H #define HW_ARM_ARMV7M_H
include/hw/arm/aspeed_soc.h +2 -0
@@ -9,6 +9,8 @@* the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef ASPEED_SOC_H #define ASPEED_SOC_H
include/hw/arm/bcm2835_peripherals.h +2 -0
@@ -8,6 +8,8 @@* This code is licensed under the GNU GPLv2 and later. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef BCM2835_PERIPHERALS_H #define BCM2835_PERIPHERALS_H
include/hw/arm/bcm2836.h +2 -0
@@ -8,6 +8,8 @@* This code is licensed under the GNU GPLv2 and later. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef BCM2836_H #define BCM2836_H
include/hw/arm/digic.h +3 -0
@@ -15,6 +15,9 @@* */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ARM_DIGIC_H #define HW_ARM_DIGIC_H
include/hw/arm/exynos4210.h +2 -1
@@ -19,9 +19,10 @@* * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. -* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef EXYNOS4210_H #define EXYNOS4210_H
include/hw/arm/fsl-imx25.h +2 -0
@@ -14,6 +14,8 @@* for more details. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef FSL_IMX25_H #define FSL_IMX25_H
include/hw/arm/fsl-imx31.h +2 -0
@@ -14,6 +14,8 @@* for more details. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef FSL_IMX31_H #define FSL_IMX31_H
include/hw/arm/fsl-imx6.h +3 -0
@@ -14,6 +14,9 @@* for more details. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef FSL_IMX6_H #define FSL_IMX6_H
include/hw/arm/fsl-imx6ul.h +3 -0
@@ -14,6 +14,9 @@* GNU General Public License for more details. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef FSL_IMX6UL_H #define FSL_IMX6UL_H
include/hw/arm/fsl-imx7.h +3 -0
@@ -16,6 +16,9 @@* GNU General Public License for more details. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef FSL_IMX7_H #define FSL_IMX7_H
include/hw/arm/msf2-soc.h +3 -0
@@ -22,6 +22,9 @@* THE SOFTWARE. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ARM_MSF2_SOC_H #define HW_ARM_MSF2_SOC_H
include/hw/arm/nrf51_soc.h +3 -0
@@ -7,6 +7,9 @@* the COPYING file in the top-level directory. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef NRF51_SOC_H #define NRF51_SOC_H
include/hw/arm/omap.h +2 -0
@@ -17,6 +17,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef HW_ARM_OMAP_H #define HW_ARM_OMAP_H
include/hw/arm/sharpsl.h +3 -0
@@ -3,6 +3,9 @@* * This file is licensed under the GNU GPL. */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_SHARPSL_H #define QEMU_SHARPSL_H
include/hw/arm/stm32f205_soc.h +3 -0
@@ -22,6 +22,9 @@* THE SOFTWARE. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ARM_STM32F205_SOC_H #define HW_ARM_STM32F205_SOC_H
include/hw/arm/xlnx-zynqmp.h +2 -0
@@ -15,6 +15,8 @@* for more details. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef XLNX_ZYNQMP_H #define XLNX_ZYNQMP_H
include/hw/block/fdc.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_FDC_H #define HW_FDC_H
include/hw/block/flash.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_FLASH_H #define HW_FLASH_H
include/hw/char/escc.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ESCC_H #define HW_ESCC_H
include/hw/char/xilinx_uartlite.h +2 -0
@@ -12,6 +12,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef XILINX_UARTLITE_H #define XILINX_UARTLITE_H
include/hw/core/generic-loader.h +2 -0
@@ -15,6 +15,8 @@* for more details. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef GENERIC_LOADER_H #define GENERIC_LOADER_H
include/hw/cris/etraxfs.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ETRAXFS_H #define HW_ETRAXFS_H
include/hw/cris/etraxfs_dma.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ETRAXFS_DMA_H #define HW_ETRAXFS_DMA_H
include/hw/display/bcm2835_fb.h +2 -0
@@ -8,6 +8,8 @@* This code is licensed under the GNU GPLv2 and later. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef BCM2835_FB_H #define BCM2835_FB_H
include/hw/display/i2c-ddc.h +2 -0
@@ -16,6 +16,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef I2C_DDC_H #define I2C_DDC_H
include/hw/display/xlnx_dp.h +2 -0
@@ -21,6 +21,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef XLNX_DP_H #define XLNX_DP_H
include/hw/dma/xlnx_dpdma.h +2 -0
@@ -22,6 +22,8 @@* */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef XLNX_DPDMA_H #define XLNX_DPDMA_H
include/hw/elf_ops.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +static void glue (bswap_ehdr ,SZ )(struct elfhdr *ehdr) {bswap16s (&ehdr->e_type);/* Object file type */
include/hw/empty_slot.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_EMPTY_SLOT_H #define HW_EMPTY_SLOT_H
include/hw/gpio/bcm2835_gpio.h +2 -0
@@ -11,6 +11,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef BCM2835_GPIO_H #define BCM2835_GPIO_H
include/hw/hyperv/hyperv.h +2 -0
@@ -7,6 +7,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_HYPERV_HYPERV_H #define HW_HYPERV_HYPERV_H
include/hw/i2c/aspeed_i2c.h +3 -0
@@ -17,6 +17,9 @@* with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef ASPEED_I2C_H #define ASPEED_I2C_H
include/hw/i386/apic_internal.h +3 -0
@@ -18,6 +18,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_APIC_INTERNAL_H #define QEMU_APIC_INTERNAL_H
include/hw/i386/ioapic_internal.h +2 -0
@@ -19,6 +19,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_IOAPIC_INTERNAL_H #define QEMU_IOAPIC_INTERNAL_H
include/hw/input/hid.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_HID_H #define QEMU_HID_H
include/hw/input/tsc2xxx.h +2 -0
@@ -8,6 +8,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef HW_INPUT_TSC2XXX_H #define HW_INPUT_TSC2XXX_H
include/hw/intc/allwinner-a10-pic.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef ALLWINNER_A10_PIC_H #define ALLWINNER_A10_PIC_H
include/hw/intc/armv7m_nvic.h +3 -0
@@ -7,6 +7,9 @@* This code is licensed under the GPL version 2 or later. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_ARM_ARMV7M_NVIC_H #define HW_ARM_ARMV7M_NVIC_H
include/hw/intc/heathrow_pic.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_INTC_HEATHROW_PIC_H #define HW_INTC_HEATHROW_PIC_H
include/hw/intc/mips_gic.h +3 -0
@@ -8,6 +8,9 @@* */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MIPS_GIC_H #define MIPS_GIC_H
include/hw/isa/vt82c686.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_VT82C686_H #define HW_VT82C686_H
include/hw/kvm/clock.h +2 -0
@@ -10,6 +10,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May only be included into target-dependent code */ +#ifndef HW_KVM_CLOCK_H #define HW_KVM_CLOCK_H
include/hw/mips/bios.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May only be included into target-dependent code */ +#ifndef HW_MIPS_BIOS_H #define HW_MIPS_BIOS_H
include/hw/mips/cps.h +3 -0
@@ -17,6 +17,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MIPS_CPS_H #define MIPS_CPS_H
include/hw/mips/cpudevs.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May only be included into target-dependent code */ +#ifndef HW_MIPS_CPUDEVS_H #define HW_MIPS_CPUDEVS_H
include/hw/misc/bcm2835_property.h +2 -0
@@ -3,6 +3,8 @@* This code is licensed under the GNU GPLv2 and later. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef BCM2835_PROPERTY_H #define BCM2835_PROPERTY_H
include/hw/misc/macio/cuda.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef CUDA_H #define CUDA_H
include/hw/misc/macio/gpio.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MACIO_GPIO_H #define MACIO_GPIO_H
include/hw/misc/macio/macio.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MACIO_H #define MACIO_H
include/hw/misc/macio/pmu.h +2 -0
@@ -7,6 +7,8 @@* Copyright (C) 2016 Ben Herrenschmidt */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef PMU_H #define PMU_H
include/hw/misc/mips_cmgcr.h +2 -0
@@ -7,6 +7,8 @@* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MIPS_CMGCR_H #define MIPS_CMGCR_H
include/hw/misc/mips_cpc.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MIPS_CPC_H #define MIPS_CPC_H
include/hw/misc/pvpanic.h +3 -0
@@ -11,6 +11,9 @@* See the COPYING file in the top-level directory. * */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_MISC_PVPANIC_H #define HW_MISC_PVPANIC_H
include/hw/net/allwinner_emac.h +2 -0
@@ -20,6 +20,8 @@* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef ALLWINNER_EMAC_H #define ALLWINNER_EMAC_H
include/hw/net/lance.h +2 -0
@@ -26,6 +26,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef LANCE_H #define LANCE_H
include/hw/nvram/chrp_nvram.h +2 -0
@@ -15,6 +15,8 @@* along with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef CHRP_NVRAM_H #define CHRP_NVRAM_H
include/hw/pci-host/sabre.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_PCI_HOST_SABRE_H #define HW_PCI_HOST_SABRE_H
include/hw/pci-host/spapr.h +3 -0
@@ -17,6 +17,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef PCI_HOST_SPAPR_H #define PCI_HOST_SPAPR_H
include/hw/pci-host/uninorth.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef UNINORTH_H #define UNINORTH_H
include/hw/pci/pcie_aer.h +2 -0
@@ -18,6 +18,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_PCIE_AER_H #define QEMU_PCIE_AER_H
include/hw/ppc/fdt.h +2 -0
@@ -7,6 +7,8 @@* COPYING file in the top-level directory. */ +/* NOTE: May only be included into target-dependent code */ +#ifndef PPC_FDT_H #define PPC_FDT_H
include/hw/ppc/pnv.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef PPC_PNV_H #define PPC_PNV_H
include/hw/ppc/pnv_core.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef PPC_PNV_CORE_H #define PPC_PNV_CORE_H
include/hw/ppc/pnv_xscom.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef PPC_PNV_XSCOM_H #define PPC_PNV_XSCOM_H
include/hw/ppc/ppc.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May only be included into target-dependent code */ +#ifndef HW_PPC_H #define HW_PPC_H
include/hw/ppc/ppc4xx.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef PPC4XX_H #define PPC4XX_H
include/hw/ppc/spapr.h +3 -0
@@ -1,3 +1,6 @@ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SPAPR_H #define HW_SPAPR_H
include/hw/ppc/spapr_cpu_core.h +4 -0
@@ -6,6 +6,10 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SPAPR_CPU_CORE_H #define HW_SPAPR_CPU_CORE_H
include/hw/ppc/spapr_irq.h +2 -0
@@ -7,6 +7,8 @@* COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SPAPR_IRQ_H #define HW_SPAPR_IRQ_H
include/hw/ppc/spapr_ovec.h +2 -0
@@ -34,6 +34,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May only be included into target-dependent code */ +#ifndef SPAPR_OVEC_H #define SPAPR_OVEC_H
include/hw/ppc/spapr_vio.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SPAPR_VIO_H #define HW_SPAPR_VIO_H
include/hw/ppc/spapr_xive.h +2 -0
@@ -7,6 +7,8 @@* COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef PPC_SPAPR_XIVE_H #define PPC_SPAPR_XIVE_H
include/hw/ppc/xics_spapr.h +3 -0
@@ -24,6 +24,9 @@* THE SOFTWARE. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef XICS_SPAPR_H #define XICS_SPAPR_H
include/hw/ppc/xive_regs.h +2 -0
@@ -13,6 +13,8 @@* COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef PPC_XIVE_REGS_H #define PPC_XIVE_REGS_H
include/hw/riscv/boot.h +2 -0
@@ -17,6 +17,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef RISCV_BOOT_H #define RISCV_BOOT_H
include/hw/riscv/riscv_hart.h +2 -0
@@ -18,6 +18,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_RISCV_HART_H #define HW_RISCV_HART_H
include/hw/riscv/riscv_htif.h +3 -0
@@ -17,6 +17,9 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_RISCV_HTIF_H #define HW_RISCV_HTIF_H
include/hw/riscv/sifive_clint.h +2 -0
@@ -17,6 +17,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SIFIVE_CLINT_H #define HW_SIFIVE_CLINT_H
include/hw/riscv/sifive_e.h +2 -0
@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SIFIVE_E_H #define HW_SIFIVE_E_H
include/hw/riscv/sifive_plic.h +2 -0
@@ -18,6 +18,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SIFIVE_PLIC_H #define HW_SIFIVE_PLIC_H
include/hw/riscv/sifive_prci.h +2 -0
@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SIFIVE_PRCI_H #define HW_SIFIVE_PRCI_H
include/hw/riscv/sifive_test.h +2 -0
@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SIFIVE_TEST_H #define HW_SIFIVE_TEST_H
include/hw/riscv/sifive_u.h +2 -0
@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SIFIVE_U_H #define HW_SIFIVE_U_H
include/hw/riscv/sifive_uart.h +2 -0
@@ -17,6 +17,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SIFIVE_UART_H #define HW_SIFIVE_UART_H
include/hw/riscv/spike.h +2 -0
@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_RISCV_SPIKE_H #define HW_RISCV_SPIKE_H
include/hw/riscv/virt.h +2 -0
@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_RISCV_VIRT_H #define HW_RISCV_VIRT_H
include/hw/s390x/3270-ccw.h +3 -0
@@ -10,6 +10,9 @@* directory. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_S390X_3270_CCW_H #define HW_S390X_3270_CCW_H
include/hw/s390x/ap-device.h +3 -0
@@ -7,6 +7,9 @@* your option) any later version. See the COPYING file in the top-level * directory. */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_S390X_AP_DEVICE_H #define HW_S390X_AP_DEVICE_H
include/hw/s390x/css-bridge.h +2 -0
@@ -10,6 +10,8 @@* directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_S390X_CSS_BRIDGE_H #define HW_S390X_CSS_BRIDGE_H #include "qom/object.h"
include/hw/s390x/css.h +3 -0
@@ -9,6 +9,9 @@* directory. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef CSS_H #define CSS_H
include/hw/s390x/s390-ccw.h +3 -0
@@ -10,6 +10,9 @@* directory. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_S390_CCW_H #define HW_S390_CCW_H
include/hw/s390x/storage-attributes.h +3 -0
@@ -9,6 +9,9 @@* directory. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef S390_STORAGE_ATTRIBUTES_H #define S390_STORAGE_ATTRIBUTES_H
include/hw/s390x/tod.h +2 -0
@@ -8,6 +8,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_S390_TOD_H #define HW_S390_TOD_H
include/hw/s390x/vfio-ccw.h +3 -0
@@ -11,6 +11,9 @@* directory. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_VFIO_CCW_H #define HW_VFIO_CCW_H
include/hw/semihosting/console.h +3 -0
@@ -6,6 +6,9 @@* SPDX-License-Identifier: GPL-2.0-or-later */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef SEMIHOST_CONSOLE_H #define SEMIHOST_CONSOLE_H
include/hw/sh4/sh.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_SH_H #define QEMU_SH_H /* Definitions for SH board emulation. */
include/hw/sh4/sh_intc.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef SH_INTC_H #define SH_INTC_H
include/hw/sparc/sparc64.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_SPARC_SPARC64_H #define HW_SPARC_SPARC64_H
include/hw/ssi/aspeed_smc.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef ASPEED_SMC_H #define ASPEED_SMC_H
include/hw/ssi/xilinx_spips.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef XILINX_SPIPS_H #define XILINX_SPIPS_H
include/hw/timer/allwinner-a10-pit.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef ALLWINNER_A10_PIT_H #define ALLWINNER_A10_PIT_H
include/hw/timer/i8254_internal.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_I8254_INTERNAL_H #define QEMU_I8254_INTERNAL_H
include/hw/timer/m48t59.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_M48T59_H #define HW_M48T59_H
include/hw/timer/mc146818rtc.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MC146818RTC_H #define MC146818RTC_H
include/hw/timer/mc146818rtc_regs.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MC146818RTC_REGS_H #define MC146818RTC_REGS_H
include/hw/timer/sun4v-rtc.h +2 -0
@@ -1 +1,3 @@ +/* FIXME Does not pass make check-headers, yet! */ +void sun4v_rtc_init (hwaddr addr);
include/hw/timer/xlnx-zynqmp-rtc.h +2 -0
@@ -24,6 +24,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_TIMER_XLNX_ZYNQMP_RTC_H #define HW_TIMER_XLNX_ZYNQMP_RTC_H
include/hw/vfio/vfio-amd-xgbe.h +2 -0
@@ -11,6 +11,8 @@* */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef HW_VFIO_VFIO_AMD_XGBE_H #define HW_VFIO_VFIO_AMD_XGBE_H
include/hw/vfio/vfio-calxeda-xgmac.h +2 -0
@@ -11,6 +11,8 @@* */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef HW_VFIO_VFIO_CALXEDA_XGMAC_H #define HW_VFIO_VFIO_CALXEDA_XGMAC_H
include/hw/vfio/vfio-common.h +2 -0
@@ -18,6 +18,8 @@* Copyright (C) 2008, IBM, Muli Ben-Yehuda ([email protected]) */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef HW_VFIO_VFIO_COMMON_H #define HW_VFIO_VFIO_COMMON_H
include/hw/vfio/vfio-platform.h +2 -0
@@ -13,6 +13,8 @@* Copyright Red Hat, Inc. 2012 */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef HW_VFIO_VFIO_PLATFORM_H #define HW_VFIO_VFIO_PLATFORM_H
include/hw/virtio/virtio-access.h +3 -0
@@ -13,6 +13,9 @@* */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_VIRTIO_ACCESS_H #define QEMU_VIRTIO_ACCESS_H
include/hw/virtio/virtio-gpu-bswap.h +2 -0
@@ -11,6 +11,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_VIRTIO_GPU_BSWAP_H #define HW_VIRTIO_GPU_BSWAP_H
include/hw/virtio/virtio-gpu-pci.h +2 -0
@@ -11,6 +11,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef HW_VIRTIO_GPU_PCI_H #define HW_VIRTIO_GPU_PCI_H
include/hw/virtio/virtio-gpu-pixman.h +2 -0
@@ -11,6 +11,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef HW_VIRTIO_GPU_PIXMAN_H #define HW_VIRTIO_GPU_PIXMAN_H
include/hw/virtio/virtio-gpu.h +2 -0
@@ -11,6 +11,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef HW_VIRTIO_GPU_H #define HW_VIRTIO_GPU_H
include/hw/virtio/virtio-input.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_VIRTIO_INPUT_H #define QEMU_VIRTIO_INPUT_H
include/hw/virtio/virtio-rng.h +2 -0
@@ -9,6 +9,8 @@* top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_VIRTIO_RNG_H #define QEMU_VIRTIO_RNG_H
include/hw/watchdog/wdt_aspeed.h +2 -0
@@ -7,6 +7,8 @@* COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef WDT_ASPEED_H #define WDT_ASPEED_H
include/hw/xen/xen-backend.h +3 -0
@@ -5,6 +5,9 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without CONFIG_XEN, yet! */ +/* FIXME Does not pass make check-headers without system emulation, yet! */ +#ifndef HW_XEN_BACKEND_H #define HW_XEN_BACKEND_H
include/hw/xen/xen-block.h +3 -0
@@ -5,6 +5,9 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without CONFIG_XEN, yet! */ +/* FIXME Does not pass make check-headers without system emulation, yet! */ +#ifndef HW_XEN_BLOCK_H #define HW_XEN_BLOCK_H
include/hw/xen/xen-bus-helper.h +3 -0
@@ -5,6 +5,9 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without CONFIG_XEN, yet! */ +/* FIXME Does not pass make check-headers without system emulation, yet! */ +#ifndef HW_XEN_BUS_HELPER_H #define HW_XEN_BUS_HELPER_H
include/hw/xen/xen-bus.h +3 -0
@@ -5,6 +5,9 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without CONFIG_XEN, yet! */ +/* FIXME Does not pass make check-headers without system emulation, yet! */ +#ifndef HW_XEN_BUS_H #define HW_XEN_BUS_H
include/hw/xen/xen-legacy-backend.h +3 -0
@@ -1,3 +1,6 @@ +/* FIXME Does not pass make check-headers without CONFIG_XEN, yet! */ +/* FIXME Does not pass make check-headers without system emulation, yet! */ +#ifndef HW_XEN_LEGACY_BACKEND_H #define HW_XEN_LEGACY_BACKEND_H
include/hw/xen/xen_common.h +3 -0
@@ -1,3 +1,6 @@ +/* FIXME Does not pass make check-headers without CONFIG_XEN, yet! */ +/* FIXME Does not pass make check-headers without system emulation, yet! */ +#ifndef QEMU_HW_XEN_COMMON_H #define QEMU_HW_XEN_COMMON_H
include/hw/xen/xen_pvdev.h +3 -0
@@ -1,3 +1,6 @@ +/* FIXME Does not pass make check-headers without CONFIG_XEN, yet! */ +/* FIXME Does not pass make check-headers without system emulation, yet! */ +#ifndef QEMU_HW_XEN_PVDEV_H #define QEMU_HW_XEN_PVDEV_H
include/libdecnumber/decNumberLocal.h +2 -0
@@ -37,6 +37,8 @@/* decNumber.h or one of decDouble (etc.) must be included first. */ /* ------------------------------------------------------------------ */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef DECNUMBERLOCAL_H #define DECNUMBERLOCAL_H
include/migration/cpu.h +4 -0
@@ -1,4 +1,8 @@/* Declarations for use for CPU state serialization. */ + +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MIGRATION_CPU_H #define MIGRATION_CPU_H
include/monitor/hmp-target.h +3 -0
@@ -22,6 +22,9 @@* THE SOFTWARE. */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MONITOR_HMP_TARGET_H #define MONITOR_HMP_TARGET_H
include/qemu/atomic128.h +2 -0
@@ -10,6 +10,8 @@* atomic primitive is meant to provide. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_ATOMIC128_H #define QEMU_ATOMIC128_H
include/qemu/cpuid.h +2 -0
@@ -4,6 +4,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without CONFIG_CPUID_H, yet! */ +#ifndef QEMU_CPUID_H #define QEMU_CPUID_H
include/qemu/futex.h +2 -0
@@ -11,6 +11,8 @@* */ +/* FIXME Does not pass make check-headers without CONFIG_LINUX, yet! */ +#ifndef QEMU_FUTEX_H #define QEMU_FUTEX_H
include/qemu/ratelimit.h +2 -0
@@ -11,6 +11,8 @@* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_RATELIMIT_H #define QEMU_RATELIMIT_H
include/qemu/thread-win32.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_THREAD_WIN32_H #define QEMU_THREAD_WIN32_H
include/qemu/xattr.h +3 -0
@@ -10,6 +10,9 @@* later version. See the COPYING file in the top-level directory. * */ + +/* FIXME Does not pass make check-headers without CONFIG_LINUX, yet! */ +#ifndef QEMU_XATTR_H #define QEMU_XATTR_H
include/sysemu/balloon.h +2 -0
@@ -11,6 +11,8 @@* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_BALLOON_H #define QEMU_BALLOON_H
include/sysemu/cryptodev-vhost-user.h +3 -0
@@ -20,6 +20,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. * */ + +/* FIXME Does not pass make check-headers, yet! */ +#ifndef CRYPTODEV_VHOST_USER_H #define CRYPTODEV_VHOST_USER_H
include/sysemu/dump.h +2 -0
@@ -11,6 +11,8 @@* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef DUMP_H #define DUMP_H
include/sysemu/hvf.h +3 -0
@@ -10,6 +10,9 @@/* header to be included in non-HVF-specific code */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef HVF_H #define HVF_H
include/sysemu/iothread.h +2 -0
@@ -11,6 +11,8 @@* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef IOTHREAD_H #define IOTHREAD_H
include/sysemu/kvm_int.h +2 -0
@@ -6,6 +6,8 @@* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef QEMU_KVM_INT_H #define QEMU_KVM_INT_H
include/sysemu/memory_mapping.h +2 -0
@@ -11,6 +11,8 @@* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef MEMORY_MAPPING_H #define MEMORY_MAPPING_H
include/sysemu/os-posix.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers without CONFIG_POSIX, yet! */ +#ifndef QEMU_OS_POSIX_H #define QEMU_OS_POSIX_H
include/sysemu/os-win32.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* FIXME Does not pass make check-headers without CONFIG_WIN32, yet! */ +#ifndef QEMU_OS_WIN32_H #define QEMU_OS_WIN32_H
include/sysemu/xen-mapcache.h +2 -0
@@ -6,6 +6,8 @@* */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef XEN_MAPCACHE_H #define XEN_MAPCACHE_H
include/trace-tcg.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef TRACE_TCG_H #define TRACE_TCG_H
include/ui/console.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef CONSOLE_H #define CONSOLE_H
include/ui/egl-context.h +3 -0
@@ -1,3 +1,6 @@ +/* FIXME Does not pass make check-headers without pixman, yet! */ +/* FIXME Does not pass make check-headers without CONFIG_OPENGL, yet! */ +#ifndef EGL_CONTEXT_H #define EGL_CONTEXT_H
include/ui/egl-helpers.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef EGL_HELPERS_H #define EGL_HELPERS_H
include/ui/gtk.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef UI_GTK_H #define UI_GTK_H
include/ui/input.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef INPUT_H #define INPUT_H
include/ui/pixel_ops.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +static inline unsigned int rgb_to_pixel8 (unsigned int r,unsigned int g,unsigned int b) {
include/ui/qemu-pixman.h +2 -0
@@ -3,6 +3,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers without pixman, yet! */ +#ifndef QEMU_PIXMAN_H #define QEMU_PIXMAN_H
include/ui/sdl2.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef SDL2_H #define SDL2_H
include/ui/shader.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers without CONFIG_OPENGL, yet! */ +#ifndef QEMU_SHADER_H #define QEMU_SHADER_H
include/ui/spice-display.h +2 -0
@@ -15,6 +15,8 @@* along with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers, yet! */ +#ifndef UI_SPICE_DISPLAY_H #define UI_SPICE_DISPLAY_H
tests/Makefile.include +31 -2
@@ -15,6 +15,7 @@ check-help: @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" @echo " $(MAKE) check-acceptance Run all acceptance (functional) tests" + @echo " $(MAKE) check-source Run source code tests" @echo @echo " $(MAKE) check-report.html Generates an HTML test report" @echo " $(MAKE) check-venv Creates a Python venv for tests"
@@ -493,6 +494,7 @@ generated-files-y += tests/test-qapi-introspect.h QEMU_CFLAGS += -I$(SRC_PATH)/tests +include $(SRC_PATH)/tests/check-headers.mak # Deps that are common to various different sets of tests below test-util-obj-y = libqemuutil.a
@@ -1159,13 +1161,39 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) --failfast=on $(SRC_PATH)/tests/acceptance, \ "AVOCADO", "tests/acceptance") +# Header sanity checking + +RECURSIVE_TARGETS += check-headers check-bad-headers + +.PHONY: check-headers check-bad-headers +ifeq ($(wildcard $(SRC_PATH)/.git),) +check-headers check-bad-headers: + @echo " SKIP $@ (requires a git tree)" +else +check-headers: CFLAGS += -g0 # save disk space +check-headers: $(check-header-tests:.c=.o) +check-headers: $(addsuffix /check-headers, $(TARGET_DIRS)) + +# Expected to fail: +check-bad-headers: $(check-bad-header-tests:.c=.o) +check-bad-headers: $(addsuffix /check-bad-headers, $(TARGET_DIRS)) + +.SECONDARY: $(check-header-tests) $(check-bad-header-tests) +$(check-header-tests) $(check-bad-header-tests): tests/header-test-template.c + @mkdir -p $(dir $@) + @sed 's,@header@,$(subst tests/headers/,,$(@:.c=.h)),' <$< >$@ +endif + # Consolidated targets -.PHONY: check-block check-qapi-schema check-qtest check-unit check check-clean +.PHONY: check-block check-qapi-schema check-qtest check-unit check-source +.PHONY: check check-clean check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-block: $(patsubst %,check-%, $(check-block-y)) -check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree +check-source: check-headers +check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-source + check-clean: rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
@@ -1180,5 +1208,6 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) +-include $(check-header-tests:.c=.d) $(check-bad-header-tests:.c=.d) endif
tests/check-headers.mak new file +92 -0
92 lines not on this page · raw message
tests/header-test-template.c new file +23 -0
@@ -0,0 +1,23 @@ +/* +* Template for make check-headers +* +* Copyright (C) 2016 Red Hat, Inc. +* +* Authors: +* Markus Armbruster <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or +* later. See the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" + +/* +* Some headers define static functions that real includers all use, +* but this one of course doesn't. Suppress the resulting warning: +*/ +#pragma GCC diagnostic ignored "-Wunused-function" + +#include "@header@" +/* Include a second time to catch missing header guard */ +#include "@header@"
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH RFC v5 1/3] tests: New make target check-source
Quoted 5 lines · Markus Armbruster
include/exec/cpu_ldst_template.h | 3 + include/exec/cpu_ldst_useronly_template.h | 3 + include/exec/cputlb.h | 3 + include/exec/exec-all.h | 3 + include/exec/gen-icount.h | 2 +
Quoted 8 lines
include/exec/helper-gen.h | 2 + include/exec/helper-proto.h | 2 + include/exec/helper-tcg.h | 2 + include/exec/ioport.h | 2 + include/exec/memory-internal.h | 2 + include/exec/memory_ldst.inc.h | 2 + include/exec/memory_ldst_cached.inc.h | 2 + include/exec/memory_ldst_phys.inc.h | 2 +
The pattern used should not match all *.h, but exclude *_template.h (older naming style) and *.inc.h (newer naming style; we really should finish the conversion).
These headers are not standalone, and will be included multiple times by one of the other headers.
r~
Re: [Qemu-devel] [PATCH RFC v5 1/3] tests: New make target check-source
Quoted 15 lines · Richard Henderson
Quoted 5 lines · Markus Armbruster
include/exec/cpu_ldst_template.h | 3 + include/exec/cpu_ldst_useronly_template.h | 3 + include/exec/cputlb.h | 3 + include/exec/exec-all.h | 3 + include/exec/gen-icount.h | 2 +Quoted 8 lines
include/exec/helper-gen.h | 2 + include/exec/helper-proto.h | 2 + include/exec/helper-tcg.h | 2 + include/exec/ioport.h | 2 + include/exec/memory-internal.h | 2 + include/exec/memory_ldst.inc.h | 2 + include/exec/memory_ldst_cached.inc.h | 2 + include/exec/memory_ldst_phys.inc.h | 2 +
Quoted 6 lines
The pattern used should not match all *.h, but exclude *_template.h (older naming style) and *.inc.h (newer naming style; we really should finish the conversion).
These headers are not standalone, and will be included multiple times by one of the other headers.
Yes.
I excluded them the stupid way in this RFC, in part because I was unsure about the naming convention for "special .h meant to be included multiple times". My cover letter should have mentioned this under "Known issues".
For my series to shed the RFC tag, I need to eliminate the FIXMEs in headers that aren't actually broken. This includes the FIXMEs marking "special .h meant to be included multiple times".
Perhaps I can finish the conversion to the .inc.h convention in v6.
RFC PATCH v5 2/3 include: Make headers more self-contained
In reply to Markus ArmbrusterThe previous commit marked 182 headers FIXME:
1 FIXME Does not pass make check-headers without CONFIG_CPUID_H, yet! 2 FIXME Does not pass make check-headers without CONFIG_LINUX, yet! 2 FIXME Does not pass make check-headers without CONFIG_OPENGL, yet! 1 FIXME Does not pass make check-headers without CONFIG_POSIX, yet! 1 FIXME Does not pass make check-headers without CONFIG_SPICE, yet! 2 FIXME Does not pass make check-headers without CONFIG_WIN32, yet! 7 FIXME Does not pass make check-headers without CONFIG_XEN, yet!
17 FIXME Does not pass make check-headers without pixman, yet!
7 FIXME Does not pass make check-headers without system emulation, yet!
150 FIXME Does not pass make check-headers, yet!
As explained in the commit message, the configuration-specific ones may not actually need fixing.
Clean up the headers some, so that 56 of the 150 blanket FIXMEs go away, and 76 get replaced by configuration-specific ones, and just 18 blanket FIXMEs remain:
16 FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet!
1 FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than i386, yet! 2 FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than mips, yet!
41 FIXME Does not pass make check-headers for user emulation, yet!
1 FIXME Does not pass make check-headers without CONFIG_CPUID_H, yet! 2 FIXME Does not pass make check-headers without CONFIG_LINUX, yet!
3 FIXME Does not pass make check-headers without CONFIG_OPENGL, yet! 1 FIXME Does not pass make check-headers without CONFIG_POSIX, yet!
2 FIXME Does not pass make check-headers without CONFIG_SPICE, yet!
3 FIXME Does not pass make check-headers without CONFIG_WIN32, yet!
7 FIXME Does not pass make check-headers without CONFIG_XEN, yet!
17 FIXME Does not pass make check-headers without pixman, yet!
9 FIXME Does not pass make check-headers without system emulation, yet!
18 FIXME Does not pass make check-headers, yet!
--- include/block/raw-aio.h | 3 +-- include/block/write-threshold.h | 3 +-- include/disas/disas.h | 3 +-- include/exec/cputlb.h | 4 ++-- include/exec/exec-all.h | 2 +- include/exec/ioport.h | 4 ++-- include/exec/memory-internal.h | 4 +++- include/exec/ram_addr.h | 2 +- include/exec/softmmu-semi.h | 3 ++- include/exec/tb-hash.h | 3 ++- include/exec/translator.h | 1 - include/exec/user/thunk.h | 2 +- include/fpu/softfloat-macros.h | 4 +++- include/hw/acpi/pci.h | 4 ++-- include/hw/acpi/tco.h | 4 ++-- include/hw/adc/stm32f2xx_adc.h | 4 ++-- include/hw/arm/allwinner-a10.h | 5 ++++- include/hw/arm/armsse.h | 3 ++- include/hw/arm/armv7m.h | 3 ++- include/hw/arm/aspeed_soc.h | 5 ++++- include/hw/arm/bcm2836.h | 5 ++++- include/hw/arm/digic.h | 3 ++- include/hw/arm/exynos4210.h | 4 +--- include/hw/arm/fsl-imx25.h | 5 ++++- include/hw/arm/fsl-imx31.h | 5 ++++- include/hw/arm/fsl-imx6.h | 3 ++- include/hw/arm/fsl-imx6ul.h | 3 ++- include/hw/arm/fsl-imx7.h | 3 ++- include/hw/arm/msf2-soc.h | 3 ++- include/hw/arm/nrf51_soc.h | 3 ++- include/hw/arm/sharpsl.h | 4 ++-- include/hw/arm/stm32f205_soc.h | 3 ++- include/hw/arm/xlnx-zynqmp.h | 5 ++++- include/hw/block/fdc.h | 4 ++-- include/hw/block/flash.h | 3 +-- include/hw/char/escc.h | 3 +-- include/hw/char/xilinx_uartlite.h | 4 ++-- include/hw/core/generic-loader.h | 3 +-- include/hw/cris/etraxfs.h | 3 +-- include/hw/cris/etraxfs_dma.h | 5 +++-- include/hw/display/i2c-ddc.h | 3 +-- include/hw/empty_slot.h | 4 ++-- include/hw/gpio/bcm2835_gpio.h | 3 +-- include/hw/i2c/aspeed_i2c.h | 3 +-- include/hw/i386/apic_internal.h | 4 +++- include/hw/i386/ioapic_internal.h | 3 +-- include/hw/input/hid.h | 2 -- include/hw/intc/allwinner-a10-pic.h | 4 ++-- include/hw/intc/armv7m_nvic.h | 3 ++- include/hw/intc/heathrow_pic.h | 4 ++-- include/hw/intc/mips_gic.h | 4 +++- include/hw/isa/vt82c686.h | 4 ++-- include/hw/mips/cps.h | 4 +++- include/hw/misc/macio/cuda.h | 4 ++-- include/hw/misc/macio/gpio.h | 5 +++-- include/hw/misc/macio/macio.h | 4 ++-- include/hw/misc/macio/pmu.h | 5 +++-- include/hw/misc/mips_cmgcr.h | 4 ++-- include/hw/misc/mips_cpc.h | 4 ++-- include/hw/misc/pvpanic.h | 4 ++-- include/hw/net/allwinner_emac.h | 3 +-- include/hw/net/lance.h | 3 +-- include/hw/nvram/chrp_nvram.h | 4 ++-- include/hw/pci-host/sabre.h | 4 ++-- include/hw/pci-host/spapr.h | 2 +- include/hw/pci-host/uninorth.h | 4 +--- include/hw/pci/pcie_aer.h | 3 +-- include/hw/ppc/pnv.h | 1 + include/hw/ppc/pnv_core.h | 4 +++- include/hw/ppc/ppc4xx.h | 7 ++++++- include/hw/ppc/spapr.h | 2 +- include/hw/ppc/spapr_cpu_core.h | 2 +- include/hw/ppc/spapr_irq.h | 5 ++++- include/hw/ppc/spapr_vio.h | 11 +++++++---- include/hw/ppc/spapr_xive.h | 5 ++++- include/hw/ppc/xics_spapr.h | 2 +- include/hw/ppc/xive_regs.h | 5 +++-- include/hw/riscv/boot.h | 4 +++- include/hw/riscv/riscv_hart.h | 6 +++++- include/hw/riscv/riscv_htif.h | 2 +- include/hw/riscv/sifive_clint.h | 4 ++-- include/hw/riscv/sifive_e.h | 4 +++- include/hw/riscv/sifive_plic.h | 4 +--- include/hw/riscv/sifive_prci.h | 4 ++-- include/hw/riscv/sifive_test.h | 4 ++-- include/hw/riscv/sifive_u.h | 4 +++- include/hw/riscv/sifive_uart.h | 5 +++-- include/hw/riscv/spike.h | 6 +++++- include/hw/riscv/virt.h | 6 +++++- include/hw/s390x/3270-ccw.h | 2 +- include/hw/s390x/ap-device.h | 4 ++-- include/hw/s390x/css-bridge.h | 5 ++--- include/hw/s390x/css.h | 3 ++- include/hw/s390x/s390-ccw.h | 2 +- include/hw/s390x/storage-attributes.h | 2 +- include/hw/s390x/tod.h | 4 +--- include/hw/s390x/vfio-ccw.h | 2 +- include/hw/semihosting/console.h | 3 ++- include/hw/sh4/sh.h | 2 -- include/hw/sh4/sh_intc.h | 3 +-- include/hw/sparc/sparc64.h | 4 +++- include/hw/ssi/aspeed_smc.h | 3 +-- include/hw/ssi/xilinx_spips.h | 3 +-- include/hw/timer/allwinner-a10-pit.h | 3 +-- include/hw/timer/i8254_internal.h | 3 +-- include/hw/timer/m48t59.h | 4 ++-- include/hw/timer/mc146818rtc.h | 2 -- include/hw/timer/mc146818rtc_regs.h | 4 ++-- include/hw/timer/sun4v-rtc.h | 7 ++++++- include/hw/timer/xlnx-zynqmp-rtc.h | 3 +-- include/hw/virtio/virtio-access.h | 3 ++- include/hw/virtio/virtio-gpu-bswap.h | 3 +-- include/hw/virtio/virtio-input.h | 2 -- include/hw/virtio/virtio-rng.h | 3 +-- include/hw/watchdog/wdt_aspeed.h | 3 +-- include/libdecnumber/decNumberLocal.h | 3 +-- include/migration/cpu.h | 3 ++- include/monitor/hmp-target.h | 3 ++- include/qemu/atomic128.h | 4 ++-- include/qemu/ratelimit.h | 4 ++-- include/qemu/thread-win32.h | 4 ++-- include/sysemu/balloon.h | 3 +-- include/sysemu/cryptodev-vhost-user.h | 4 ++-- include/sysemu/dump.h | 3 ++- include/sysemu/hvf.h | 2 +- include/sysemu/iothread.h | 3 +-- include/sysemu/kvm_int.h | 4 ++-- include/sysemu/memory_mapping.h | 5 ++++- include/sysemu/xen-mapcache.h | 4 ++-- include/ui/egl-helpers.h | 6 +++++- include/ui/input.h | 3 +-- include/ui/pixel_ops.h | 5 ++++- include/ui/spice-display.h | 4 +++- target/hppa/cpu.h | 2 +- tests/check-headers.mak | 18 ++++++++++++++++++ 135 files changed, 291 insertions(+), 213 deletions(-)
include/block/raw-aio.h +1 -2
@@ -13,11 +13,10 @@* GNU GPL, version 2 or (at your option) any later version. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_RAW_AIO_H #define QEMU_RAW_AIO_H +#include "block/aio.h" #include "qemu/coroutine.h" #include "qemu/iov.h"
include/block/write-threshold.h +1 -2
@@ -10,11 +10,10 @@* See the COPYING.LIB file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef BLOCK_WRITE_THRESHOLD_H #define BLOCK_WRITE_THRESHOLD_H +#include "block/block_int.h" /* * bdrv_write_threshold_set:
include/disas/disas.h +1 -2
@@ -1,8 +1,7 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_DISAS_H #define QEMU_DISAS_H +#include "exec/hwaddr.h" #ifdef NEED_CPU_H #include "cpu.h"
include/exec/cputlb.h +2 -2
@@ -17,11 +17,11 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef CPUTLB_H #define CPUTLB_H +#include "exec/cpu-common.h" +#if !defined(CONFIG_USER_ONLY )/* cputlb.c */ void tlb_protect_code (ram_addr_t ram_addr);
include/exec/exec-all.h +1 -1
@@ -18,11 +18,11 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef EXEC_ALL_H #define EXEC_ALL_H +#include "cpu.h" #include "exec/tb-context.h" #include "sysemu/cpus.h"
include/exec/ioport.h +2 -2
@@ -21,11 +21,11 @@* IO ports API */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef IOPORT_H #define IOPORT_H +#include "exec/memory.h" +#define MAX_IOPORTS (64 * 1024)#define IOPORTS_MASK (MAX_IOPORTS - 1)
include/exec/memory-internal.h +3 -1
@@ -17,11 +17,13 @@* internals and the TCG TLB code. Do not include it from elsewhere. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H +#include "cpu.h" + #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) {
include/exec/ram_addr.h +1 -1
@@ -17,12 +17,12 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef RAM_ADDR_H #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY +#include "cpu.h" #include "hw/xen/xen.h" #include "sysemu/tcg.h" #include "exec/ramlist.h"
include/exec/softmmu-semi.h +2 -1
@@ -8,11 +8,12 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef SOFTMMU_SEMI_H #define SOFTMMU_SEMI_H +#include "cpu.h" +static inline uint64_t softmmu_tget64 (CPUArchState *env,target_ulong addr) {uint64_t val;
include/exec/tb-hash.h +2 -1
@@ -18,11 +18,12 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef EXEC_TB_HASH_H #define EXEC_TB_HASH_H +#include "exec/cpu-defs.h" +#include "exec/exec-all.h" #include "qemu/xxhash.h" #ifdef CONFIG_SOFTMMU
include/exec/translator.h +0 -1
@@ -8,7 +8,6 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef EXEC__TRANSLATOR_H #define EXEC__TRANSLATOR_H
include/exec/user/thunk.h +1 -1
@@ -18,12 +18,12 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef THUNK_H #define THUNK_H #include "cpu.h" +#include "exec/user/abitypes.h" /* types enums definitions */
include/fpu/softfloat-macros.h +3 -1
@@ -79,11 +79,13 @@ this code that are retained.* version 2 or later. See the COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ #ifndef FPU_SOFTFLOAT_MACROS_H #define FPU_SOFTFLOAT_MACROS_H +#include "fpu/softfloat.h" +/*---------------------------------------------------------------------------- | Shifts `a' right by the number of bits given in `count'. If any nonzero | bits are shifted off, they are ``jammed'' into the least significant bit of
include/hw/acpi/pci.h +2 -2
@@ -23,11 +23,11 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef HW_ACPI_PCI_H #define HW_ACPI_PCI_H +#include "hw/acpi/bios-linker-loader.h" + typedef struct AcpiMcfgInfo { uint64_t base; uint32_t size;
include/hw/acpi/tco.h +2 -2
@@ -7,11 +7,11 @@* See the COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_ACPI_TCO_H #define HW_ACPI_TCO_H +#include "exec/memory.h" +#include "migration/vmstate.h" /* As per ICH9 spec, the internal timer has an error of ~0.6s on every tick */ #define TCO_TICK_NSEC 600000000LL
include/hw/adc/stm32f2xx_adc.h +2 -2
@@ -22,11 +22,11 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_STM32F2XX_ADC_H #define HW_STM32F2XX_ADC_H +#include "hw/sysbus.h" +#define ADC_SR 0x00#define ADC_CR1 0x04#define ADC_CR2 0x08
include/hw/arm/allwinner-a10.h +4 -1
@@ -1,4 +1,6 @@ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_ARM_ALLWINNER_A10_H #define HW_ARM_ALLWINNER_A10_H
@@ -13,6 +15,7 @@#include "hw/ide/ahci.h" #include "sysemu/sysemu.h" +#include "target/arm/cpu.h" #define AW_A10_PIC_REG_BASE 0x01c20400
include/hw/arm/armsse.h +2 -1
@@ -87,7 +87,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef ARMSSE_H #define ARMSSE_H
include/hw/arm/armv7m.h +2 -1
@@ -8,7 +8,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_ARM_ARMV7M_H #define HW_ARM_ARMV7M_H
include/hw/arm/aspeed_soc.h +4 -1
@@ -9,7 +9,9 @@* the COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef ASPEED_SOC_H #define ASPEED_SOC_H
@@ -24,6 +26,7 @@#include "hw/ssi/aspeed_smc.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" +#include "target/arm/cpu.h" #define ASPEED_SPIS_NUM 2#define ASPEED_WDTS_NUM 3
include/hw/arm/bcm2836.h +4 -1
@@ -8,13 +8,16 @@* This code is licensed under the GNU GPLv2 and later. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef BCM2836_H #define BCM2836_H #include "hw/arm/bcm2835_peripherals.h" #include "hw/intc/bcm2836_control.h" +#include "target/arm/cpu.h" #define TYPE_BCM283X "bcm283x"#define BCM283X (obj) OBJECT_CHECK(BCM283XState, (obj), TYPE_BCM283X)
include/hw/arm/digic.h +2 -1
@@ -16,7 +16,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_ARM_DIGIC_H #define HW_ARM_DIGIC_H
include/hw/arm/exynos4210.h +1 -3
@@ -21,12 +21,10 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef EXYNOS4210_H #define EXYNOS4210_H -#include "exec/memory.h" +#include "hw/sysbus.h" #include "target/arm/cpu-qom.h" #define EXYNOS4210_NCPUS 2
include/hw/arm/fsl-imx25.h +4 -1
@@ -14,7 +14,9 @@* for more details. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef FSL_IMX25_H #define FSL_IMX25_H
@@ -29,6 +31,7 @@#include "hw/i2c/imx_i2c.h" #include "hw/gpio/imx_gpio.h" #include "exec/memory.h" +#include "target/arm/cpu.h" #define TYPE_FSL_IMX25 "fsl,imx25"#define FSL_IMX25 (obj) OBJECT_CHECK(FslIMX25State, (obj), TYPE_FSL_IMX25)
include/hw/arm/fsl-imx31.h +4 -1
@@ -14,7 +14,9 @@* for more details. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef FSL_IMX31_H #define FSL_IMX31_H
@@ -28,6 +30,7 @@#include "hw/i2c/imx_i2c.h" #include "hw/gpio/imx_gpio.h" #include "exec/memory.h" +#include "target/arm/cpu.h" #define TYPE_FSL_IMX31 "fsl,imx31"#define FSL_IMX31 (obj) OBJECT_CHECK(FslIMX31State, (obj), TYPE_FSL_IMX31)
include/hw/arm/fsl-imx6.h +2 -1
@@ -15,7 +15,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef FSL_IMX6_H #define FSL_IMX6_H
include/hw/arm/fsl-imx6ul.h +2 -1
@@ -15,7 +15,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef FSL_IMX6UL_H #define FSL_IMX6UL_H
include/hw/arm/fsl-imx7.h +2 -1
@@ -17,7 +17,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef FSL_IMX7_H #define FSL_IMX7_H
include/hw/arm/msf2-soc.h +2 -1
@@ -23,7 +23,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_ARM_MSF2_SOC_H #define HW_ARM_MSF2_SOC_H
include/hw/arm/nrf51_soc.h +2 -1
@@ -8,7 +8,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef NRF51_SOC_H #define NRF51_SOC_H
include/hw/arm/sharpsl.h +2 -2
@@ -4,11 +4,11 @@* This file is licensed under the GNU GPL. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_SHARPSL_H #define QEMU_SHARPSL_H +#include "exec/hwaddr.h" +#define zaurus_printf (format, ...) \ fprintf(stderr, "%s: " format, __func__, ##__VA_ARGS__)
include/hw/arm/stm32f205_soc.h +2 -1
@@ -23,7 +23,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_ARM_STM32F205_SOC_H #define HW_ARM_STM32F205_SOC_H
include/hw/arm/xlnx-zynqmp.h +4 -1
@@ -15,7 +15,9 @@* for more details. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef XLNX_ZYNQMP_H #define XLNX_ZYNQMP_H
@@ -34,6 +36,7 @@#include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/timer/xlnx-zynqmp-rtc.h" #include "hw/cpu/cluster.h" +#include "target/arm/cpu.h" #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp"#define XLNX_ZYNQMP (obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \
include/hw/block/fdc.h +2 -2
@@ -1,8 +1,8 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_FDC_H #define HW_FDC_H +#include "exec/hwaddr.h" +#include "hw/irq.h" #include "qapi/qapi-types-block.h" /* fdc.c */
include/hw/block/flash.h +1 -2
@@ -1,11 +1,10 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_FLASH_H #define HW_FLASH_H /* NOR flash devices */ #include "exec/memory.h" +#include "migration/vmstate.h" /* pflash_cfi01.c */
include/hw/char/escc.h +1 -2
@@ -1,10 +1,9 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_ESCC_H #define HW_ESCC_H #include "chardev/char-fe.h" #include "chardev/char-serial.h" +#include "hw/sysbus.h" #include "ui/input.h" /* escc.c */
include/hw/char/xilinx_uartlite.h +2 -2
@@ -12,11 +12,11 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef XILINX_UARTLITE_H #define XILINX_UARTLITE_H +#include "hw/sysbus.h" +static inline DeviceState *xilinx_uartlite_create (hwaddr addr,qemu_irq irq,Chardev *chr)
include/hw/core/generic-loader.h +1 -2
@@ -15,12 +15,11 @@* for more details. */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef GENERIC_LOADER_H #define GENERIC_LOADER_H #include "elf.h" +#include "hw/qdev-core.h" typedef struct GenericLoaderState { /* <private> */
include/hw/cris/etraxfs.h +1 -2
@@ -22,13 +22,12 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_ETRAXFS_H #define HW_ETRAXFS_H #include "net/net.h" #include "hw/cris/etraxfs_dma.h" +#include "hw/sysbus.h" /* Instantiate an ETRAXFS Ethernet MAC. */ static inline DeviceState *
include/hw/cris/etraxfs_dma.h +3 -2
@@ -1,8 +1,9 @@ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef HW_ETRAXFS_DMA_H #define HW_ETRAXFS_DMA_H +#include "exec/hwaddr.h" +#include "hw/irq.h" + struct dma_context_metadata { /* data descriptor md */ uint16_t metadata;
include/hw/display/i2c-ddc.h +1 -2
@@ -16,12 +16,11 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef I2C_DDC_H #define I2C_DDC_H #include "hw/display/edid.h" +#include "hw/i2c/i2c.h" /* A simple I2C slave which just returns the contents of its EDID blob. */ struct I2CDDCState {
include/hw/empty_slot.h +2 -2
@@ -1,8 +1,8 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_EMPTY_SLOT_H #define HW_EMPTY_SLOT_H +#include "exec/hwaddr.h" +/* empty_slot.c */ void empty_slot_init (hwaddr addr,uint64_t slot_size);
include/hw/gpio/bcm2835_gpio.h +1 -2
@@ -11,12 +11,11 @@* See the COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef BCM2835_GPIO_H #define BCM2835_GPIO_H #include "hw/sd/sd.h" +#include "hw/sysbus.h" typedef struct BCM2835GpioState { SysBusDevice parent_obj;
include/hw/i2c/aspeed_i2c.h +1 -2
@@ -18,12 +18,11 @@* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef ASPEED_I2C_H #define ASPEED_I2C_H #include "hw/i2c/i2c.h" +#include "hw/sysbus.h" #define TYPE_ASPEED_I2C "aspeed.i2c"#define ASPEED_I2C (obj) \
include/hw/i386/apic_internal.h +3 -1
@@ -19,7 +19,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than i386, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef QEMU_APIC_INTERNAL_H #define QEMU_APIC_INTERNAL_H
@@ -27,6 +28,7 @@#include "cpu.h" #include "exec/memory.h" #include "qemu/timer.h" +#include "target/i386/cpu-qom.h" /* APIC Local Vector Table */ #define APIC_LVT_TIMER 0
include/hw/i386/ioapic_internal.h +1 -2
@@ -19,13 +19,12 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_IOAPIC_INTERNAL_H #define QEMU_IOAPIC_INTERNAL_H #include "hw/hw.h" #include "exec/memory.h" +#include "hw/i386/ioapic.h" #include "hw/sysbus.h" #include "qemu/notify.h"
include/hw/input/hid.h +0 -2
@@ -1,5 +1,3 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_HID_H #define QEMU_HID_H
include/hw/intc/allwinner-a10-pic.h +2 -2
@@ -1,8 +1,8 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef ALLWINNER_A10_PIC_H #define ALLWINNER_A10_PIC_H +#include "hw/sysbus.h" +#define TYPE_AW_A10_PIC "allwinner-a10-pic"#define AW_A10_PIC (obj) OBJECT_CHECK(AwA10PICState, (obj), TYPE_AW_A10_PIC)
include/hw/intc/armv7m_nvic.h +2 -1
@@ -8,7 +8,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than arm, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_ARM_ARMV7M_NVIC_H #define HW_ARM_ARMV7M_NVIC_H
include/hw/intc/heathrow_pic.h +2 -2
@@ -23,11 +23,11 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_INTC_HEATHROW_PIC_H #define HW_INTC_HEATHROW_PIC_H +#include "hw/sysbus.h" +#define TYPE_HEATHROW "heathrow"#define HEATHROW (obj) OBJECT_CHECK(HeathrowState, (obj), TYPE_HEATHROW)
include/hw/intc/mips_gic.h +3 -1
@@ -9,13 +9,15 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than mips, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef MIPS_GIC_H #define MIPS_GIC_H #include "qemu/units.h" #include "hw/timer/mips_gictimer.h" +#include "hw/sysbus.h" #include "cpu.h" /* * GIC Specific definitions
include/hw/isa/vt82c686.h +2 -2
@@ -1,8 +1,8 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_VT82C686_H #define HW_VT82C686_H +#include "hw/irq.h" +#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio"/* vt82c686.c */
include/hw/mips/cps.h +3 -1
@@ -18,7 +18,8 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for TARGET_BASE_ARCH other than mips, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef MIPS_CPS_H #define MIPS_CPS_H
@@ -28,6 +29,7 @@#include "hw/intc/mips_gic.h" #include "hw/misc/mips_cpc.h" #include "hw/misc/mips_itu.h" +#include "target/mips/cpu.h" #define TYPE_MIPS_CPS "mips-cps"#define MIPS_CPS (obj) OBJECT_CHECK(MIPSCPSState, (obj), TYPE_MIPS_CPS)
include/hw/misc/macio/cuda.h +2 -2
@@ -23,11 +23,11 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef CUDA_H #define CUDA_H +#include "hw/misc/mos6522.h" +/* CUDA commands (2nd byte) */ #define CUDA_WARM_START 0x0#define CUDA_AUTOPOLL 0x1
include/hw/misc/macio/gpio.h +3 -2
@@ -23,11 +23,12 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef MACIO_GPIO_H #define MACIO_GPIO_H +#include "hw/ppc/openpic.h" +#include "hw/sysbus.h" +#define TYPE_MACIO_GPIO "macio-gpio"#define MACIO_GPIO (obj) OBJECT_CHECK(MacIOGPIOState, (obj), TYPE_MACIO_GPIO)
include/hw/misc/macio/macio.h +2 -2
@@ -23,16 +23,16 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef MACIO_H #define MACIO_H #include "hw/char/escc.h" +#include "hw/ide/internal.h" #include "hw/intc/heathrow_pic.h" #include "hw/misc/macio/cuda.h" #include "hw/misc/macio/gpio.h" #include "hw/misc/macio/pmu.h" +#include "hw/ppc/mac.h" #include "hw/ppc/mac_dbdma.h" #include "hw/ppc/openpic.h"
include/hw/misc/macio/pmu.h +3 -2
@@ -7,11 +7,12 @@* Copyright (C) 2016 Ben Herrenschmidt */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef PMU_H #define PMU_H +#include "hw/misc/mos6522.h" +#include "hw/misc/macio/gpio.h" +/* * PMU commands */
include/hw/misc/mips_cmgcr.h +2 -2
@@ -7,11 +7,11 @@* */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef MIPS_CMGCR_H #define MIPS_CMGCR_H +#include "hw/sysbus.h" +#define TYPE_MIPS_GCR "mips-gcr"#define MIPS_GCR (obj) OBJECT_CHECK(MIPSGCRState, (obj), TYPE_MIPS_GCR)
include/hw/misc/mips_cpc.h +2 -2
@@ -17,11 +17,11 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef MIPS_CPC_H #define MIPS_CPC_H +#include "hw/sysbus.h" +#define CPC_ADDRSPACE_SZ 0x6000/* CPC blocks offsets relative to base address */
include/hw/misc/pvpanic.h +2 -2
@@ -12,11 +12,11 @@* */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_MISC_PVPANIC_H #define HW_MISC_PVPANIC_H +#include "qom/object.h" +#define TYPE_PVPANIC "pvpanic"#define PVPANIC_IOPORT_PROP "ioport"
include/hw/net/allwinner_emac.h +1 -2
@@ -20,8 +20,6 @@* */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef ALLWINNER_EMAC_H #define ALLWINNER_EMAC_H
@@ -29,6 +27,7 @@#include "net/net.h" #include "qemu/fifo8.h" #include "hw/net/mii.h" +#include "hw/sysbus.h" #define TYPE_AW_EMAC "allwinner-emac"#define AW_EMAC (obj) OBJECT_CHECK(AwEmacState, (obj), TYPE_AW_EMAC)
include/hw/net/lance.h +1 -2
@@ -26,13 +26,12 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef LANCE_H #define LANCE_H #include "net/net.h" #include "hw/net/pcnet.h" +#include "hw/sysbus.h" #define TYPE_LANCE "lance"#define SYSBUS_PCNET (obj) \
include/hw/nvram/chrp_nvram.h +2 -2
@@ -15,11 +15,11 @@* along with this program; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef CHRP_NVRAM_H #define CHRP_NVRAM_H +#include "qemu/bswap.h" + /* OpenBIOS NVRAM partition */ typedef struct { uint8_t signature;
include/hw/pci-host/sabre.h +2 -2
@@ -1,8 +1,8 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_PCI_HOST_SABRE_H #define HW_PCI_HOST_SABRE_H +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" #include "hw/sparc/sun4u_iommu.h" #define MAX_IVEC 0x40
include/hw/pci-host/spapr.h +1 -1
@@ -18,7 +18,7 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef PCI_HOST_SPAPR_H #define PCI_HOST_SPAPR_H
include/hw/pci-host/uninorth.h +1 -3
@@ -22,13 +22,11 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef UNINORTH_H #define UNINORTH_H #include "hw/hw.h" - +#include "hw/pci/pci_host.h" #include "hw/ppc/openpic.h" /* UniNorth version */
include/hw/pci/pcie_aer.h +1 -2
@@ -18,12 +18,11 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_PCIE_AER_H #define QEMU_PCIE_AER_H #include "hw/hw.h" +#include "hw/pci/pci_regs.h" /* definitions which PCIExpressDevice uses */
include/hw/ppc/pnv.h +1 -0
@@ -17,6 +17,7 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May only be included into target-dependent code */ /* FIXME Does not pass make check-headers, yet! */ #ifndef PPC_PNV_H
include/hw/ppc/pnv_core.h +3 -1
@@ -17,12 +17,14 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef PPC_PNV_CORE_H #define PPC_PNV_CORE_H #include "hw/cpu/core.h" +#include "target/ppc/cpu.h" #define TYPE_PNV_CORE "powernv-cpu-core"#define PNV_CORE (obj) \
include/hw/ppc/ppc4xx.h +6 -1
@@ -22,11 +22,16 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef PPC4XX_H #define PPC4XX_H +#include "hw/ppc/ppc.h" +#include "exec/cpu-common.h" +#include "exec/memory.h" +/* PowerPC 4xx core initialization */ PowerPCCPU *ppc4xx_init(const char *cpu_model, clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
include/hw/ppc/spapr.h +1 -1
@@ -1,5 +1,5 @@/* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_SPAPR_H #define HW_SPAPR_H
include/hw/ppc/spapr_cpu_core.h +1 -1
@@ -8,7 +8,7 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_SPAPR_CPU_CORE_H #define HW_SPAPR_CPU_CORE_H
include/hw/ppc/spapr_irq.h +4 -1
@@ -7,11 +7,14 @@* COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ #ifndef HW_SPAPR_IRQ_H #define HW_SPAPR_IRQ_H +#include "hw/irq.h" +#include "target/ppc/cpu-qom.h" +/* * IRQ range offsets per device type */
include/hw/ppc/spapr_vio.h +7 -4
@@ -1,8 +1,11 @@ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_SPAPR_VIO_H #define HW_SPAPR_VIO_H +#include "hw/ppc/spapr.h" +/* * QEMU sPAPR VIO bus definitions *
@@ -39,6 +42,9 @@#define TYPE_SPAPR_VIO_BRIDGE "spapr-vio-bridge" +typedef struct SpaprVioDevice SpaprVioDevice ; +typedef struct SpaprVioBus SpaprVioBus ; + typedef struct SpaprVioCrq { uint64_t qladdr; uint32_t qsize;
@@ -46,9 +52,6 @@ typedef struct SpaprVioCrq {int (*SendFunc)(struct SpaprVioDevice *vdev,uint8_t *crq); } SpaprVioCrq; -typedef struct SpaprVioDevice SpaprVioDevice ; -typedef struct SpaprVioBus SpaprVioBus ; - typedef struct SpaprVioDeviceClass { DeviceClass parent_class;
include/hw/ppc/spapr_xive.h +4 -1
@@ -7,12 +7,15 @@* COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef PPC_SPAPR_XIVE_H #define PPC_SPAPR_XIVE_H +#include "hw/ppc/spapr_irq.h" #include "hw/ppc/xive.h" +#include "sysemu/sysemu.h" #define TYPE_SPAPR_XIVE "spapr-xive"#define SPAPR_XIVE (obj) OBJECT_CHECK(SpaprXive, (obj), TYPE_SPAPR_XIVE)
include/hw/ppc/xics_spapr.h +1 -1
@@ -25,7 +25,7 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef XICS_SPAPR_H #define XICS_SPAPR_H
include/hw/ppc/xive_regs.h +3 -2
@@ -13,11 +13,12 @@* COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef PPC_XIVE_REGS_H #define PPC_XIVE_REGS_H +#include "qemu/bswap.h" +#include "qemu/host-utils.h" +/* * Interrupt source number encoding on PowerBUS */
include/hw/riscv/boot.h +3 -1
@@ -17,11 +17,13 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ #ifndef RISCV_BOOT_H #define RISCV_BOOT_H +#include "exec/cpu-defs.h" +target_ulong riscv_load_firmware (const char *firmware_filename,hwaddr firmware_load_addr);target_ulong riscv_load_kernel (const char *kernel_filename);
include/hw/riscv/riscv_hart.h +5 -1
@@ -18,11 +18,15 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_RISCV_HART_H #define HW_RISCV_HART_H +#include "hw/sysbus.h" +#include "target/riscv/cpu.h" +#define TYPE_RISCV_HART_ARRAY "riscv.hart_array"#define RISCV_HART_ARRAY (obj) \
include/hw/riscv/riscv_htif.h +1 -1
@@ -18,7 +18,7 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_RISCV_HTIF_H #define HW_RISCV_HTIF_H
include/hw/riscv/sifive_clint.h +2 -2
@@ -17,11 +17,11 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_SIFIVE_CLINT_H #define HW_SIFIVE_CLINT_H +#include "hw/sysbus.h" +#define TYPE_SIFIVE_CLINT "riscv.sifive.clint"#define SIFIVE_CLINT (obj) \
include/hw/riscv/sifive_e.h +3 -1
@@ -16,11 +16,13 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_SIFIVE_E_H #define HW_SIFIVE_E_H +#include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_gpio.h" #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc"
include/hw/riscv/sifive_plic.h +1 -3
@@ -18,12 +18,10 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_SIFIVE_PLIC_H #define HW_SIFIVE_PLIC_H -#include "hw/irq.h" +#include "hw/sysbus.h" #define TYPE_SIFIVE_PLIC "riscv.sifive.plic"
include/hw/riscv/sifive_prci.h +2 -2
@@ -16,11 +16,11 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_SIFIVE_PRCI_H #define HW_SIFIVE_PRCI_H +#include "hw/sysbus.h" +enum {SIFIVE_PRCI_HFROSCCFG =0x0 , SIFIVE_PRCI_HFXOSCCFG = 0x4,
include/hw/riscv/sifive_test.h +2 -2
@@ -16,11 +16,11 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_SIFIVE_TEST_H #define HW_SIFIVE_TEST_H +#include "hw/sysbus.h" +#define TYPE_SIFIVE_TEST "riscv.sifive.test"#define SIFIVE_TEST (obj) \
include/hw/riscv/sifive_u.h +3 -1
@@ -16,12 +16,14 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_SIFIVE_U_H #define HW_SIFIVE_U_H #include "hw/net/cadence_gem.h" +#include "hw/riscv/riscv_hart.h" #define TYPE_RISCV_U_SOC "riscv.sifive.u.soc"#define RISCV_U_SOC (obj) \
include/hw/riscv/sifive_uart.h +3 -2
@@ -17,11 +17,12 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_SIFIVE_UART_H #define HW_SIFIVE_UART_H +#include "chardev/char-fe.h" +#include "hw/sysbus.h" +enum {SIFIVE_UART_TXFIFO =0 , SIFIVE_UART_RXFIFO = 4,
include/hw/riscv/spike.h +5 -1
@@ -16,11 +16,15 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_RISCV_SPIKE_H #define HW_RISCV_SPIKE_H +#include "hw/riscv/riscv_hart.h" +#include "hw/sysbus.h" + typedef struct { /*< private >*/ SysBusDevice parent_obj;
include/hw/riscv/virt.h +5 -1
@@ -16,11 +16,15 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_RISCV_VIRT_H #define HW_RISCV_VIRT_H +#include "hw/riscv/riscv_hart.h" +#include "hw/sysbus.h" + typedef struct { /*< private >*/ SysBusDevice parent_obj;
include/hw/s390x/3270-ccw.h +1 -1
@@ -11,7 +11,7 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_S390X_3270_CCW_H #define HW_S390X_3270_CCW_H
include/hw/s390x/ap-device.h +2 -2
@@ -8,11 +8,11 @@* directory. */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef HW_S390X_AP_DEVICE_H #define HW_S390X_AP_DEVICE_H +#include "hw/qdev-core.h" + #define AP_DEVICE_TYPE "ap-device" typedef struct APDevice {
include/hw/s390x/css-bridge.h +2 -3
@@ -10,12 +10,11 @@* directory. */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef HW_S390X_CSS_BRIDGE_H #define HW_S390X_CSS_BRIDGE_H + #include "qom/object.h" -#include "hw/qdev-core.h" +#include "hw/sysbus.h" /* virtual css bridge */ typedef struct VirtualCssBridge {
include/hw/s390x/css.h +2 -1
@@ -10,7 +10,7 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef CSS_H #define CSS_H
@@ -20,6 +20,7 @@#include "hw/s390x/s390_flic.h" #include "hw/s390x/ioinst.h" #include "sysemu/kvm.h" +#include "target/s390x/cpu-qom.h" /* Channel subsystem constants. */ #define MAX_DEVNO 65535
include/hw/s390x/s390-ccw.h +1 -1
@@ -11,7 +11,7 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_S390_CCW_H #define HW_S390_CCW_H
include/hw/s390x/storage-attributes.h +1 -1
@@ -10,7 +10,7 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef S390_STORAGE_ATTRIBUTES_H #define S390_STORAGE_ATTRIBUTES_H
include/hw/s390x/tod.h +1 -3
@@ -8,13 +8,11 @@* See the COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef HW_S390_TOD_H #define HW_S390_TOD_H #include "hw/qdev.h" -#include "s390-tod.h" +#include "target/s390x/s390-tod.h" typedef struct S390TOD { uint8_t high;
include/hw/s390x/vfio-ccw.h +1 -1
@@ -12,7 +12,7 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef HW_VFIO_CCW_H #define HW_VFIO_CCW_H
include/hw/semihosting/console.h +2 -1
@@ -7,11 +7,12 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef SEMIHOST_CONSOLE_H #define SEMIHOST_CONSOLE_H +#include "cpu.h" +/** * qemu_semihosting_console_outs: * @env: CPUArchState
include/hw/sh4/sh.h +0 -2
@@ -1,5 +1,3 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_SH_H #define QEMU_SH_H /* Definitions for SH board emulation. */
include/hw/sh4/sh_intc.h +1 -2
@@ -1,8 +1,7 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef SH_INTC_H #define SH_INTC_H +#include "exec/memory.h" #include "hw/irq.h" typedef unsigned char intc_enum ;
include/hw/sparc/sparc64.h +3 -1
@@ -1,8 +1,10 @@ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ #ifndef HW_SPARC_SPARC64_H #define HW_SPARC_SPARC64_H +#include "target/sparc/cpu-qom.h" +#define IVEC_MAX 0x40SPARCCPU *sparc64_cpu_devinit (const char *cpu_type,uint64_t prom_addr);
include/hw/ssi/aspeed_smc.h +1 -2
@@ -22,12 +22,11 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef ASPEED_SMC_H #define ASPEED_SMC_H #include "hw/ssi/ssi.h" +#include "hw/sysbus.h" typedef struct AspeedSegments { hwaddr addr;
include/hw/ssi/xilinx_spips.h +1 -2
@@ -22,14 +22,13 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef XILINX_SPIPS_H #define XILINX_SPIPS_H #include "hw/ssi/ssi.h" #include "qemu/fifo32.h" #include "hw/stream.h" +#include "hw/sysbus.h" typedef struct XilinxSPIPS XilinxSPIPS ;
include/hw/timer/allwinner-a10-pit.h +1 -2
@@ -1,9 +1,8 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef ALLWINNER_A10_PIT_H #define ALLWINNER_A10_PIT_H #include "hw/ptimer.h" +#include "hw/sysbus.h" #define TYPE_AW_A10_PIT "allwinner-A10-timer"#define AW_A10_PIT (obj) OBJECT_CHECK(AwA10PITState, (obj), TYPE_AW_A10_PIT)
include/hw/timer/i8254_internal.h +1 -2
@@ -22,13 +22,12 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef QEMU_I8254_INTERNAL_H #define QEMU_I8254_INTERNAL_H #include "hw/hw.h" #include "hw/isa/isa.h" +#include "hw/timer/i8254.h" #include "qemu/timer.h" typedef struct PITChannelState {
include/hw/timer/m48t59.h +2 -2
@@ -1,8 +1,8 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_M48T59_H #define HW_M48T59_H +#include "exec/hwaddr.h" +#include "hw/irq.h" #include "qom/object.h" #define TYPE_NVRAM "nvram"
include/hw/timer/mc146818rtc.h +0 -2
@@ -1,5 +1,3 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef MC146818RTC_H #define MC146818RTC_H
include/hw/timer/mc146818rtc_regs.h +2 -2
@@ -22,11 +22,11 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef MC146818RTC_REGS_H #define MC146818RTC_REGS_H +#include "qemu/timer.h" +#define RTC_ISA_IRQ 8#define RTC_SECONDS 0
include/hw/timer/sun4v-rtc.h +6 -1
@@ -1,3 +1,8 @@ -/* FIXME Does not pass make check-headers, yet! */ +#ifndef HW_TIMER_SUN4V_RTC_H +#define HW_TIMER_SUN4V_RTC_H + +#include "exec/hwaddr.h" void sun4v_rtc_init (hwaddr addr); + +#endif
include/hw/timer/xlnx-zynqmp-rtc.h +1 -2
@@ -24,12 +24,11 @@* THE SOFTWARE. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_TIMER_XLNX_ZYNQMP_RTC_H #define HW_TIMER_XLNX_ZYNQMP_RTC_H #include "hw/register.h" +#include "hw/sysbus.h" #define TYPE_XLNX_ZYNQMP_RTC "xlnx-zynmp.rtc"
include/hw/virtio/virtio-access.h +2 -1
@@ -14,11 +14,12 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef QEMU_VIRTIO_ACCESS_H #define QEMU_VIRTIO_ACCESS_H +#include "exec/hwaddr.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h"
include/hw/virtio/virtio-gpu-bswap.h +1 -2
@@ -11,12 +11,11 @@* See the COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef HW_VIRTIO_GPU_BSWAP_H #define HW_VIRTIO_GPU_BSWAP_H #include "qemu/bswap.h" +#include "standard-headers/linux/virtio_gpu.h" static inline void virtio_gpu_ctrl_hdr_bswap (struct virtio_gpu_ctrl_hdr *hdr)
include/hw/virtio/virtio-input.h +0 -2
@@ -1,5 +1,3 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_VIRTIO_INPUT_H #define QEMU_VIRTIO_INPUT_H
include/hw/virtio/virtio-rng.h +1 -2
@@ -9,11 +9,10 @@* top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_VIRTIO_RNG_H #define QEMU_VIRTIO_RNG_H +#include "hw/virtio/virtio.h" #include "sysemu/rng.h" #include "sysemu/rng-random.h" #include "standard-headers/linux/virtio_rng.h"
include/hw/watchdog/wdt_aspeed.h +1 -2
@@ -7,11 +7,10 @@* COPYING file in the top-level directory. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef WDT_ASPEED_H #define WDT_ASPEED_H +#include "hw/misc/aspeed_scu.h" #include "hw/sysbus.h" #define TYPE_ASPEED_WDT "aspeed.wdt"
include/libdecnumber/decNumberLocal.h +1 -2
@@ -37,8 +37,6 @@/* decNumber.h or one of decDouble (etc.) must be included first. */ /* ------------------------------------------------------------------ */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef DECNUMBERLOCAL_H #define DECNUMBERLOCAL_H
@@ -46,6 +44,7 @@#define DECNLAUTHOR "Mike Cowlishaw"/* Who to blame */ #include "libdecnumber/dconfig.h" +#include "libdecnumber/decContext.h" /* Conditional code flag -- set this to match hardware platform */ /* 1=little-endian, 0=big-endian */
include/migration/cpu.h +2 -1
@@ -1,11 +1,12 @@/* Declarations for use for CPU state serialization. */ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef MIGRATION_CPU_H #define MIGRATION_CPU_H +#include "exec/cpu-defs.h" +#if TARGET_LONG_BITS ==64 #define qemu_put_betl qemu_put_be64#define qemu_get_betl qemu_get_be64
include/monitor/hmp-target.h +2 -1
@@ -23,11 +23,12 @@*/ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef MONITOR_HMP_TARGET_H #define MONITOR_HMP_TARGET_H +#include "cpu.h" +#define MD_TLONG 0#define MD_I32 1
include/qemu/atomic128.h +2 -2
@@ -10,11 +10,11 @@* atomic primitive is meant to provide. */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_ATOMIC128_H #define QEMU_ATOMIC128_H +#include "qemu/int128.h" +/* * GCC is a house divided about supporting large atomic operations. *
include/qemu/ratelimit.h +2 -2
@@ -11,11 +11,11 @@* */ -/* FIXME Does not pass make check-headers, yet! */ - #ifndef QEMU_RATELIMIT_H #define QEMU_RATELIMIT_H +#include "qemu/timer.h" + typedef struct { int64_t slice_start_time; int64_t slice_end_time;
include/qemu/thread-win32.h +2 -2
@@ -1,4 +1,4 @@ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers without CONFIG_WIN32, yet! */ #ifndef QEMU_THREAD_WIN32_H #define QEMU_THREAD_WIN32_H
@@ -49,6 +49,6 @@ struct QemuThread { };/* Only valid for joinable threads. */ -HANDLE qemu_thread_get_handle (QemuThread *thread); +HANDLE qemu_thread_get_handle (struct QemuThread *thread);#endif
include/sysemu/balloon.h +1 -2
@@ -11,11 +11,10 @@* */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_BALLOON_H #define QEMU_BALLOON_H +#include "exec/cpu-common.h" #include "qapi/qapi-types-misc.h" typedef void (QEMUBalloonEvent )(void *opaque,ram_addr_t target);
include/sysemu/cryptodev-vhost-user.h +2 -2
@@ -21,11 +21,11 @@* */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef CRYPTODEV_VHOST_USER_H #define CRYPTODEV_VHOST_USER_H +#include "sysemu/cryptodev-vhost.h" +#define VHOST_USER_MAX_AUTH_KEY_LEN 512#define VHOST_USER_MAX_CIPHER_KEY_LEN 64
include/sysemu/dump.h +2 -1
@@ -11,7 +11,8 @@* */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef DUMP_H #define DUMP_H
include/sysemu/hvf.h +1 -1
@@ -11,11 +11,11 @@/* header to be included in non-HVF-specific code */ /* NOTE: May only be included into target-dependent code */ -/* FIXME Does not pass make check-headers, yet! */ #ifndef HVF_H #define HVF_H +#include "cpu.h" #include "qemu/bitops.h" #include "exec/memory.h" #include "sysemu/accel.h"
include/sysemu/iothread.h +1 -2
@@ -11,13 +11,12 @@* */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef IOTHREAD_H #define IOTHREAD_H #include "block/aio.h" #include "qemu/thread.h" +#include "qom/object.h" #define TYPE_IOTHREAD "iothread"
include/sysemu/kvm_int.h +2 -2
@@ -6,11 +6,11 @@* */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef QEMU_KVM_INT_H #define QEMU_KVM_INT_H +#include "exec/cpu-common.h" +#include "exec/memory.h" #include "sysemu/sysemu.h" #include "sysemu/accel.h" #include "sysemu/kvm.h"
include/sysemu/memory_mapping.h +4 -1
@@ -11,12 +11,15 @@* */ -/* FIXME Does not pass make check-headers, yet! */ +/* NOTE: May only be included into target-dependent code */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ #ifndef MEMORY_MAPPING_H #define MEMORY_MAPPING_H #include "qemu/queue.h" +#include "exec/cpu-common.h" +#include "exec/cpu-defs.h" #include "exec/memory.h" typedef struct GuestPhysBlock {
include/sysemu/xen-mapcache.h +2 -2
@@ -6,11 +6,11 @@* */ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef XEN_MAPCACHE_H #define XEN_MAPCACHE_H +#include "exec/cpu-common.h" +typedef hwaddr (*phys_offset_to_gaddr_t )(hwaddr phys_offset,ram_addr_t size);#ifdef CONFIG_XEN
include/ui/egl-helpers.h +5 -1
@@ -1,4 +1,5 @@ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers without CONFIG_OPENGL, yet! */ +/* FIXME Does not pass make check-headers without system emulation, yet! */ #ifndef EGL_HELPERS_H #define EGL_HELPERS_H
@@ -6,6 +7,9 @@#include <epoxy/gl.h> #include <epoxy/egl.h> #include <gbm.h> +#include "qapi/qapi-types-ui.h" +#include "ui/console.h" +#include "ui/shader.h" extern EGLDisplay *qemu_egl_display;extern EGLConfig qemu_egl_config;
include/ui/input.h +1 -2
@@ -1,9 +1,8 @@ -/* FIXME Does not pass make check-headers, yet! */ -#ifndef INPUT_H #define INPUT_H #include "qapi/qapi-types-ui.h" +#include "qemu/notify.h" #define INPUT_EVENT_MASK_KEY (1<<INPUT_EVENT_KIND_KEY)#define INPUT_EVENT_MASK_BTN (1<<INPUT_EVENT_KIND_BTN)
include/ui/pixel_ops.h +4 -1
@@ -1,4 +1,5 @@ -/* FIXME Does not pass make check-headers, yet! */ +#ifndef UI_PIXEL_OPS_H +#define UI_PIXEL_OPS_H static inline unsigned int rgb_to_pixel8 (unsigned int r,unsigned int g,unsigned int b)
@@ -53,3 +54,5 @@ static inline unsigned int rgb_to_pixel32bgr(unsigned int r, unsigned int g, {return (b <<16 ) | (g <<8 ) | r; } + +#endif
include/ui/spice-display.h +3 -1
@@ -15,11 +15,13 @@* along with this program; if not, see <http://www.gnu.org/licenses/>. */ -/* FIXME Does not pass make check-headers, yet! */ +/* FIXME Does not pass make check-headers without CONFIG_SPICE, yet! */ +/* FIXME Does not pass make check-headers without system emulation, yet! */ #ifndef UI_SPICE_DISPLAY_H #define UI_SPICE_DISPLAY_H +#include <spice.h> #include <spice/ipc_ring.h> #include <spice/enums.h> #include <spice/qxl_dev.h>
target/hppa/cpu.h +1 -1
@@ -22,7 +22,7 @@#include "cpu-qom.h" #include "exec/cpu-defs.h" - +#include "exec/memory.h" /* PA-RISC 1.x processors have a strong memory model. */ /* ??? While we do not yet implement PA-RISC 2.0, those processors have
tests/check-headers.mak +18 -0
@@ -25,6 +25,24 @@ untarget-headers := include/exec/poison.h # Extended regular expression matching the FIXME comment in headers # not expected to pass the test in this build's configuration: bad-header-regexp := FIXME Does not pass make check-headers( +# Fails in %-user: +ifneq ($(TARGET_DIR),) +ifneq ($(CONFIG_USER_ONLY),) +bad-header-regexp += for user emulation| +endif +endif +# Target-dependent arm only: +ifneq ($(TARGET_BASE_ARCH),arm) +bad-header-regexp += for TARGET_BASE_ARCH other than arm| +endif +# Target-dependent i386 only: +ifneq ($(TARGET_BASE_ARCH),i386) +bad-header-regexp += for TARGET_BASE_ARCH other than i386| +endif +# Target-dependent mips only: +ifneq ($(TARGET_BASE_ARCH),mips) +bad-header-regexp += for TARGET_BASE_ARCH other than mips| +endif # Require <cpuid.h>: ifneq ($(CONFIG_CPUID_H),y) bad-header-regexp += without CONFIG_CPUID_H|
Signature · 1 line
2.21.0
RFC PATCH v5 3/3 tests: Check target-independent headers for each target, too
In reply to Markus ArmbrusterTesting target-independent headers for each target is massive overkill, and may well be inacceptably slow. But let's see what explodes.
Numerous target-independent headers don't pass this test, by design or by accident. Fortunately, they all fail for a user emulation target.
Most failing headers may not be included into user emulation code:
they include hw/hw.h. Mark them with a comment
/* NOTE: May not be included into user emulation code */
so that the test skips them for user emulation targets.
Add the customary
/* FIXME Does not pass make check-headers for user emulation, yet! */
to the remaining ones.
--- include/exec/ioport.h | 2 ++ include/hw/acpi/acpi.h | 2 ++ include/hw/acpi/acpi_dev_interface.h | 2 ++ include/hw/acpi/cpu.h | 3 +++ include/hw/acpi/cpu_hotplug.h | 2 ++ include/hw/acpi/ich9.h | 2 ++ include/hw/acpi/memory_hotplug.h | 2 ++ include/hw/acpi/pcihp.h | 2 ++ include/hw/acpi/tco.h | 2 ++ include/hw/acpi/utils.h | 2 ++ include/hw/acpi/vmgenid.h | 2 ++ include/hw/adc/stm32f2xx_adc.h | 2 ++ include/hw/arm/aspeed.h | 3 +++ include/hw/arm/exynos4210.h | 2 ++ include/hw/arm/pxa.h | 2 ++ include/hw/arm/smmu-common.h | 3 ++- include/hw/arm/smmuv3.h | 2 ++ include/hw/arm/soc_dma.h | 2 ++ include/hw/arm/virt.h | 2 ++ include/hw/arm/xlnx-versal.h | 2 ++ include/hw/audio/pcspk.h | 2 ++ include/hw/audio/wm8750.h | 3 +++ include/hw/block/flash.h | 2 ++ include/hw/boards.h | 2 ++ include/hw/char/bcm2835_aux.h | 2 ++ include/hw/char/cadence_uart.h | 2 ++ include/hw/char/cmsdk-apb-uart.h | 2 ++ include/hw/char/digic-uart.h | 3 ++- include/hw/char/escc.h | 2 ++ include/hw/char/imx_serial.h | 2 ++ include/hw/char/lm32_juart.h | 2 ++ include/hw/char/nrf51_uart.h | 2 ++ include/hw/char/parallel.h | 2 ++ include/hw/char/pl011.h | 2 ++ include/hw/char/serial.h | 2 ++ include/hw/char/stm32f2xx_usart.h | 2 ++ include/hw/char/xilinx_uartlite.h | 2 ++ include/hw/core/split-irq.h | 3 +++ include/hw/cpu/a15mpcore.h | 3 +++ include/hw/cpu/a9mpcore.h | 3 +++ include/hw/cpu/arm11mpcore.h | 2 ++ include/hw/cpu/cluster.h | 3 +++ include/hw/cpu/core.h | 3 +++ include/hw/cris/etraxfs.h | 2 ++ include/hw/display/edid.h | 2 ++ include/hw/display/i2c-ddc.h | 2 ++ include/hw/display/milkymist_tmu2.h | 3 ++- include/hw/display/vga.h | 3 +++ include/hw/dma/bcm2835_dma.h | 2 ++ include/hw/dma/i8257.h | 2 ++ include/hw/dma/pl080.h | 2 ++ include/hw/dma/xlnx-zdma.h | 2 ++ include/hw/dma/xlnx-zynq-devcfg.h | 2 ++ include/hw/gpio/bcm2835_gpio.h | 2 ++ include/hw/gpio/imx_gpio.h | 2 ++ include/hw/gpio/nrf51_gpio.h | 4 +++- include/hw/hw.h | 2 ++ include/hw/i2c/aspeed_i2c.h | 2 ++ include/hw/i2c/bitbang_i2c.h | 2 ++ include/hw/i2c/i2c.h | 2 ++ include/hw/i2c/imx_i2c.h | 3 ++- include/hw/i2c/microbit_i2c.h | 2 ++ include/hw/i2c/pm_smbus.h | 2 ++ include/hw/i2c/ppc4xx_i2c.h | 2 ++ include/hw/i2c/smbus_eeprom.h | 2 ++ include/hw/i2c/smbus_master.h | 2 ++ include/hw/i2c/smbus_slave.h | 2 ++ include/hw/i386/ich9.h | 2 ++ include/hw/i386/intel_iommu.h | 2 ++ include/hw/i386/ioapic_internal.h | 2 ++ include/hw/i386/pc.h | 2 ++ include/hw/i386/x86-iommu.h | 2 ++ include/hw/ide.h | 2 ++ include/hw/ide/ahci.h | 3 ++- include/hw/ide/internal.h | 2 ++ include/hw/ide/pci.h | 2 ++ include/hw/input/adb.h | 2 ++ include/hw/input/i8042.h | 3 +++ include/hw/intc/allwinner-a10-pic.h | 2 ++ include/hw/intc/arm_gic.h | 2 ++ include/hw/intc/arm_gic_common.h | 2 ++ include/hw/intc/arm_gicv3.h | 2 ++ include/hw/intc/arm_gicv3_common.h | 2 ++ include/hw/intc/arm_gicv3_its_common.h | 2 ++ include/hw/intc/aspeed_vic.h | 3 +++ include/hw/intc/bcm2835_ic.h | 2 ++ include/hw/intc/bcm2836_control.h | 2 ++ include/hw/intc/heathrow_pic.h | 2 ++ include/hw/intc/imx_avic.h | 3 +++ include/hw/intc/imx_gpcv2.h | 2 ++ include/hw/intc/realview_gic.h | 2 ++ include/hw/intc/xlnx-pmu-iomod-intc.h | 2 ++ include/hw/intc/xlnx-zynqmp-ipi.h | 2 ++ include/hw/ipack/ipack.h | 2 ++ include/hw/ipmi/ipmi.h | 2 ++ include/hw/isa/apm.h | 2 ++ include/hw/isa/i8259_internal.h | 2 ++ include/hw/isa/isa.h | 2 ++ include/hw/isa/pc87312.h | 3 +++ include/hw/isa/superio.h | 3 +++ include/hw/loader.h | 2 ++ include/hw/mem/memory-device.h | 2 ++ include/hw/mem/nvdimm.h | 2 ++ include/hw/mem/pc-dimm.h | 3 ++- include/hw/misc/a9scu.h | 3 +++ include/hw/misc/arm11scu.h | 2 ++ include/hw/misc/armsse-cpuid.h | 2 ++ include/hw/misc/armsse-mhu.h | 2 ++ include/hw/misc/aspeed_scu.h | 3 +++ include/hw/misc/aspeed_sdmc.h | 3 +++ include/hw/misc/aspeed_xdma.h | 2 ++ include/hw/misc/auxbus.h | 3 ++- include/hw/misc/bcm2835_mbox.h | 2 ++ include/hw/misc/bcm2835_rng.h | 2 ++ include/hw/misc/imx25_ccm.h | 2 ++ include/hw/misc/imx2_wdt.h | 2 ++ include/hw/misc/imx31_ccm.h | 2 ++ include/hw/misc/imx6_ccm.h | 2 ++ include/hw/misc/imx6_src.h | 2 ++ include/hw/misc/imx6ul_ccm.h | 2 ++ include/hw/misc/imx7_ccm.h | 2 ++ include/hw/misc/imx7_gpr.h | 2 ++ include/hw/misc/imx7_snvs.h | 2 ++ include/hw/misc/imx_ccm.h | 2 ++ include/hw/misc/iotkit-secctl.h | 2 ++ include/hw/misc/iotkit-sysctl.h | 2 ++ include/hw/misc/iotkit-sysinfo.h | 2 ++ include/hw/misc/macio/cuda.h | 2 ++ include/hw/misc/macio/gpio.h | 2 ++ include/hw/misc/macio/macio.h | 2 ++ include/hw/misc/macio/pmu.h | 2 ++ include/hw/misc/mips_cmgcr.h | 3 ++- include/hw/misc/mips_cpc.h | 2 ++ include/hw/misc/mips_itu.h | 2 ++ include/hw/misc/mos6522.h | 2 ++ include/hw/misc/mps2-fpgaio.h | 2 ++ include/hw/misc/mps2-scc.h | 2 ++ include/hw/misc/msf2-sysreg.h | 2 ++ include/hw/misc/nrf51_rng.h | 3 ++- include/hw/misc/pca9552.h | 3 +++ include/hw/misc/stm32f2xx_syscfg.h | 2 ++ include/hw/misc/tz-mpc.h | 2 ++ include/hw/misc/tz-msc.h | 2 ++ include/hw/misc/tz-ppc.h | 2 ++ include/hw/misc/unimp.h | 2 ++ include/hw/misc/vmcoreinfo.h | 4 +++- include/hw/misc/zynq-xadc.h | 2 ++ include/hw/net/allwinner_emac.h | 3 ++- include/hw/net/cadence_gem.h | 2 ++ include/hw/net/ftgmac100.h | 2 ++ include/hw/net/imx_fec.h | 2 ++ include/hw/net/lance.h | 2 ++ include/hw/net/ne2000-isa.h | 2 ++ include/hw/nvram/fw_cfg.h | 2 ++ include/hw/nvram/nrf51_nvm.h | 4 +++- include/hw/or-irq.h | 2 ++ include/hw/pci-bridge/simba.h | 2 ++ include/hw/pci-host/designware.h | 2 ++ include/hw/pci-host/gpex.h | 2 ++ include/hw/pci-host/pam.h | 2 ++ include/hw/pci-host/q35.h | 2 ++ include/hw/pci-host/sabre.h | 2 ++ include/hw/pci-host/uninorth.h | 2 ++ include/hw/pci-host/xilinx-pcie.h | 2 ++ include/hw/pci/msi.h | 2 ++ include/hw/pci/msix.h | 2 ++ include/hw/pci/pci.h | 2 ++ include/hw/pci/pci_bridge.h | 3 ++- include/hw/pci/pci_bus.h | 2 ++ include/hw/pci/pci_host.h | 2 ++ include/hw/pci/pcie.h | 2 ++ include/hw/pci/pcie_aer.h | 2 ++ include/hw/pci/pcie_host.h | 2 ++ include/hw/pci/pcie_port.h | 2 ++ include/hw/pci/shpc.h | 2 ++ include/hw/pcmcia.h | 2 ++ include/hw/platform-bus.h | 2 ++ include/hw/ppc/mac_dbdma.h | 2 ++ include/hw/ppc/openpic.h | 2 ++ include/hw/ppc/pnv_lpc.h | 2 ++ include/hw/ppc/pnv_occ.h | 2 ++ include/hw/ppc/pnv_psi.h | 2 ++ include/hw/ppc/pnv_xive.h | 2 ++ include/hw/ppc/spapr_drc.h | 2 ++ include/hw/ppc/xics.h | 3 ++- include/hw/ppc/xive.h | 3 ++- include/hw/qdev.h | 2 ++ include/hw/register.h | 2 ++ include/hw/riscv/sifive_clint.h | 2 ++ include/hw/riscv/sifive_gpio.h | 3 +++ include/hw/riscv/sifive_plic.h | 2 ++ include/hw/riscv/sifive_prci.h | 2 ++ include/hw/riscv/sifive_test.h | 2 ++ include/hw/riscv/sifive_uart.h | 2 ++ include/hw/s390x/css-bridge.h | 2 ++ include/hw/s390x/event-facility.h | 3 ++- include/hw/s390x/s390-virtio-ccw.h | 3 +++ include/hw/s390x/s390_flic.h | 2 ++ include/hw/s390x/sclp.h | 3 ++- include/hw/s390x/storage-keys.h | 2 ++ include/hw/s390x/tod.h | 2 ++ include/hw/scsi/esp.h | 2 ++ include/hw/scsi/scsi.h | 2 ++ include/hw/sd/bcm2835_sdhost.h | 2 ++ include/hw/sd/sd.h | 2 ++ include/hw/sd/sdhci.h | 2 ++ include/hw/sh4/sh.h | 2 ++ include/hw/sh4/sh_intc.h | 2 ++ include/hw/sparc/grlib.h | 2 ++ include/hw/sparc/sparc32_dma.h | 2 ++ include/hw/sparc/sun4m_iommu.h | 2 ++ include/hw/sparc/sun4u_iommu.h | 2 ++ include/hw/ssi/aspeed_smc.h | 2 ++ include/hw/ssi/imx_spi.h | 2 ++ include/hw/ssi/mss-spi.h | 2 ++ include/hw/ssi/pl022.h | 2 ++ include/hw/ssi/ssi.h | 2 ++ include/hw/ssi/stm32f2xx_spi.h | 2 ++ include/hw/ssi/xilinx_spips.h | 2 ++ include/hw/sysbus.h | 2 ++ include/hw/timer/a9gtimer.h | 2 ++ include/hw/timer/allwinner-a10-pit.h | 2 ++ include/hw/timer/arm_mptimer.h | 3 +++ include/hw/timer/armv7m_systick.h | 2 ++ include/hw/timer/aspeed_rtc.h | 3 +++ include/hw/timer/aspeed_timer.h | 3 +++ include/hw/timer/cmsdk-apb-dualtimer.h | 2 ++ include/hw/timer/cmsdk-apb-timer.h | 2 ++ include/hw/timer/digic-timer.h | 3 ++- include/hw/timer/i8254.h | 2 ++ include/hw/timer/i8254_internal.h | 2 ++ include/hw/timer/imx_epit.h | 2 ++ include/hw/timer/imx_gpt.h | 2 ++ include/hw/timer/mc146818rtc.h | 2 ++ include/hw/timer/mss-timer.h | 2 ++ include/hw/timer/nrf51_timer.h | 3 +++ include/hw/timer/pl031.h | 2 ++ include/hw/timer/stm32f2xx_timer.h | 2 ++ include/hw/timer/xlnx-zynqmp-rtc.h | 2 ++ include/hw/usb.h | 2 ++ include/hw/usb/chipidea.h | 2 ++ include/hw/virtio/vhost-backend.h | 3 ++- include/hw/virtio/vhost-scsi-common.h | 3 ++- include/hw/virtio/vhost-scsi.h | 3 ++- include/hw/virtio/vhost-user-blk.h | 3 ++- include/hw/virtio/vhost-user-scsi.h | 3 ++- include/hw/virtio/vhost-user.h | 2 ++ include/hw/virtio/vhost-vsock.h | 2 ++ include/hw/virtio/vhost.h | 2 ++ include/hw/virtio/virtio-balloon.h | 3 ++- include/hw/virtio/virtio-blk.h | 3 ++- include/hw/virtio/virtio-bus.h | 3 ++- include/hw/virtio/virtio-crypto.h | 2 ++ include/hw/virtio/virtio-input.h | 2 ++ include/hw/virtio/virtio-net.h | 3 ++- include/hw/virtio/virtio-pmem.h | 2 ++ include/hw/virtio/virtio-rng.h | 2 ++ include/hw/virtio/virtio-scsi.h | 3 ++- include/hw/virtio/virtio-serial.h | 3 ++- include/hw/virtio/virtio.h | 3 ++- include/hw/watchdog/cmsdk-apb-watchdog.h | 2 ++ include/hw/watchdog/wdt_aspeed.h | 2 ++ include/hw/watchdog/wdt_diag288.h | 2 ++ include/hw/xen/xen.h | 2 ++ include/net/vhost_net.h | 2 ++ include/qemu/iova-tree.h | 3 +++ include/sysemu/balloon.h | 3 ++- include/sysemu/cryptodev-vhost-user.h | 3 ++- include/sysemu/cryptodev-vhost.h | 4 +++- include/sysemu/dma.h | 2 ++ include/sysemu/hostmem.h | 2 ++ include/sysemu/kvm_int.h | 3 ++- include/sysemu/numa.h | 2 ++ include/sysemu/vhost-user-backend.h | 3 +++ include/sysemu/xen-mapcache.h | 3 ++- tests/check-headers.mak | 14 ++++++++++---- 276 files changed, 590 insertions(+), 40 deletions(-)
include/exec/ioport.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +/************************************************************************** * IO ports API */
include/hw/acpi/acpi.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_HW_ACPI_H #define QEMU_HW_ACPI_H
include/hw/acpi/acpi_dev_interface.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef ACPI_DEV_INTERFACE_H #define ACPI_DEV_INTERFACE_H
include/hw/acpi/cpu.h +3 -0
@@ -9,6 +9,9 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef ACPI_CPU_H #define ACPI_CPU_H
include/hw/acpi/cpu_hotplug.h +2 -0
@@ -10,6 +10,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ACPI_CPU_HOTPLUG_H #define HW_ACPI_CPU_HOTPLUG_H
include/hw/acpi/ich9.h +2 -0
@@ -18,6 +18,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ACPI_ICH9_H #define HW_ACPI_ICH9_H
include/hw/acpi/memory_hotplug.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_HW_ACPI_MEMORY_HOTPLUG_H #define QEMU_HW_ACPI_MEMORY_HOTPLUG_H
include/hw/acpi/pcihp.h +2 -0
@@ -24,6 +24,8 @@* GNU GPL, version 2 or (at your option) any later version. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ACPI_PCIHP_H #define HW_ACPI_PCIHP_H
include/hw/acpi/tco.h +2 -0
@@ -7,6 +7,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef HW_ACPI_TCO_H #define HW_ACPI_TCO_H
include/hw/acpi/utils.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ACPI_UTILS_H #define HW_ACPI_UTILS_H
include/hw/acpi/vmgenid.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef ACPI_VMGENID_H #define ACPI_VMGENID_H
include/hw/adc/stm32f2xx_adc.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_STM32F2XX_ADC_H #define HW_STM32F2XX_ADC_H
include/hw/arm/aspeed.h +3 -0
@@ -6,6 +6,9 @@* This code is licensed under the GPL version 2 or later. See * the COPYING file in the top-level directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef ARM_ASPEED_H #define ARM_ASPEED_H
include/hw/arm/exynos4210.h +2 -0
@@ -21,6 +21,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef EXYNOS4210_H #define EXYNOS4210_H
include/hw/arm/pxa.h +2 -0
@@ -7,6 +7,8 @@* This code is licensed under the GNU GPL v2. */ +/* NOTE: May not be included into user emulation code */ +#ifndef PXA_H #define PXA_H
include/hw/arm/smmu-common.h +2 -1
@@ -13,9 +13,10 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ARM_SMMU_COMMON_H #define HW_ARM_SMMU_COMMON_H
include/hw/arm/smmuv3.h +2 -0
@@ -16,6 +16,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ARM_SMMUV3_H #define HW_ARM_SMMUV3_H
include/hw/arm/soc_dma.h +2 -0
@@ -18,6 +18,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef HW_SOC_DMA_H #define HW_SOC_DMA_H
include/hw/arm/virt.h +2 -0
@@ -27,6 +27,8 @@* This is essentially the same approach kvmtool uses. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_ARM_VIRT_H #define QEMU_ARM_VIRT_H
include/hw/arm/xlnx-versal.h +2 -0
@@ -9,6 +9,8 @@* (at your option) any later version. */ +/* NOTE: May not be included into user emulation code */ +#ifndef XLNX_VERSAL_H #define XLNX_VERSAL_H
include/hw/audio/pcspk.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_PCSPK_H #define HW_PCSPK_H
include/hw/audio/wm8750.h +3 -0
@@ -11,6 +11,9 @@* You should have received a copy of the GNU General Public License along with * this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_DAC_WM8750_H #define HW_DAC_WM8750_H
include/hw/block/flash.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef HW_FLASH_H #define HW_FLASH_H
include/hw/boards.h +2 -0
@@ -1,5 +1,7 @@/* Declarations for use by board files for creating devices. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_BOARDS_H #define HW_BOARDS_H
include/hw/char/bcm2835_aux.h +2 -0
@@ -5,6 +5,8 @@* This code is licensed under the GNU GPLv2 and later. */ +/* NOTE: May not be included into user emulation code */ +#ifndef BCM2835_AUX_H #define BCM2835_AUX_H
include/hw/char/cadence_uart.h +2 -0
@@ -16,6 +16,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef CADENCE_UART_H #define CADENCE_UART_H
include/hw/char/cmsdk-apb-uart.h +2 -0
@@ -9,6 +9,8 @@* (at your option) any later version. */ +/* NOTE: May not be included into user emulation code */ +#ifndef CMSDK_APB_UART_H #define CMSDK_APB_UART_H
include/hw/char/digic-uart.h +2 -1
@@ -12,9 +12,10 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_CHAR_DIGIC_UART_H #define HW_CHAR_DIGIC_UART_H
include/hw/char/escc.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ESCC_H #define HW_ESCC_H
include/hw/char/imx_serial.h +2 -0
@@ -15,6 +15,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_SERIAL_H #define IMX_SERIAL_H
include/hw/char/lm32_juart.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_HW_CHAR_LM32_JUART_H #define QEMU_HW_CHAR_LM32_JUART_H
include/hw/char/nrf51_uart.h +2 -0
@@ -8,6 +8,8 @@* (at your option) any later version. */ +/* NOTE: May not be included into user emulation code */ +#ifndef NRF51_UART_H #define NRF51_UART_H
include/hw/char/parallel.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_PARALLEL_H #define HW_PARALLEL_H
include/hw/char/pl011.h +2 -0
@@ -12,6 +12,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_PL011_H #define HW_PL011_H
include/hw/char/serial.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SERIAL_H #define HW_SERIAL_H
include/hw/char/stm32f2xx_usart.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_STM32F2XX_USART_H #define HW_STM32F2XX_USART_H
include/hw/char/xilinx_uartlite.h +2 -0
@@ -12,6 +12,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef XILINX_UARTLITE_H #define XILINX_UARTLITE_H
include/hw/core/split-irq.h +3 -0
@@ -32,6 +32,9 @@* + N unnamed GPIO outputs: the output lines * + QOM property "num-lines": sets the number of output lines */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SPLIT_IRQ_H #define HW_SPLIT_IRQ_H
include/hw/cpu/a15mpcore.h +3 -0
@@ -17,6 +17,9 @@* You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_CPU_A15MPCORE_H #define HW_CPU_A15MPCORE_H
include/hw/cpu/a9mpcore.h +3 -0
@@ -7,6 +7,9 @@* * This code is licensed under the GPL. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_CPU_A9MPCORE_H #define HW_CPU_A9MPCORE_H
include/hw/cpu/arm11mpcore.h +2 -0
@@ -7,6 +7,8 @@* This code is licensed under the GPL. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_CPU_ARM11MPCORE_H #define HW_CPU_ARM11MPCORE_H
include/hw/cpu/cluster.h +3 -0
@@ -17,6 +17,9 @@* along with this program; if not, see * <http://www.gnu.org/licenses/gpl-2.0.html> */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_CPU_CLUSTER_H #define HW_CPU_CLUSTER_H
include/hw/cpu/core.h +3 -0
@@ -6,6 +6,9 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_CPU_CORE_H #define HW_CPU_CORE_H
include/hw/cris/etraxfs.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ETRAXFS_H #define HW_ETRAXFS_H
include/hw/display/edid.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef EDID_H #define EDID_H
include/hw/display/i2c-ddc.h +2 -0
@@ -16,6 +16,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef I2C_DDC_H #define I2C_DDC_H
include/hw/display/milkymist_tmu2.h +2 -1
@@ -21,9 +21,10 @@* * Specification available at: * http://milkymist.walle.cc/socdoc/tmu2.pdf -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_DISPLAY_MILKYMIST_TMU2_H #define HW_DISPLAY_MILKYMIST_TMU2_H
include/hw/display/vga.h +3 -0
@@ -6,6 +6,9 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef QEMU_HW_DISPLAY_VGA_H #define QEMU_HW_DISPLAY_VGA_H
include/hw/dma/bcm2835_dma.h +2 -0
@@ -3,6 +3,8 @@* This code is licensed under the GNU GPLv2 and later. */ +/* NOTE: May not be included into user emulation code */ +#ifndef BCM2835_DMA_H #define BCM2835_DMA_H
include/hw/dma/i8257.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_I8257_H #define HW_I8257_H
include/hw/dma/pl080.h +2 -0
@@ -25,6 +25,8 @@* bus master transactions are made */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_DMA_PL080_H #define HW_DMA_PL080_H
include/hw/dma/xlnx-zdma.h +2 -0
@@ -26,6 +26,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef XLNX_ZDMA_H #define XLNX_ZDMA_H
include/hw/dma/xlnx-zynq-devcfg.h +2 -0
@@ -24,6 +24,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef XLNX_ZYNQ_DEVCFG_H #define XLNX_ZYNQ_DEVCFG_H
include/hw/gpio/bcm2835_gpio.h +2 -0
@@ -11,6 +11,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef BCM2835_GPIO_H #define BCM2835_GPIO_H
include/hw/gpio/imx_gpio.h +2 -0
@@ -17,6 +17,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_GPIO_H #define IMX_GPIO_H
include/hw/gpio/nrf51_gpio.h +3 -1
@@ -21,8 +21,10 @@* * This code is licensed under the GPL version 2 or later. See * the COPYING file in the top-level directory. -* */ + +/* NOTE: May not be included into user emulation code */ +#ifndef NRF51_GPIO_H #define NRF51_GPIO_H
include/hw/hw.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +/* Declarations for use by hardware emulation. */ #ifndef QEMU_HW_H #define QEMU_HW_H
include/hw/i2c/aspeed_i2c.h +2 -0
@@ -18,6 +18,8 @@* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* NOTE: May not be included into user emulation code */ +#ifndef ASPEED_I2C_H #define ASPEED_I2C_H
include/hw/i2c/bitbang_i2c.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef BITBANG_I2C_H #define BITBANG_I2C_H
include/hw/i2c/i2c.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_I2C_H #define QEMU_I2C_H
include/hw/i2c/imx_i2c.h +2 -1
@@ -15,9 +15,10 @@* * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_I2C_H #define IMX_I2C_H
include/hw/i2c/microbit_i2c.h +2 -0
@@ -8,6 +8,8 @@* the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef MICROBIT_I2C_H #define MICROBIT_I2C_H
include/hw/i2c/pm_smbus.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef PM_SMBUS_H #define PM_SMBUS_H
include/hw/i2c/ppc4xx_i2c.h +2 -0
@@ -24,6 +24,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef PPC4XX_I2C_H #define PPC4XX_I2C_H
include/hw/i2c/smbus_eeprom.h +2 -0
@@ -20,6 +20,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SMBUS_EEPROM_H #define HW_SMBUS_EEPROM_H
include/hw/i2c/smbus_master.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SMBUS_MASTER_H #define HW_SMBUS_MASTER_H
include/hw/i2c/smbus_slave.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SMBUS_SLAVE_H #define HW_SMBUS_SLAVE_H
include/hw/i386/ich9.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ICH9_H #define HW_ICH9_H
include/hw/i386/intel_iommu.h +2 -0
@@ -19,6 +19,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef INTEL_IOMMU_H #define INTEL_IOMMU_H #include "hw/qdev.h"
include/hw/i386/ioapic_internal.h +2 -0
@@ -19,6 +19,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_IOAPIC_INTERNAL_H #define QEMU_IOAPIC_INTERNAL_H
include/hw/i386/pc.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_PC_H #define HW_PC_H
include/hw/i386/x86-iommu.h +2 -0
@@ -17,6 +17,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_I386_X86_IOMMU_H #define HW_I386_X86_IOMMU_H
include/hw/ide.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_IDE_H #define HW_IDE_H
include/hw/ide/ahci.h +2 -1
@@ -18,9 +18,10 @@* * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_IDE_AHCI_H #define HW_IDE_AHCI_H
include/hw/ide/internal.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_IDE_INTERNAL_H #define HW_IDE_INTERNAL_H
include/hw/ide/pci.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_IDE_PCI_H #define HW_IDE_PCI_H
include/hw/input/adb.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef ADB_H #define ADB_H
include/hw/input/i8042.h +3 -0
@@ -5,6 +5,9 @@* * SPDX-License-Identifier: MIT */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_INPUT_I8042_H #define HW_INPUT_I8042_H
include/hw/intc/allwinner-a10-pic.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef ALLWINNER_A10_PIC_H #define ALLWINNER_A10_PIC_H
include/hw/intc/arm_gic.h +2 -0
@@ -61,6 +61,8 @@* ... */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ARM_GIC_H #define HW_ARM_GIC_H
include/hw/intc/arm_gic_common.h +2 -0
@@ -18,6 +18,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ARM_GIC_COMMON_H #define HW_ARM_GIC_COMMON_H
include/hw/intc/arm_gicv3.h +2 -0
@@ -9,6 +9,8 @@* any later version. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ARM_GICV3_H #define HW_ARM_GICV3_H
include/hw/intc/arm_gicv3_common.h +2 -0
@@ -21,6 +21,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ARM_GICV3_COMMON_H #define HW_ARM_GICV3_COMMON_H
include/hw/intc/arm_gicv3_its_common.h +2 -0
@@ -18,6 +18,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_ARM_GICV3_ITS_COMMON_H #define QEMU_ARM_GICV3_ITS_COMMON_H
include/hw/intc/aspeed_vic.h +3 -0
@@ -10,6 +10,9 @@* * Need to add SVIC and CVIC support */ + +/* NOTE: May not be included into user emulation code */ +#ifndef ASPEED_VIC_H #define ASPEED_VIC_H
include/hw/intc/bcm2835_ic.h +2 -0
@@ -3,6 +3,8 @@* This code is licensed under the GNU GPLv2 and later. */ +/* NOTE: May not be included into user emulation code */ +#ifndef BCM2835_IC_H #define BCM2835_IC_H
include/hw/intc/bcm2836_control.h +2 -0
@@ -11,6 +11,8 @@* This code is licensed under the GNU GPLv2 and later. */ +/* NOTE: May not be included into user emulation code */ +#ifndef BCM2836_CONTROL_H #define BCM2836_CONTROL_H
include/hw/intc/heathrow_pic.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_INTC_HEATHROW_PIC_H #define HW_INTC_HEATHROW_PIC_H
include/hw/intc/imx_avic.h +3 -0
@@ -14,6 +14,9 @@* * TODO: implement vectors. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_AVIC_H #define IMX_AVIC_H
include/hw/intc/imx_gpcv2.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_GPCV2_H #define IMX_GPCV2_H
include/hw/intc/realview_gic.h +2 -0
@@ -7,6 +7,8 @@* This code is licensed under the GPL. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_INTC_REALVIEW_GIC_H #define HW_INTC_REALVIEW_GIC_H
include/hw/intc/xlnx-pmu-iomod-intc.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_INTC_XLNX_PMU_IOMOD_INTC_H #define HW_INTC_XLNX_PMU_IOMOD_INTC_H
include/hw/intc/xlnx-zynqmp-ipi.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef XLNX_ZYNQMP_IPI_H #define XLNX_ZYNQMP_IPI_H
include/hw/ipack/ipack.h +2 -0
@@ -8,6 +8,8 @@* later version. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_IPACK_H #define QEMU_IPACK_H
include/hw/ipmi/ipmi.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_IPMI_H #define HW_IPMI_H
include/hw/isa/apm.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef APM_H #define APM_H
include/hw/isa/i8259_internal.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_I8259_INTERNAL_H #define QEMU_I8259_INTERNAL_H
include/hw/isa/isa.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ISA_H #define HW_ISA_H
include/hw/isa/pc87312.h +3 -0
@@ -22,6 +22,9 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_PC87312_H #define QEMU_PC87312_H
include/hw/isa/superio.h +3 -0
@@ -7,6 +7,9 @@* See the COPYING file in the top-level directory. * SPDX-License-Identifier: GPL-2.0-or-later */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_ISA_SUPERIO_H #define HW_ISA_SUPERIO_H
include/hw/loader.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef LOADER_H #define LOADER_H #include "hw/nvram/fw_cfg.h"
include/hw/mem/memory-device.h +2 -0
@@ -10,6 +10,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef MEMORY_DEVICE_H #define MEMORY_DEVICE_H
include/hw/mem/nvdimm.h +2 -0
@@ -20,6 +20,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_NVDIMM_H #define QEMU_NVDIMM_H
include/hw/mem/pc-dimm.h +2 -1
@@ -10,9 +10,10 @@* * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_PC_DIMM_H #define QEMU_PC_DIMM_H
include/hw/misc/a9scu.h +3 -0
@@ -7,6 +7,9 @@* * This code is licensed under the GPL. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MISC_A9SCU_H #define HW_MISC_A9SCU_H
include/hw/misc/arm11scu.h +2 -0
@@ -8,6 +8,8 @@* This code is licensed under the GPL. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MISC_ARM11SCU_H #define HW_MISC_ARM11SCU_H
include/hw/misc/armsse-cpuid.h +2 -0
@@ -19,6 +19,8 @@* + sysbus MMIO region 0: the system information register bank */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MISC_ARMSSE_CPUID_H #define HW_MISC_ARMSSE_CPUID_H
include/hw/misc/armsse-mhu.h +2 -0
@@ -20,6 +20,8 @@* + sysbus IRQ 1: interrupt for CPU 1 */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MISC_ARMSSE_MHU_H #define HW_MISC_ARMSSE_MHU_H
include/hw/misc/aspeed_scu.h +3 -0
@@ -8,6 +8,9 @@* This code is licensed under the GPL version 2 or later. See * the COPYING file in the top-level directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef ASPEED_SCU_H #define ASPEED_SCU_H
include/hw/misc/aspeed_sdmc.h +3 -0
@@ -6,6 +6,9 @@* This code is licensed under the GPL version 2 or later. See the * COPYING file in the top-level directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef ASPEED_SDMC_H #define ASPEED_SDMC_H
include/hw/misc/aspeed_xdma.h +2 -0
@@ -6,6 +6,8 @@* SPDX-License-Identifer: GPL-2.0-or-later */ +/* NOTE: May not be included into user emulation code */ +#ifndef ASPEED_XDMA_H #define ASPEED_XDMA_H
include/hw/misc/auxbus.h +2 -1
@@ -19,9 +19,10 @@* * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MISC_AUXBUS_H #define HW_MISC_AUXBUS_H
include/hw/misc/bcm2835_mbox.h +2 -0
@@ -3,6 +3,8 @@* This code is licensed under the GNU GPLv2 and later. */ +/* NOTE: May not be included into user emulation code */ +#ifndef BCM2835_MBOX_H #define BCM2835_MBOX_H
include/hw/misc/bcm2835_rng.h +2 -0
@@ -7,6 +7,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef BCM2835_RNG_H #define BCM2835_RNG_H
include/hw/misc/imx25_ccm.h +2 -0
@@ -8,6 +8,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX25_CCM_H #define IMX25_CCM_H
include/hw/misc/imx2_wdt.h +2 -0
@@ -9,6 +9,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX2_WDT_H #define IMX2_WDT_H
include/hw/misc/imx31_ccm.h +2 -0
@@ -8,6 +8,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX31_CCM_H #define IMX31_CCM_H
include/hw/misc/imx6_ccm.h +2 -0
@@ -8,6 +8,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX6_CCM_H #define IMX6_CCM_H
include/hw/misc/imx6_src.h +2 -0
@@ -8,6 +8,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX6_SRC_H #define IMX6_SRC_H
include/hw/misc/imx6ul_ccm.h +2 -0
@@ -7,6 +7,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX6UL_CCM_H #define IMX6UL_CCM_H
include/hw/misc/imx7_ccm.h +2 -0
@@ -9,6 +9,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX7_CCM_H #define IMX7_CCM_H
include/hw/misc/imx7_gpr.h +2 -0
@@ -9,6 +9,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX7_GPR_H #define IMX7_GPR_H
include/hw/misc/imx7_snvs.h +2 -0
@@ -9,6 +9,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX7_SNVS_H #define IMX7_SNVS_H
include/hw/misc/imx_ccm.h +2 -0
@@ -8,6 +8,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_CCM_H #define IMX_CCM_H
include/hw/misc/iotkit-secctl.h +2 -0
@@ -52,6 +52,8 @@* + named GPIO outputs mscexp_ns[0..15] */ +/* NOTE: May not be included into user emulation code */ +#ifndef IOTKIT_SECCTL_H #define IOTKIT_SECCTL_H
include/hw/misc/iotkit-sysctl.h +2 -0
@@ -24,6 +24,8 @@* + sysbus MMIO region 1: the system control register bank */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MISC_IOTKIT_SYSCTL_H #define HW_MISC_IOTKIT_SYSCTL_H
include/hw/misc/iotkit-sysinfo.h +2 -0
@@ -19,6 +19,8 @@* + sysbus MMIO region 0: the system information register bank */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MISC_IOTKIT_SYSINFO_H #define HW_MISC_IOTKIT_SYSINFO_H
include/hw/misc/macio/cuda.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef CUDA_H #define CUDA_H
include/hw/misc/macio/gpio.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef MACIO_GPIO_H #define MACIO_GPIO_H
include/hw/misc/macio/macio.h +2 -0
@@ -23,6 +23,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef MACIO_H #define MACIO_H
include/hw/misc/macio/pmu.h +2 -0
@@ -7,6 +7,8 @@* Copyright (C) 2016 Ben Herrenschmidt */ +/* NOTE: May not be included into user emulation code */ +#ifndef PMU_H #define PMU_H
include/hw/misc/mips_cmgcr.h +2 -1
@@ -4,9 +4,10 @@* for more details. * * Copyright (C) 2015 Imagination Technologies -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef MIPS_CMGCR_H #define MIPS_CMGCR_H
include/hw/misc/mips_cpc.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef MIPS_CPC_H #define MIPS_CPC_H
include/hw/misc/mips_itu.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef MIPS_ITU_H #define MIPS_ITU_H
include/hw/misc/mos6522.h +2 -0
@@ -24,6 +24,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef MOS6522_H #define MOS6522_H
include/hw/misc/mps2-fpgaio.h +2 -0
@@ -18,6 +18,8 @@* + sysbus MMIO region 0: the register bank */ +/* NOTE: May not be included into user emulation code */ +#ifndef MPS2_FPGAIO_H #define MPS2_FPGAIO_H
include/hw/misc/mps2-scc.h +2 -0
@@ -9,6 +9,8 @@* (at your option) any later version. */ +/* NOTE: May not be included into user emulation code */ +#ifndef MPS2_SCC_H #define MPS2_SCC_H
include/hw/misc/msf2-sysreg.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MSF2_SYSREG_H #define HW_MSF2_SYSREG_H
include/hw/misc/nrf51_rng.h +2 -1
@@ -28,9 +28,10 @@* * This code is licensed under the GPL version 2 or later. See * the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef NRF51_RNG_H #define NRF51_RNG_H
include/hw/misc/pca9552.h +3 -0
@@ -6,6 +6,9 @@* This work is licensed under the terms of the GNU GPL, version 2 or * later. See the COPYING file in the top-level directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef PCA9552_H #define PCA9552_H
include/hw/misc/stm32f2xx_syscfg.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_STM32F2XX_SYSCFG_H #define HW_STM32F2XX_SYSCFG_H
include/hw/misc/tz-mpc.h +2 -0
@@ -28,6 +28,8 @@* + Named GPIO output "irq": set for a transaction-failed interrupt */ +/* NOTE: May not be included into user emulation code */ +#ifndef TZ_MPC_H #define TZ_MPC_H
include/hw/misc/tz-msc.h +2 -0
@@ -47,6 +47,8 @@* make memory transactions to */ +/* NOTE: May not be included into user emulation code */ +#ifndef TZ_MSC_H #define TZ_MSC_H
include/hw/misc/tz-ppc.h +2 -0
@@ -62,6 +62,8 @@* parameter.) */ +/* NOTE: May not be included into user emulation code */ +#ifndef TZ_PPC_H #define TZ_PPC_H
include/hw/misc/unimp.h +2 -0
@@ -5,6 +5,8 @@* Written by Peter Maydell */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MISC_UNIMP_H #define HW_MISC_UNIMP_H
include/hw/misc/vmcoreinfo.h +3 -1
@@ -7,8 +7,10 @@* * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. -* */ + +/* NOTE: May not be included into user emulation code */ +#ifndef VMCOREINFO_H #define VMCOREINFO_H
include/hw/misc/zynq-xadc.h +2 -0
@@ -12,6 +12,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef ZYNQ_XADC_H #define ZYNQ_XADC_H
include/hw/net/allwinner_emac.h +2 -1
@@ -17,9 +17,10 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef ALLWINNER_EMAC_H #define ALLWINNER_EMAC_H
include/hw/net/cadence_gem.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef CADENCE_GEM_H #define CADENCE_GEM_H
include/hw/net/ftgmac100.h +2 -0
@@ -7,6 +7,8 @@* COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef FTGMAC100_H #define FTGMAC100_H
include/hw/net/imx_fec.h +2 -0
@@ -21,6 +21,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_FEC_H #define IMX_FEC_H
include/hw/net/lance.h +2 -0
@@ -26,6 +26,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef LANCE_H #define LANCE_H
include/hw/net/ne2000-isa.h +2 -0
@@ -7,6 +7,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_NET_NE2000_ISA_H #define HW_NET_NE2000_ISA_H
include/hw/nvram/fw_cfg.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef FW_CFG_H #define FW_CFG_H
include/hw/nvram/nrf51_nvm.h +3 -1
@@ -17,8 +17,10 @@* * This code is licensed under the GPL version 2 or later. See * the COPYING file in the top-level directory. -* */ + +/* NOTE: May not be included into user emulation code */ +#ifndef NRF51_NVM_H #define NRF51_NVM_H
include/hw/or-irq.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_OR_IRQ_H #define HW_OR_IRQ_H
include/hw/pci-bridge/simba.h +2 -0
@@ -24,6 +24,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_PCI_BRIDGE_SIMBA_H #define HW_PCI_BRIDGE_SIMBA_H
include/hw/pci-host/designware.h +2 -0
@@ -18,6 +18,8 @@* <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef DESIGNWARE_H #define DESIGNWARE_H
include/hw/pci-host/gpex.h +2 -0
@@ -17,6 +17,8 @@* along with this program; if not, see <http://www.gnu.org/licenses/> */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_GPEX_H #define HW_GPEX_H
include/hw/pci-host/pam.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef QEMU_PAM_H #define QEMU_PAM_H
include/hw/pci-host/q35.h +2 -0
@@ -19,6 +19,8 @@* along with this program; if not, see <http://www.gnu.org/licenses/> */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_Q35_H #define HW_Q35_H
include/hw/pci-host/sabre.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_PCI_HOST_SABRE_H #define HW_PCI_HOST_SABRE_H
include/hw/pci-host/uninorth.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef UNINORTH_H #define UNINORTH_H
include/hw/pci-host/xilinx-pcie.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_XILINX_PCIE_H #define HW_XILINX_PCIE_H
include/hw/pci/msi.h +2 -0
@@ -18,6 +18,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_MSI_H #define QEMU_MSI_H
include/hw/pci/msix.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_MSIX_H #define QEMU_MSIX_H
include/hw/pci/pci.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_PCI_H #define QEMU_PCI_H
include/hw/pci/pci_bridge.h +2 -1
@@ -20,9 +20,10 @@* split out pci bus specific stuff from pci.[hc] to pci_bridge.[hc] * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp> * VA Linux Systems Japan K.K. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_PCI_BRIDGE_H #define QEMU_PCI_BRIDGE_H
include/hw/pci/pci_bus.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_PCI_BUS_H #define QEMU_PCI_BUS_H
include/hw/pci/pci_host.h +2 -0
@@ -25,6 +25,8 @@/* Worker routines for a PCI host controller that uses an {address,data} register pair to access PCI configuration space. */ +/* NOTE: May not be included into user emulation code */ +#ifndef PCI_HOST_H #define PCI_HOST_H
include/hw/pci/pcie.h +2 -0
@@ -18,6 +18,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_PCIE_H #define QEMU_PCIE_H
include/hw/pci/pcie_aer.h +2 -0
@@ -18,6 +18,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_PCIE_AER_H #define QEMU_PCIE_AER_H
include/hw/pci/pcie_host.h +2 -0
@@ -18,6 +18,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef PCIE_HOST_H #define PCIE_HOST_H
include/hw/pci/pcie_port.h +2 -0
@@ -18,6 +18,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_PCIE_PORT_H #define QEMU_PCIE_PORT_H
include/hw/pci/shpc.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef SHPC_H #define SHPC_H
include/hw/pcmcia.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_PCMCIA_H #define HW_PCMCIA_H
include/hw/platform-bus.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_PLATFORM_BUS_H #define HW_PLATFORM_BUS_H
include/hw/ppc/mac_dbdma.h +2 -0
@@ -20,6 +20,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MAC_DBDMA_H #define HW_MAC_DBDMA_H
include/hw/ppc/openpic.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef OPENPIC_H #define OPENPIC_H
include/hw/ppc/pnv_lpc.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef PPC_PNV_LPC_H #define PPC_PNV_LPC_H
include/hw/ppc/pnv_occ.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef PPC_PNV_OCC_H #define PPC_PNV_OCC_H
include/hw/ppc/pnv_psi.h +2 -0
@@ -17,6 +17,8 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef PPC_PNV_PSI_H #define PPC_PNV_PSI_H
include/hw/ppc/pnv_xive.h +2 -0
@@ -7,6 +7,8 @@* COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef PPC_PNV_XIVE_H #define PPC_PNV_XIVE_H
include/hw/ppc/spapr_drc.h +2 -0
@@ -10,6 +10,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SPAPR_DRC_H #define HW_SPAPR_DRC_H
include/hw/ppc/xics.h +2 -1
@@ -22,9 +22,10 @@* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef XICS_H #define XICS_H
include/hw/ppc/xive.h +2 -1
@@ -134,9 +134,10 @@* * This code is licensed under the GPL version 2 or later. See the * COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef PPC_XIVE_H #define PPC_XIVE_H
include/hw/qdev.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QDEV_H #define QDEV_H
include/hw/register.h +2 -0
@@ -8,6 +8,8 @@* the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef REGISTER_H #define REGISTER_H
include/hw/riscv/sifive_clint.h +2 -0
@@ -17,6 +17,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SIFIVE_CLINT_H #define HW_SIFIVE_CLINT_H
include/hw/riscv/sifive_gpio.h +3 -0
@@ -10,6 +10,9 @@* This code is licensed under the GPL version 2 or later. See * the COPYING file in the top-level directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef SIFIVE_GPIO_H #define SIFIVE_GPIO_H
include/hw/riscv/sifive_plic.h +2 -0
@@ -18,6 +18,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SIFIVE_PLIC_H #define HW_SIFIVE_PLIC_H
include/hw/riscv/sifive_prci.h +2 -0
@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SIFIVE_PRCI_H #define HW_SIFIVE_PRCI_H
include/hw/riscv/sifive_test.h +2 -0
@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SIFIVE_TEST_H #define HW_SIFIVE_TEST_H
include/hw/riscv/sifive_uart.h +2 -0
@@ -17,6 +17,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SIFIVE_UART_H #define HW_SIFIVE_UART_H
include/hw/s390x/css-bridge.h +2 -0
@@ -10,6 +10,8 @@* directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_S390X_CSS_BRIDGE_H #define HW_S390X_CSS_BRIDGE_H
include/hw/s390x/event-facility.h +2 -1
@@ -9,9 +9,10 @@* * This work is licensed under the terms of the GNU GPL, version 2 or (at your * option) any later version. See the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_S390_SCLP_EVENT_FACILITY_H #define HW_S390_SCLP_EVENT_FACILITY_H
include/hw/s390x/s390-virtio-ccw.h +3 -0
@@ -8,6 +8,9 @@* your option) any later version. See the COPYING file in the top-level * directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_S390X_S390_VIRTIO_CCW_H #define HW_S390X_S390_VIRTIO_CCW_H
include/hw/s390x/s390_flic.h +2 -0
@@ -10,6 +10,8 @@* directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_S390_FLIC_H #define HW_S390_FLIC_H
include/hw/s390x/sclp.h +2 -1
@@ -8,9 +8,10 @@* * This work is licensed under the terms of the GNU GPL, version 2 or (at your * option) any later version. See the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_S390_SCLP_H #define HW_S390_SCLP_H
include/hw/s390x/storage-keys.h +2 -0
@@ -9,6 +9,8 @@* directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef S390_STORAGE_KEYS_H #define S390_STORAGE_KEYS_H
include/hw/s390x/tod.h +2 -0
@@ -8,6 +8,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_S390_TOD_H #define HW_S390_TOD_H
include/hw/scsi/esp.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_HW_ESP_H #define QEMU_HW_ESP_H
include/hw/scsi/scsi.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_HW_SCSI_H #define QEMU_HW_SCSI_H
include/hw/sd/bcm2835_sdhost.h +2 -0
@@ -11,6 +11,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef BCM2835_SDHOST_H #define BCM2835_SDHOST_H
include/hw/sd/sd.h +2 -0
@@ -27,6 +27,8 @@* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SD_H #define HW_SD_H
include/hw/sd/sdhci.h +2 -0
@@ -22,6 +22,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef SDHCI_H #define SDHCI_H
include/hw/sh4/sh.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef QEMU_SH_H #define QEMU_SH_H /* Definitions for SH board emulation. */
include/hw/sh4/sh_intc.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef SH_INTC_H #define SH_INTC_H
include/hw/sparc/grlib.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef GRLIB_H #define GRLIB_H
include/hw/sparc/sparc32_dma.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef SPARC32_DMA_H #define SPARC32_DMA_H
include/hw/sparc/sun4m_iommu.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef SUN4M_IOMMU_H #define SUN4M_IOMMU_H
include/hw/sparc/sun4u_iommu.h +2 -0
@@ -24,6 +24,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef SUN4U_IOMMU_H #define SUN4U_IOMMU_H
include/hw/ssi/aspeed_smc.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef ASPEED_SMC_H #define ASPEED_SMC_H
include/hw/ssi/imx_spi.h +2 -0
@@ -7,6 +7,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_SPI_H #define IMX_SPI_H
include/hw/ssi/mss-spi.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MSS_SPI_H #define HW_MSS_SPI_H
include/hw/ssi/pl022.h +2 -0
@@ -18,6 +18,8 @@* + sysbus MMIO region 0: MemoryRegion for the device's registers */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SSI_PL022_H #define HW_SSI_PL022_H
include/hw/ssi/ssi.h +2 -0
@@ -8,6 +8,8 @@It is assumed that master and slave are both using the same transfer width. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_SSI_H #define QEMU_SSI_H
include/hw/ssi/stm32f2xx_spi.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_STM32F2XX_SPI_H #define HW_STM32F2XX_SPI_H
include/hw/ssi/xilinx_spips.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef XILINX_SPIPS_H #define XILINX_SPIPS_H
include/hw/sysbus.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_SYSBUS_H #define HW_SYSBUS_H
include/hw/timer/a9gtimer.h +2 -0
@@ -20,6 +20,8 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ +/* NOTE: May not be included into user emulation code */ +#ifndef A9GTIMER_H #define A9GTIMER_H
include/hw/timer/allwinner-a10-pit.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef ALLWINNER_A10_PIT_H #define ALLWINNER_A10_PIT_H
include/hw/timer/arm_mptimer.h +3 -0
@@ -18,6 +18,9 @@* You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef HW_TIMER_ARM_MPTIMER_H #define HW_TIMER_ARM_MPTIMER_H
include/hw/timer/armv7m_systick.h +2 -0
@@ -9,6 +9,8 @@* This code is licensed under the GPL (version 2 or later). */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_TIMER_ARMV7M_SYSTICK_H #define HW_TIMER_ARMV7M_SYSTICK_H
include/hw/timer/aspeed_rtc.h +3 -0
@@ -5,6 +5,9 @@* Copyright 2019 IBM Corp * SPDX-License-Identifier: GPL-2.0-or-later */ + +/* NOTE: May not be included into user emulation code */ +#ifndef ASPEED_RTC_H #define ASPEED_RTC_H
include/hw/timer/aspeed_timer.h +3 -0
@@ -19,6 +19,9 @@* with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef ASPEED_TIMER_H #define ASPEED_TIMER_H
include/hw/timer/cmsdk-apb-dualtimer.h +2 -0
@@ -23,6 +23,8 @@* + sysbus IRQ 2: timer block 2 interrupt TIMINT2 */ +/* NOTE: May not be included into user emulation code */ +#ifndef CMSDK_APB_DUALTIMER_H #define CMSDK_APB_DUALTIMER_H
include/hw/timer/cmsdk-apb-timer.h +2 -0
@@ -9,6 +9,8 @@* (at your option) any later version. */ +/* NOTE: May not be included into user emulation code */ +#ifndef CMSDK_APB_TIMER_H #define CMSDK_APB_TIMER_H
include/hw/timer/digic-timer.h +2 -1
@@ -12,9 +12,10 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_TIMER_DIGIC_TIMER_H #define HW_TIMER_DIGIC_TIMER_H
include/hw/timer/i8254.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_I8254_H #define HW_I8254_H
include/hw/timer/i8254_internal.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_I8254_INTERNAL_H #define QEMU_I8254_INTERNAL_H
include/hw/timer/imx_epit.h +2 -0
@@ -26,6 +26,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_EPIT_H #define IMX_EPIT_H
include/hw/timer/imx_gpt.h +2 -0
@@ -26,6 +26,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef IMX_GPT_H #define IMX_GPT_H
include/hw/timer/mc146818rtc.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef MC146818RTC_H #define MC146818RTC_H
include/hw/timer/mss-timer.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_MSS_TIMER_H #define HW_MSS_TIMER_H
include/hw/timer/nrf51_timer.h +3 -0
@@ -10,6 +10,9 @@* This code is licensed under the GPL version 2 or later. See * the COPYING file in the top-level directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef NRF51_TIMER_H #define NRF51_TIMER_H
include/hw/timer/pl031.h +2 -0
@@ -11,6 +11,8 @@* GNU GPL, version 2 or (at your option) any later version. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_TIMER_PL031_H #define HW_TIMER_PL031_H
include/hw/timer/stm32f2xx_timer.h +2 -0
@@ -22,6 +22,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_STM32F2XX_TIMER_H #define HW_STM32F2XX_TIMER_H
include/hw/timer/xlnx-zynqmp-rtc.h +2 -0
@@ -24,6 +24,8 @@* THE SOFTWARE. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_TIMER_XLNX_ZYNQMP_RTC_H #define HW_TIMER_XLNX_ZYNQMP_RTC_H
include/hw/usb.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_USB_H #define QEMU_USB_H
include/hw/usb/chipidea.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef CHIPIDEA_H #define CHIPIDEA_H
include/hw/virtio/vhost-backend.h +2 -1
@@ -5,9 +5,10 @@* * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. -* */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef VHOST_BACKEND_H #define VHOST_BACKEND_H
include/hw/virtio/vhost-scsi-common.h +2 -1
@@ -8,9 +8,10 @@* * This work is licensed under the terms of the GNU LGPL, version 2 or later. * See the COPYING.LIB file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef VHOST_SCSI_COMMON_H #define VHOST_SCSI_COMMON_H
include/hw/virtio/vhost-scsi.h +2 -1
@@ -8,9 +8,10 @@* * This work is licensed under the terms of the GNU LGPL, version 2 or later. * See the COPYING.LIB file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef VHOST_SCSI_H #define VHOST_SCSI_H
include/hw/virtio/vhost-user-blk.h +2 -1
@@ -9,9 +9,10 @@* * This work is licensed under the terms of the GNU LGPL, version 2 or later. * See the COPYING.LIB file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef VHOST_USER_BLK_H #define VHOST_USER_BLK_H
include/hw/virtio/vhost-user-scsi.h +2 -1
@@ -11,9 +11,10 @@* * This work is licensed under the terms of the GNU LGPL, version 2 or later. * See the COPYING.LIB file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef VHOST_USER_SCSI_H #define VHOST_USER_SCSI_H
include/hw/virtio/vhost-user.h +2 -0
@@ -5,6 +5,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_VIRTIO_VHOST_USER_H #define HW_VIRTIO_VHOST_USER_H
include/hw/virtio/vhost-vsock.h +2 -0
@@ -11,6 +11,8 @@* top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VHOST_VSOCK_H #define QEMU_VHOST_VSOCK_H
include/hw/virtio/vhost.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef VHOST_H #define VHOST_H
include/hw/virtio/virtio-balloon.h +2 -1
@@ -9,9 +9,10 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VIRTIO_BALLOON_H #define QEMU_VIRTIO_BALLOON_H
include/hw/virtio/virtio-blk.h +2 -1
@@ -8,9 +8,10 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VIRTIO_BLK_H #define QEMU_VIRTIO_BLK_H
include/hw/virtio/virtio-bus.h +2 -1
@@ -19,9 +19,10 @@* * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef VIRTIO_BUS_H #define VIRTIO_BUS_H
include/hw/virtio/virtio-crypto.h +2 -0
@@ -11,6 +11,8 @@* top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VIRTIO_CRYPTO_H #define QEMU_VIRTIO_CRYPTO_H
include/hw/virtio/virtio-input.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VIRTIO_INPUT_H #define QEMU_VIRTIO_INPUT_H
include/hw/virtio/virtio-net.h +2 -1
@@ -8,9 +8,10 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VIRTIO_NET_H #define QEMU_VIRTIO_NET_H
include/hw/virtio/virtio-pmem.h +2 -0
@@ -11,6 +11,8 @@* See the COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef HW_VIRTIO_PMEM_H #define HW_VIRTIO_PMEM_H
include/hw/virtio/virtio-rng.h +2 -0
@@ -9,6 +9,8 @@* top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VIRTIO_RNG_H #define QEMU_VIRTIO_RNG_H
include/hw/virtio/virtio-scsi.h +2 -1
@@ -8,9 +8,10 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VIRTIO_SCSI_H #define QEMU_VIRTIO_SCSI_H
include/hw/virtio/virtio-serial.h +2 -1
@@ -10,9 +10,10 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VIRTIO_SERIAL_H #define QEMU_VIRTIO_SERIAL_H
include/hw/virtio/virtio.h +2 -1
@@ -8,9 +8,10 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VIRTIO_H #define QEMU_VIRTIO_H
include/hw/watchdog/cmsdk-apb-watchdog.h +2 -0
@@ -28,6 +28,8 @@* to watchdog_perform_action(), at least for the moment. */ +/* NOTE: May not be included into user emulation code */ +#ifndef CMSDK_APB_WATCHDOG_H #define CMSDK_APB_WATCHDOG_H
include/hw/watchdog/wdt_aspeed.h +2 -0
@@ -7,6 +7,8 @@* COPYING file in the top-level directory. */ +/* NOTE: May not be included into user emulation code */ +#ifndef WDT_ASPEED_H #define WDT_ASPEED_H
include/hw/watchdog/wdt_diag288.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef WDT_DIAG288_H #define WDT_DIAG288_H
include/hw/xen/xen.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef QEMU_HW_XEN_H #define QEMU_HW_XEN_H
include/net/vhost_net.h +2 -0
@@ -1,3 +1,5 @@ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef VHOST_NET_H #define VHOST_NET_H
include/qemu/iova-tree.h +3 -0
@@ -8,6 +8,9 @@* * This work is licensed under the terms of the GNU GPL, version 2 or later. */ + +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef IOVA_TREE_H #define IOVA_TREE_H
include/sysemu/balloon.h +2 -1
@@ -8,9 +8,10 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef QEMU_BALLOON_H #define QEMU_BALLOON_H
include/sysemu/cryptodev-vhost-user.h +2 -1
@@ -18,9 +18,10 @@* * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef CRYPTODEV_VHOST_USER_H #define CRYPTODEV_VHOST_USER_H
include/sysemu/cryptodev-vhost.h +3 -1
@@ -19,8 +19,10 @@* * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. -* */ + +/* NOTE: May not be included into user emulation code */ +#ifndef CRYPTODEV_VHOST_H #define CRYPTODEV_VHOST_H
include/sysemu/dma.h +2 -0
@@ -7,6 +7,8 @@* (GNU GPL), version 2 or later. */ +/* NOTE: May not be included into user emulation code */ +#ifndef DMA_H #define DMA_H
include/sysemu/hostmem.h +2 -0
@@ -10,6 +10,8 @@* See the COPYING file in the top-level directory. */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef SYSEMU_HOSTMEM_H #define SYSEMU_HOSTMEM_H
include/sysemu/kvm_int.h +2 -1
@@ -3,9 +3,10 @@* * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. -* */ +/* FIXME Does not pass make check-headers for user emulation, yet! */ +#ifndef QEMU_KVM_INT_H #define QEMU_KVM_INT_H
include/sysemu/numa.h +2 -0
@@ -1,3 +1,5 @@ +/* NOTE: May not be included into user emulation code */ +#ifndef SYSEMU_NUMA_H #define SYSEMU_NUMA_H
include/sysemu/vhost-user-backend.h +3 -0
@@ -9,6 +9,9 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + +/* NOTE: May not be included into user emulation code */ +#ifndef QEMU_VHOST_USER_BACKEND_H #define QEMU_VHOST_USER_BACKEND_H
include/sysemu/xen-mapcache.h +2 -1
@@ -3,9 +3,10 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ +/* NOTE: May not be included into user emulation code */ +#ifndef XEN_MAPCACHE_H #define XEN_MAPCACHE_H
tests/check-headers.mak +10 -4
@@ -21,6 +21,10 @@ target-headers := $(shell cd $(SRC_PATH) && egrep -l '$(target-header-regexp)' $ # Headers for target-independent code only untarget-headers := include/exec/poison.h +# Headers not for user emulation (include hw/hw.h) +hw-header-regexp := NOTE: May not be included into user emulation code +hw-headers := $(shell cd $(SRC_PATH) && egrep -l '$(hw-header-regexp)' $(src-headers)) + # Headers carrying a FIXME about this test # Extended regular expression matching the FIXME comment in headers # not expected to pass the test in this build's configuration:
@@ -93,10 +97,12 @@ checked-headers := $(filter-out $(excluded-headers) $(bad-headers) $(target-head check-header-tests := $(patsubst %.h, tests/headers/%.c, $(checked-headers)) # to be checked for each target: all less excluded, bad, and untarget checked-target-headers := $(filter-out $(excluded-headers) $(bad-headers) $(untarget-headers), $(src-headers)) -# Testing target-independent headers for each target is massive -# overkill, limit to target-dependent headers for now. This leaves -# gaps in testing. TODO accept the overkill or pick something in between -checked-target-headers := $(filter $(target-headers), $(checked-target-headers)) +# less hw for user emulation targets +ifneq ($(TARGET_DIR),) +ifneq ($(CONFIG_USER_ONLY),) +checked-target-headers := $(filter-out $(hw-headers), $(checked-target-headers)) +endif +endif check-target-header-tests := $(patsubst %.h, tests/headers-tgt/%.c, $(checked-target-headers)) # Bad headers (all less excluded and checked):
Signature · 1 line
2.21.0
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#! /bin/bash
test "$(uname -m)" = "x86_64"
=== TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the asan build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-fedora V=1 NETWORK=1
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1 === TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/[email protected]/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]