Tame a few "touch this, recompile the world" headers
Subsystems (15)
v4 cover Tame a few "touch this, recompile the world" headers
We have quite a few "touch this, recompile the world" headers. My "build everything" tree has some 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). Touching any of 54 headers triggers a recompile of more than half of them.
This series reduces them to 46.
Six of the 54 are included always by design, via qemu/osdep.h. These are
bld/config-host.h
include/glib-compat.h
include/qemu/compiler.h
include/qemu/osdep.h
include/qemu/typedefs.h
include/sysemu/os-posix.h
Additionally, osdep.h includes either include/exec/poison.h or bld/TARGET_DIR/config-target.h.
The seven headers this series improves to my satisfaction (for now) are
bld/qapi/qapi-types-common.h
include/block/aio.h
include/hw/irq.h
include/qemu/event_notifier.h
include/qemu/main-loop.h
include/qemu/uuid.h
include/sysemu/sysemu.h
Of these, block/aio.h, qemu/main-loop.h and sysemu/sysemu.h are particular significant, as they in turn include numerous other headers.
The series makes real progress on a few more, but they're still bad:
bld/qapi/qapi-types-run-state.h
include/qemu/timer.h
include/qom/cpu.h
include/disas/dis-asm.h
include/qemu/notify.h
include/qemu/atomic.h
Minor improvements:
bld/qapi/qapi-builtin-types.h
bld/qapi/qapi-types-sockets.h
include/exec/cpu-common.h
include/exec/hwaddr.h
include/exec/memattrs.h
include/exec/memory.h
include/exec/memory_ldst.inc.h
include/exec/memory_ldst_cached.inc.h
include/exec/memory_ldst_phys.inc.h
include/exec/ramlist.h
include/fpu/softfloat-types.h
include/hw/hotplug.h
include/hw/qdev-core.h
include/qapi/util.h
include/qemu/bitmap.h
include/qemu/bitops.h
include/qemu/bswap.h
include/qemu/coroutine.h
include/qemu/host-utils.h
include/qemu/int128.h
include/qemu/lockable.h
include/qemu/module.h
include/qemu/processor.h
include/qemu/qsp.h
include/qemu/queue.h
include/qemu/rcu.h
include/qemu/rcu_queue.h
include/qemu/sys_membarrier.h
include/qemu/thread-posix.h
include/qemu/thread.h
include/qom/object.hUntouched:
include/exec/cpu-all.h
include/exec/cpu-defs.h
tcg/i386/tcg-target.h
tcg/tcg-mo.hFurther improvement is certainly possible. exec/cpu-all.h, exec/cpu-defs.h, exec/memory.h, hw/qdev-core.h, qemu/coroutine.h, qemu/lockable.h, and qom/cpu.h each pull in more than ten other headers, which makes them particularly wortwhile targets.
Observed patterns of #include misuse:
* Copy pasta
I found and deleted quite a few #include that were almost certainly never needed. The most likely explanation is lazy copying from a "similar" file. My deletions produced only minor improvements, though.
* "Convenience" headers
We sometimes have a header include a bunch of other headers the header itself doesn't need, so the header's users don't have to. An extreme case is hw/hw.h: it pulls in more than 40 other headers, then declares just hw_error(). Most of its users need only a fraction of it. PATCH 08-09,12-18 fix that, trading the very occasional convenience of not having to type a few #include directives for build speed.
* "Fat" headers
Some headers provide many things to many customers. Bad when the customers generally need only parts. Worse when such a "fat" header pulls in loads more. This series grapples with three instances:
qapi/qapi-types-common.h (PATCH 03), hw/boards.h, which pulls in almost 70 headers (PATCH 19-23), and sysemu/sysemu.h, which pulls in more than 20 (PATCH 23-28).
* Design erosion
Off-the-cuff additions to headers can erode design. For instance, the generated trace.h were carefully designed for minimal dependencies. We let them balloon when we added the per-vCPU tracing feature a few years later. PATCH 07 grapples with that.
PATCH 01 was previously posted separately. Since it needs a rebase now, I include it.
Related prior discussion:
Subject: Re: Our use of #include is undisciplined, and what to do about it
Date: Mon, 27 May 2019 15:12:34 +0200
Message-ID: <[email protected]>
https://lists.gnu.org/archive/html/qemu-devel/2019-05/msg06291.html
Detailed measurements, improvements under 10% omitted:
before after improvement
5557 526 5031 91% include/hw/irq.h
5585 847 4738 85% include/sysemu/sysemu.h
5591 858 4733 85% include/qemu/uuid.h
5694 1681 4013 70% include/qemu/main-loop.h
5713 2755 2958 52% include/block/aio.h
5715 2777 2938 51% include/qemu/event_notifier.h
2814 268 2546 90% bld/qapi/qapi-types-block.h
2473 old 2473 100% include/hw/qdev.h
2596 179 2417 93% include/hw/hw.h
2600 184 2416 93% include/sysemu/reset.h
2598 194 2404 93% include/migration/qemu-file-types.h
3033 870 2163 71% bld/qapi/qapi-types-misc.h
5713 4227 1486 26% bld/qapi/qapi-types-run-state.h
2666 1237 1429 54% include/hw/qdev-properties.h
5729 4418 1311 23% include/qemu/timer.h
2677 1548 1129 42% include/migration/vmstate.h
3875 2877 998 26% bld/qapi/qapi-types-common.h
2972 2071 901 30% bld/qapi/qapi-types-block-core.h
2976 2077 899 30% bld/qapi/qapi-types-job.h
3013 2115 898 30% bld/qapi/qapi-types-crypto.h
4589 3958 631 14% include/qom/cpu.h
4608 3977 631 14% include/disas/dis-asm.h
3326 2715 611 18% bld/qapi/qapi-types-sockets.h
248 111 137 55% include/sysemu/hostmem.h
41 27 14 34% include/hw/ide/internal.h
66 52 14 21% include/hw/ide.h
109 95 14 13% include/scsi/constants.h
17 11 6 35% include/hw/ide/pci.h
1550 1545 5 0% include/exec/address-spaces.h
141 142 -1 -1% include/qapi/qobject-input-visitor.h
149 150 -1 -1% include/qapi/qmp-event.h
152 153 -1 -1% bld/qapi/qapi-emit-events.h
392 393 -1 0% include/qapi/qmp/qerror.h
238 240 -2 -1% include/qapi/dealloc-visitor.h
245 247 -2 -1% include/qapi/qobject-output-visitor.h
342 344 -2 -1% include/qapi/qmp/qdict.h
404 406 -2 0% include/qapi/qmp/qobject.h
2632 2635 -3 0% include/qapi/error.h
554 558 -4 -1% bld/qapi/qapi-builtin-visit.h
793 797 -4 -1% include/qapi/visitor.h
1129 1133 -4 0% include/exec/poison.h
6591 6595 -4 0% bld/config-host.h
6591 6595 -4 0% include/glib-compat.h
6591 6595 -4 0% include/qemu/compiler.h
6591 6595 -4 0% include/qemu/osdep.h
6591 6595 -4 0% include/qemu/typedefs.h
6591 6595 -4 0% include/sysemu/os-posix.h
119 135 -16 -13% include/sysemu/numa.h
new 32 -32 bld/qapi/qapi-events-error.h
new 63 -63 bld/qapi/qapi-commands-error.h
new 128 -128 bld/qapi/qapi-visit-error.h
new 530 -530 include/sysemu/runstate.h
new 1334 -1334 trace/control-vcpu.h
new 2666 -2666 bld/qapi/qapi-types-error.hThe additional inclusions are due to PATCH 3's new bld/qapi-*-error.c, except for sysemu/numa.h, which is due to PATCH 25.
v4:
* PATCH 09
- Really unbreak *kvm*.c for s390x [Patchew, Philippe]
* PATCH 20
- Unbreak CONFIG_NETMAP [Philippe]
v3:
* Rebased
* PATCH 01
- Whitespace tweaks
* PATCH 04
- Unbreak builds lacking CONFIG_INT128 (32 bit hosts) [Alex]
* PATCH 06
- Typo fix [checkpatch]
* PATCH 09
- Really unbreak *kvm*.c for s390x [Patchew, Philippe, Alex]
* PATCH 15
- Tweak where to add #include [Philippe]
* PATCH 20+29
- Unbreak CONFIG_COCOA (OS-X) [Philippe]
* PATCH 22
- Unbreak CONFIG_HAX (mostly Windows) [Philippe, Alex]
* PATCH 26
- Unbreak CONFIG_NETMAP [Philippe, Alex]
- Improve commit message [Alex]
* PATCH 28
- Improve commit message [Alex]
* PATCH 29
- Update MAINTAINERS [checkpatch]
v2:
* Rebased
* PATCH 09+20+21
- Unbreak a few *kvm*.c for ppc, arm, mips, s390x. I currently have no way to even compile-test the latter two.
* PATCH 21
- Drop spurious whitespace changes [Eduardo]
* PATCH 22+23
- Keep some #include "hw/board.h" [Eduardo]
* PATCH 24
- Commit message spelling fix
* PATCH 26
- Make .c defining QemuOptsList declared in sysemu/sysemu.h include it
* PATCH 27+28
- Swapped to make it more obvious why both are useful
* PATCH 27
- Do not create sysemu/vmstate-notify.h, create sysemu/runstate.h in PATCH 29 instead
* PATCH 29
- New [Paolo]
Markus Armbruster (29):
include: Make headers more self-contained
Include generated QAPI headers less
qapi: Split error.json off common.json
memory: Fix type of IOMMUMemoryRegionClass member @parent_class
queue: Drop superfluous #include qemu/atomic.h
trace: Eliminate use of TARGET_FMT_plx
trace: Do not include qom/cpu.h into generated trace.h Include sysemu/reset.h a lot less
Include migration/qemu-file-types.h a lot less
ide: Include hw/ide/internal a bit less outside hw/ide/
typedefs: Separate incomplete types and function types Include hw/irq.h a lot less
Clean up inclusion of exec/cpu-common.h
migration: Move the VMStateDescription typedef to typedefs.h Include migration/vmstate.h less
Include exec/memory.h slightly less
Include qom/object.h slightly less
Include hw/hw.h exactly where needed
Include qemu/queue.h slightly less
Include qemu/main-loop.h less
Include hw/qdev-properties.h less
Include hw/boards.h a bit less
numa: Don't include hw/boards.h into sysemu/numa.h Include sysemu/hostmem.h less
numa: Move remaining NUMA declarations from sysemu.h to numa.h Clean up inclusion of sysemu/sysemu.h
Include sysemu/sysemu.h a lot less
sysemu: Move the VMChangeStateEntry typedef to qemu/typedefs.h
sysemu: Split sysemu/runstate.h off sysemu/sysemu.h
qapi/common.json | 24 --------- qapi/error.json | 29 ++++++++++ qapi/qapi-schema.json | 1 + fsdev/qemu-fsdev-throttle.h | 1 - hw/9pfs/coth.h | 1 - hw/alpha/alpha_sys.h | 1 - hw/audio/intel-hda.h | 2 +- hw/audio/lm4549.h | 1 + hw/display/qxl.h | 1 - hw/hppa/hppa_sys.h | 1 - hw/i386/amd_iommu.h | 1 - hw/ide/ahci_internal.h | 1 + hw/lm32/lm32.h | 1 + hw/lm32/milkymist-hw.h | 2 +- hw/microblaze/boot.h | 1 - hw/net/can/can_sja1000.h | 1 + hw/net/fsl_etsec/etsec.h | 1 - hw/net/ne2000.h | 1 - hw/net/pcnet.h | 1 + hw/nios2/boot.h | 1 - hw/ppc/mac.h | 1 - hw/s390x/ipl.h | 2 +- hw/usb/ccid.h | 2 +- hw/usb/hcd-ehci.h | 2 - hw/xtensa/xtensa_memory.h | 1 - include/authz/listfile.h | 1 - include/block/block.h | 1 - include/block/block_int.h | 1 - include/block/raw-aio.h | 2 + include/block/write-threshold.h | 2 + include/chardev/char-fe.h | 1 + include/chardev/char-io.h | 1 + include/chardev/char.h | 2 +- include/disas/disas.h | 1 + include/exec/cpu-defs.h | 1 - include/exec/cputlb.h | 3 ++ include/exec/exec-all.h | 1 + include/exec/ioport.h | 2 + include/exec/memory-internal.h | 2 + include/exec/memory.h | 10 +++- include/exec/ram_addr.h | 1 + include/exec/softmmu-semi.h | 2 + include/exec/tb-hash.h | 2 + include/exec/user/thunk.h | 2 + include/fpu/softfloat-macros.h | 2 + include/hw/acpi/acpi.h | 1 - include/hw/acpi/acpi_dev_interface.h | 2 + include/hw/acpi/pci.h | 3 ++ include/hw/acpi/tco.h | 2 + include/hw/acpi/vmgenid.h | 2 +- include/hw/adc/stm32f2xx_adc.h | 2 + include/hw/arm/allwinner-a10.h | 3 +- include/hw/arm/aspeed_soc.h | 1 + include/hw/arm/bcm2836.h | 1 + include/hw/arm/boot.h | 2 - include/hw/arm/exynos4210.h | 3 +- include/hw/arm/fsl-imx25.h | 1 + include/hw/arm/fsl-imx31.h | 1 + include/hw/arm/fsl-imx7.h | 1 - include/hw/arm/omap.h | 1 - include/hw/arm/sharpsl.h | 3 ++ include/hw/arm/soc_dma.h | 3 +- include/hw/arm/xlnx-zynqmp.h | 2 +- include/hw/audio/pcspk.h | 2 +- include/hw/audio/wm8750.h | 1 - include/hw/block/fdc.h | 1 + include/hw/block/flash.h | 2 +- include/hw/boards.h | 4 +- include/hw/bt.h | 1 - include/hw/char/cadence_uart.h | 1 + include/hw/char/cmsdk-apb-uart.h | 1 + include/hw/char/escc.h | 1 + include/hw/char/lm32_juart.h | 2 +- include/hw/char/parallel.h | 1 - include/hw/char/pl011.h | 1 + include/hw/char/serial.h | 2 - include/hw/char/stm32f2xx_usart.h | 1 - include/hw/char/xilinx_uartlite.h | 3 ++ include/hw/core/generic-loader.h | 1 + include/hw/core/split-irq.h | 1 - include/hw/cpu/cluster.h | 2 +- include/hw/cpu/core.h | 2 +- include/hw/cris/etraxfs.h | 2 + include/hw/cris/etraxfs_dma.h | 2 + include/hw/display/blizzard.h | 1 - include/hw/display/edid.h | 2 +- include/hw/display/i2c-ddc.h | 1 + include/hw/display/milkymist_tmu2.h | 3 +- include/hw/display/tc6393xb.h | 3 -- include/hw/display/vga.h | 2 +- include/hw/dma/i8257.h | 1 - include/hw/empty_slot.h | 2 + include/hw/gpio/bcm2835_gpio.h | 1 + include/hw/hw.h | 9 ---- include/hw/i2c/aspeed_i2c.h | 2 + include/hw/i2c/i2c.h | 2 +- include/hw/i2c/pm_smbus.h | 1 + include/hw/i2c/smbus_eeprom.h | 1 + include/hw/i386/apic_internal.h | 1 + include/hw/i386/ich9.h | 1 - include/hw/i386/intel_iommu.h | 2 +- include/hw/i386/ioapic_internal.h | 2 +- include/hw/i386/pc.h | 1 - include/hw/ide/internal.h | 4 +- include/hw/input/adb.h | 2 +- include/hw/input/gamepad.h | 1 - include/hw/input/hid.h | 1 - include/hw/input/i8042.h | 1 - include/hw/input/tsc2xxx.h | 1 - include/hw/intc/allwinner-a10-pic.h | 2 + include/hw/intc/heathrow_pic.h | 2 + include/hw/intc/mips_gic.h | 1 + include/hw/ipack/ipack.h | 2 +- include/hw/ipmi/ipmi.h | 2 +- include/hw/irq.h | 4 -- include/hw/isa/apm.h | 1 - include/hw/isa/i8259_internal.h | 1 - include/hw/isa/isa.h | 2 +- include/hw/isa/vt82c686.h | 1 + include/hw/mem/memory-device.h | 3 +- include/hw/mem/pc-dimm.h | 4 +- include/hw/mips/cps.h | 1 + include/hw/mips/mips.h | 1 - include/hw/misc/auxbus.h | 3 +- include/hw/misc/cbus.h | 1 - include/hw/misc/macio/cuda.h | 2 + include/hw/misc/macio/gpio.h | 3 ++ include/hw/misc/macio/macio.h | 2 + include/hw/misc/macio/pmu.h | 3 ++ include/hw/misc/mips_cmgcr.h | 2 + include/hw/misc/mips_cpc.h | 2 + include/hw/misc/mos6522.h | 1 - include/hw/misc/pvpanic.h | 3 ++ include/hw/misc/stm32f2xx_syscfg.h | 1 - include/hw/misc/unimp.h | 1 + include/hw/misc/vmcoreinfo.h | 2 +- include/hw/net/allwinner_emac.h | 1 + include/hw/net/lan9118.h | 1 - include/hw/net/lance.h | 1 + include/hw/net/ne2000-isa.h | 3 +- include/hw/net/smc91c111.h | 1 - include/hw/nvram/chrp_nvram.h | 2 + include/hw/or-irq.h | 1 - include/hw/pci-host/designware.h | 1 - include/hw/pci-host/gpex.h | 1 - include/hw/pci-host/q35.h | 1 - include/hw/pci-host/sabre.h | 2 + include/hw/pci-host/uninorth.h | 3 +- include/hw/pci-host/xilinx-pcie.h | 1 - include/hw/pci/pci.h | 1 - include/hw/pci/pcie.h | 1 - include/hw/pci/pcie_aer.h | 2 +- include/hw/pci/shpc.h | 1 + include/hw/pcmcia.h | 2 +- include/hw/ppc/openpic.h | 1 - include/hw/ppc/pnv_core.h | 1 + include/hw/ppc/ppc4xx.h | 3 ++ include/hw/ppc/spapr_cpu_core.h | 2 +- include/hw/ppc/spapr_drc.h | 5 +- include/hw/ppc/spapr_irq.h | 2 + include/hw/ppc/spapr_ovec.h | 1 - include/hw/ppc/spapr_vio.h | 1 + include/hw/ppc/spapr_xive.h | 1 + include/hw/ppc/xics.h | 3 +- include/hw/ppc/xive.h | 1 - include/hw/ppc/xive_regs.h | 3 ++ include/hw/ptimer.h | 1 - include/hw/qdev-core.h | 12 +---- include/hw/qdev-properties.h | 2 - include/hw/qdev.h | 8 --- include/hw/riscv/boot.h | 2 + include/hw/riscv/riscv_hart.h | 3 ++ include/hw/riscv/riscv_htif.h | 2 - include/hw/riscv/sifive_clint.h | 2 + include/hw/riscv/sifive_e.h | 1 + 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 | 1 + include/hw/riscv/sifive_uart.h | 3 ++ include/hw/riscv/spike.h | 3 ++ include/hw/riscv/virt.h | 3 ++ include/hw/s390x/ap-device.h | 3 ++ include/hw/s390x/css-bridge.h | 3 +- include/hw/s390x/css.h | 1 + include/hw/s390x/event-facility.h | 2 +- include/hw/s390x/sclp.h | 1 - include/hw/s390x/storage-attributes.h | 2 +- include/hw/s390x/storage-keys.h | 2 +- include/hw/s390x/tod.h | 4 +- include/hw/scsi/scsi.h | 4 +- include/hw/sd/sd.h | 2 +- include/hw/semihosting/console.h | 2 + include/hw/sh4/sh_intc.h | 2 +- include/hw/sparc/grlib.h | 1 - include/hw/sparc/sparc64.h | 2 + include/hw/ssi/aspeed_smc.h | 1 + include/hw/ssi/ssi.h | 2 +- include/hw/ssi/stm32f2xx_spi.h | 1 - include/hw/ssi/xilinx_spips.h | 1 + include/hw/sysbus.h | 2 +- include/hw/timer/allwinner-a10-pit.h | 1 + include/hw/timer/aspeed_rtc.h | 1 - include/hw/timer/cmsdk-apb-timer.h | 1 + include/hw/timer/i8254.h | 3 +- include/hw/timer/i8254_internal.h | 2 +- include/hw/timer/m48t59.h | 1 + include/hw/timer/mc146818rtc_regs.h | 2 + include/hw/timer/stm32f2xx_timer.h | 1 - include/hw/timer/xlnx-zynqmp-rtc.h | 1 + include/hw/tricore/tricore.h | 1 - include/hw/usb.h | 3 +- include/hw/vfio/vfio-platform.h | 1 - include/hw/virtio/vhost-scsi-common.h | 1 - include/hw/virtio/vhost-scsi.h | 1 - include/hw/virtio/vhost-user-blk.h | 1 - include/hw/virtio/vhost-user-scsi.h | 1 - include/hw/virtio/vhost.h | 1 - include/hw/virtio/virtio-access.h | 1 + include/hw/virtio/virtio-bus.h | 3 +- include/hw/virtio/virtio-gpu-bswap.h | 1 + include/hw/virtio/virtio-pmem.h | 2 +- include/hw/virtio/virtio-rng.h | 1 + include/hw/virtio/virtio-serial.h | 1 - include/hw/virtio/virtio.h | 6 +-- include/hw/watchdog/wdt_aspeed.h | 1 + include/hw/watchdog/wdt_diag288.h | 2 +- include/hw/xen/xen-legacy-backend.h | 1 - include/hw/xen/xen.h | 1 - include/hw/xen/xen_common.h | 2 - include/hw/xtensa/mx_pic.h | 1 - include/libdecnumber/decNumberLocal.h | 1 + include/migration/cpu.h | 5 ++ include/migration/global_state.h | 1 - include/migration/misc.h | 1 - include/migration/vmstate.h | 1 - include/monitor/hmp-target.h | 2 + include/monitor/qdev.h | 2 - include/net/can_emu.h | 1 + include/net/filter.h | 1 + include/net/net.h | 1 - include/qapi/error.h | 2 +- include/qemu/atomic128.h | 2 + include/qemu/fifo8.h | 1 - include/qemu/job.h | 2 +- include/qemu/queue.h | 2 - include/qemu/range.h | 2 - include/qemu/ratelimit.h | 2 + include/qemu/thread-win32.h | 2 +- include/qemu/typedefs.h | 24 +++++++-- include/qom/cpu.h | 4 +- include/qom/object.h | 1 - include/sysemu/accel.h | 1 - include/sysemu/arch_init.h | 1 - include/sysemu/balloon.h | 1 + include/sysemu/cryptodev-vhost-user.h | 3 ++ include/sysemu/cryptodev.h | 1 + include/sysemu/dma.h | 1 - include/sysemu/hax.h | 1 - include/sysemu/hostmem.h | 3 +- include/sysemu/hvf.h | 2 +- include/sysemu/iothread.h | 1 + include/sysemu/kvm.h | 1 - include/sysemu/kvm_int.h | 2 +- include/sysemu/memory_mapping.h | 1 + include/sysemu/numa.h | 18 +++++-- include/sysemu/replay.h | 2 +- include/sysemu/rng.h | 1 + include/sysemu/runstate.h | 68 ++++++++++++++++++++++++ include/sysemu/sysemu.h | 68 ------------------------ include/sysemu/xen-mapcache.h | 2 + include/ui/egl-helpers.h | 2 + include/ui/input.h | 1 + include/ui/spice-display.h | 2 +- linux-user/qemu.h | 1 - migration/migration.h | 4 +- migration/qemu-file.h | 1 + monitor/monitor-internal.h | 1 - nbd/nbd-internal.h | 2 - target/alpha/cpu.h | 2 +- target/arm/cpu.h | 2 +- target/cris/cpu.h | 2 +- target/hppa/cpu.h | 4 +- target/i386/cpu.h | 2 +- target/i386/sev_i386.h | 2 +- target/lm32/cpu.h | 2 +- target/mips/internal.h | 2 +- target/openrisc/cpu.h | 2 +- target/ppc/cpu-qom.h | 2 +- target/ppc/cpu.h | 2 +- target/s390x/cpu.h | 2 +- target/sparc/cpu.h | 2 +- trace/control-internal.h | 25 --------- trace/control-vcpu.h | 63 ++++++++++++++++++++++ trace/control.h | 24 --------- ui/vnc-auth-sasl.h | 1 - ui/vnc.h | 1 - accel/kvm/kvm-all.c | 4 +- accel/stubs/tcg-stub.c | 1 - accel/tcg/tcg-all.c | 1 - audio/audio.c | 4 +- audio/spiceaudio.c | 1 - audio/wavcapture.c | 1 - backends/cryptodev-builtin.c | 1 - backends/cryptodev-vhost-user.c | 1 - backends/cryptodev.c | 1 - backends/hostmem.c | 1 + backends/vhost-user.c | 1 - balloon.c | 1 - block.c | 1 + block/block-backend.c | 4 +- block/create.c | 1 + block/io.c | 1 + block/nbd.c | 1 + block/nfs.c | 2 +- block/nvme.c | 1 + block/qcow2.c | 1 + block/qed.c | 1 + block/sheepdog.c | 1 + block/throttle-groups.c | 1 + blockdev-nbd.c | 1 - blockdev.c | 2 + blockjob.c | 1 + chardev/baum.c | 1 + chardev/char-pipe.c | 1 + chardev/char-win-stdio.c | 1 + chardev/char-win.c | 1 + cpus.c | 3 ++ device-hotplug.c | 1 - dump/dump.c | 3 +- dump/win_dump.c | 1 - exec.c | 3 +- fsdev/qemu-fsdev-throttle.c | 1 + gdbstub.c | 1 + hw/9pfs/9p.c | 1 + hw/9pfs/codir.c | 1 + hw/9pfs/cofile.c | 1 + hw/9pfs/cofs.c | 1 + hw/9pfs/coth.c | 1 + hw/9pfs/coxattr.c | 1 + hw/9pfs/virtio-9p-device.c | 1 + hw/9pfs/xen-9p-backend.c | 2 +- hw/acpi/core.c | 4 +- hw/acpi/cpu.c | 1 + hw/acpi/cpu_hotplug.c | 1 - hw/acpi/ich9.c | 7 ++- hw/acpi/memory_hotplug.c | 1 + hw/acpi/pcihp.c | 3 +- hw/acpi/piix4.c | 8 ++- hw/acpi/tco.c | 2 + hw/acpi/vmgenid.c | 4 +- hw/adc/stm32f2xx_adc.c | 2 +- hw/alpha/dp264.c | 2 - hw/alpha/pci.c | 1 - hw/alpha/typhoon.c | 4 +- hw/arm/allwinner-a10.c | 2 + hw/arm/armsse.c | 2 + hw/arm/armv7m.c | 2 + hw/arm/aspeed.c | 1 + hw/arm/aspeed_soc.c | 1 + hw/arm/boot.c | 3 +- hw/arm/collie.c | 1 - hw/arm/cubieboard.c | 1 + hw/arm/digic.c | 1 + hw/arm/exynos4210.c | 4 +- hw/arm/exynos4_boards.c | 2 + hw/arm/fsl-imx25.c | 2 +- hw/arm/fsl-imx31.c | 2 +- hw/arm/fsl-imx6.c | 1 + hw/arm/gumstix.c | 1 - hw/arm/highbank.c | 2 + hw/arm/integratorcp.c | 4 ++ hw/arm/kzm.c | 1 + hw/arm/mainstone.c | 1 - hw/arm/mcimx6ul-evk.c | 1 + hw/arm/mcimx7d-sabre.c | 1 + hw/arm/microbit.c | 1 + hw/arm/msf2-soc.c | 4 +- hw/arm/msf2-som.c | 1 + hw/arm/musicpal.c | 5 ++ hw/arm/netduino2.c | 1 + hw/arm/nrf51_soc.c | 2 - hw/arm/nseries.c | 3 ++ hw/arm/omap1.c | 6 +++ hw/arm/omap2.c | 6 ++- hw/arm/omap_sx1.c | 1 - hw/arm/palm.c | 3 +- hw/arm/pxa2xx.c | 3 ++ hw/arm/pxa2xx_gpio.c | 3 ++ hw/arm/pxa2xx_pic.c | 2 +- hw/arm/realview.c | 1 + hw/arm/sabrelite.c | 1 + hw/arm/sbsa-ref.c | 2 + hw/arm/smmu-common.c | 1 - hw/arm/smmuv3.c | 4 +- hw/arm/spitz.c | 5 +- hw/arm/stellaris.c | 3 ++ hw/arm/stm32f205_soc.c | 2 + hw/arm/strongarm.c | 3 ++ hw/arm/sysbus-fdt.c | 1 - hw/arm/tosa.c | 4 +- hw/arm/versatilepb.c | 2 + hw/arm/virt-acpi-build.c | 3 +- hw/arm/virt.c | 4 ++ hw/arm/xlnx-zynqmp.c | 1 + hw/arm/z2.c | 4 +- hw/audio/ac97.c | 3 +- hw/audio/adlib.c | 2 +- hw/audio/cs4231.c | 1 + hw/audio/cs4231a.c | 5 +- hw/audio/es1370.c | 2 +- hw/audio/gus.c | 4 +- hw/audio/hda-codec.c | 3 +- hw/audio/intel-hda.c | 3 +- hw/audio/lm4549.c | 1 + hw/audio/marvell_88w8618.c | 4 +- hw/audio/milkymist-ac97.c | 3 +- hw/audio/pcspk.c | 2 +- hw/audio/pl041.c | 3 ++ hw/audio/sb16.c | 5 +- hw/audio/wm8750.c | 1 + hw/block/dataplane/virtio-blk.c | 1 + hw/block/dataplane/xen-block.c | 2 +- hw/block/ecc.c | 2 +- hw/block/fdc.c | 5 +- hw/block/m25p80.c | 3 +- hw/block/nand.c | 3 +- hw/block/nvme.c | 3 +- hw/block/onenand.c | 2 + hw/block/pflash_cfi01.c | 5 +- hw/block/pflash_cfi02.c | 3 +- hw/block/tc58128.c | 1 - hw/block/vhost-user-blk.c | 3 ++ hw/block/virtio-blk.c | 4 ++ hw/block/xen-block.c | 3 +- hw/char/bcm2835_aux.c | 3 ++ hw/char/cadence_uart.c | 2 + hw/char/cmsdk-apb-uart.c | 2 + hw/char/debugcon.c | 2 +- hw/char/digic-uart.c | 3 +- hw/char/escc.c | 4 +- hw/char/etraxfs_ser.c | 2 + hw/char/exynos4210_uart.c | 4 +- hw/char/grlib_apbuart.c | 2 + hw/char/imx_serial.c | 4 +- hw/char/ipoctal232.c | 3 ++ hw/char/lm32_juart.c | 3 +- hw/char/lm32_uart.c | 4 +- hw/char/mcf_uart.c | 3 +- hw/char/milkymist-uart.c | 4 +- hw/char/nrf51_uart.c | 3 ++ hw/char/omap_uart.c | 1 - hw/char/parallel-isa.c | 2 + hw/char/parallel.c | 5 +- hw/char/pl011.c | 2 + hw/char/sclpconsole-lm.c | 3 +- hw/char/sclpconsole.c | 3 +- hw/char/serial-isa.c | 3 ++ hw/char/serial-pci-multi.c | 3 ++ hw/char/serial-pci.c | 3 ++ hw/char/serial.c | 4 ++ hw/char/sh_serial.c | 3 +- hw/char/spapr_vty.c | 4 +- hw/char/stm32f2xx_usart.c | 2 + hw/char/terminal3270.c | 1 + hw/char/virtio-console.c | 1 + hw/char/virtio-serial-bus.c | 3 ++ hw/char/xen_console.c | 2 +- hw/char/xilinx_uartlite.c | 3 ++ hw/core/bus.c | 2 +- hw/core/empty_slot.c | 1 - hw/core/generic-loader.c | 2 + hw/core/loader-fit.c | 1 - hw/core/loader.c | 2 + hw/core/machine-qmp-cmds.c | 2 + hw/core/null-machine.c | 1 - hw/core/numa.c | 5 ++ hw/core/or-irq.c | 3 ++ hw/core/platform-bus.c | 2 +- hw/core/ptimer.c | 3 +- hw/core/qdev-fw.c | 2 +- hw/core/qdev-properties-system.c | 2 +- hw/core/qdev-properties.c | 4 +- hw/core/qdev.c | 5 +- hw/core/register.c | 1 - hw/core/split-irq.c | 2 + hw/core/vm-change-state-handler.c | 3 +- hw/cpu/a15mpcore.c | 2 + hw/cpu/a9mpcore.c | 2 + hw/cpu/arm11mpcore.c | 2 + hw/cpu/cluster.c | 1 + hw/cpu/realview_mpcore.c | 2 + hw/cris/boot.c | 2 +- hw/display/ads7846.c | 2 + hw/display/ati.c | 2 +- hw/display/bcm2835_fb.c | 4 ++ hw/display/bochs-display.c | 3 +- hw/display/cg3.c | 3 ++ hw/display/cirrus_vga.c | 4 +- hw/display/cirrus_vga_isa.c | 2 +- hw/display/dpcd.c | 1 + hw/display/edid-region.c | 1 + hw/display/exynos4210_fimd.c | 3 ++ hw/display/framebuffer.c | 1 - hw/display/g364fb.c | 3 ++ hw/display/i2c-ddc.c | 2 + hw/display/jazz_led.c | 1 + hw/display/milkymist-tmu2.c | 3 +- hw/display/milkymist-vgafb.c | 2 + hw/display/omap_dss.c | 2 + hw/display/omap_lcdc.c | 3 +- hw/display/pl110.c | 2 + hw/display/pxa2xx_lcd.c | 2 + hw/display/qxl-render.c | 1 + hw/display/qxl.c | 5 +- hw/display/ramfb-standalone.c | 2 +- hw/display/ramfb.c | 3 +- hw/display/sii9022.c | 1 + hw/display/sm501.c | 3 +- hw/display/ssd0303.c | 1 + hw/display/ssd0323.c | 1 + hw/display/tc6393xb.c | 4 +- hw/display/tcx.c | 2 + hw/display/vga-isa-mm.c | 4 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 3 +- hw/display/vga.c | 4 +- hw/display/vhost-user-gpu.c | 1 + hw/display/virtio-gpu-pci.c | 1 + hw/display/virtio-gpu.c | 3 ++ hw/display/virtio-vga.c | 2 +- hw/display/vmware_vga.c | 3 +- hw/display/xenfb.c | 1 - hw/display/xlnx_dp.c | 2 + hw/dma/bcm2835_dma.c | 2 + hw/dma/etraxfs_dma.c | 5 +- hw/dma/i82374.c | 2 + hw/dma/i8257.c | 3 +- hw/dma/pl080.c | 4 ++ hw/dma/pl330.c | 3 ++ hw/dma/puv3_dma.c | 1 - hw/dma/pxa2xx_dma.c | 3 ++ hw/dma/rc4030.c | 3 +- hw/dma/sparc32_dma.c | 4 +- hw/dma/xilinx_axidma.c | 3 ++ hw/dma/xlnx-zdma.c | 3 ++ hw/dma/xlnx-zynq-devcfg.c | 3 +- hw/dma/xlnx_dpdma.c | 2 + hw/gpio/bcm2835_gpio.c | 2 + hw/gpio/gpio_key.c | 2 + hw/gpio/imx_gpio.c | 3 ++ hw/gpio/max7310.c | 4 ++ hw/gpio/mpc8xxx.c | 2 + hw/gpio/nrf51_gpio.c | 2 + hw/gpio/omap_gpio.c | 3 +- hw/gpio/pl061.c | 2 + hw/gpio/puv3_gpio.c | 1 - hw/gpio/zaurus.c | 3 +- hw/hppa/dino.c | 4 +- hw/hppa/machine.c | 2 +- hw/hppa/pci.c | 1 - hw/hyperv/hyperv_testdev.c | 1 - hw/i2c/aspeed_i2c.c | 2 + hw/i2c/bitbang_i2c.c | 2 +- hw/i2c/core.c | 2 + hw/i2c/exynos4210_i2c.c | 2 + hw/i2c/imx_i2c.c | 2 + hw/i2c/microbit_i2c.c | 1 + hw/i2c/mpc_i2c.c | 2 + hw/i2c/omap_i2c.c | 3 +- hw/i2c/pm_smbus.c | 3 +- hw/i2c/ppc4xx_i2c.c | 2 +- hw/i2c/smbus_eeprom.c | 3 +- hw/i2c/smbus_ich9.c | 3 +- hw/i2c/smbus_master.c | 1 - hw/i2c/smbus_slave.c | 2 +- hw/i386/acpi-build.c | 2 + hw/i386/amd_iommu.c | 2 + hw/i386/intel_iommu.c | 3 ++ hw/i386/kvm/clock.c | 4 +- hw/i386/kvm/i8254.c | 3 +- hw/i386/kvm/i8259.c | 1 + hw/i386/kvm/ioapic.c | 2 + hw/i386/kvmvapic.c | 2 + hw/i386/multiboot.c | 1 - hw/i386/pc.c | 5 +- hw/i386/pc_piix.c | 3 +- hw/i386/pc_q35.c | 3 +- hw/i386/pc_sysfw.c | 3 +- hw/i386/vmmouse.c | 5 +- hw/i386/vmport.c | 2 - hw/i386/x86-iommu.c | 1 + hw/i386/xen/xen-hvm.c | 5 ++ hw/i386/xen/xen-mapcache.c | 1 + hw/i386/xen/xen_platform.c | 2 +- hw/i386/xen/xen_pvdevice.c | 3 +- hw/ide/ahci-allwinner.c | 2 +- hw/ide/ahci.c | 4 +- hw/ide/cmd646.c | 5 +- hw/ide/core.c | 5 +- hw/ide/ich.c | 2 +- hw/ide/ioport.c | 2 - hw/ide/isa.c | 3 +- hw/ide/macio.c | 3 +- hw/ide/microdrive.c | 2 +- hw/ide/mmio.c | 3 +- hw/ide/pci.c | 2 +- hw/ide/piix.c | 4 +- hw/ide/qdev.c | 5 +- hw/ide/sii3112.c | 1 + hw/ide/via.c | 4 +- hw/input/adb-kbd.c | 2 +- hw/input/adb-mouse.c | 1 + hw/input/adb.c | 2 + hw/input/hid.c | 3 +- hw/input/lm832x.c | 4 +- hw/input/milkymist-softusb.c | 4 +- hw/input/pckbd.c | 7 ++- hw/input/pl050.c | 2 + hw/input/ps2.c | 6 ++- hw/input/pxa2xx_keypad.c | 2 + hw/input/stellaris_input.c | 4 +- hw/input/tsc2005.c | 4 +- hw/input/tsc210x.c | 3 ++ hw/input/vhost-user-input.c | 1 - hw/input/virtio-input-hid.c | 2 +- hw/input/virtio-input-host.c | 2 +- hw/input/virtio-input.c | 2 +- hw/intc/allwinner-a10-pic.c | 3 +- hw/intc/apic_common.c | 4 +- hw/intc/arm_gic.c | 1 + hw/intc/arm_gic_common.c | 2 + hw/intc/arm_gicv2m.c | 2 + hw/intc/arm_gicv3_common.c | 2 + hw/intc/arm_gicv3_cpuif.c | 1 + hw/intc/arm_gicv3_its_common.c | 1 + hw/intc/arm_gicv3_its_kvm.c | 3 +- hw/intc/arm_gicv3_kvm.c | 2 +- hw/intc/armv7m_nvic.c | 3 ++ hw/intc/aspeed_vic.c | 2 + hw/intc/bcm2835_ic.c | 2 + hw/intc/bcm2836_control.c | 2 + hw/intc/etraxfs_pic.c | 3 +- hw/intc/exynos4210_combiner.c | 4 ++ hw/intc/exynos4210_gic.c | 2 + hw/intc/grlib_irqmp.c | 1 + hw/intc/heathrow_pic.c | 3 +- hw/intc/i8259.c | 3 +- hw/intc/i8259_common.c | 3 ++ hw/intc/imx_avic.c | 2 + hw/intc/imx_gpcv2.c | 1 + hw/intc/ioapic.c | 3 +- hw/intc/ioapic_common.c | 1 + hw/intc/lm32_pic.c | 3 +- hw/intc/mips_gic.c | 5 +- hw/intc/nios2_iic.c | 1 + hw/intc/omap_intc.c | 3 +- hw/intc/ompic.c | 4 +- hw/intc/openpic.c | 4 +- hw/intc/openpic_kvm.c | 2 +- hw/intc/pl190.c | 2 + hw/intc/pnv_xive.c | 2 + hw/intc/puv3_intc.c | 1 + hw/intc/realview_gic.c | 2 + hw/intc/s390_flic.c | 3 +- hw/intc/s390_flic_kvm.c | 1 + hw/intc/sh_intc.c | 2 +- hw/intc/slavio_intctl.c | 2 + hw/intc/spapr_xive.c | 3 ++ hw/intc/spapr_xive_kvm.c | 1 + hw/intc/xics.c | 5 +- hw/intc/xics_kvm.c | 1 - hw/intc/xics_pnv.c | 1 - hw/intc/xics_spapr.c | 1 - hw/intc/xilinx_intc.c | 3 +- hw/intc/xive.c | 3 ++ hw/intc/xlnx-pmu-iomod-intc.c | 3 ++ hw/intc/xlnx-zynqmp-ipi.c | 2 + hw/ipack/ipack.c | 3 ++ hw/ipack/tpci200.c | 2 + hw/ipmi/ipmi.c | 4 +- hw/ipmi/ipmi_bmc_extern.c | 3 +- hw/ipmi/ipmi_bmc_sim.c | 2 + hw/ipmi/isa_ipmi_bt.c | 4 +- hw/ipmi/isa_ipmi_kcs.c | 4 +- hw/isa/apm.c | 2 +- hw/isa/i82378.c | 2 + hw/isa/isa-superio.c | 1 + hw/isa/lpc_ich9.c | 6 ++- hw/isa/pc87312.c | 2 + hw/isa/piix4.c | 3 +- hw/isa/vt82c686.c | 5 +- hw/lm32/lm32_boards.c | 3 +- hw/lm32/milkymist.c | 4 +- hw/m68k/an5206.c | 1 - hw/m68k/mcf5206.c | 3 ++ hw/m68k/mcf5208.c | 3 ++ hw/m68k/mcf_intc.c | 1 + hw/mem/memory-device.c | 1 - hw/mem/nvdimm.c | 2 + hw/mem/pc-dimm.c | 4 ++ hw/microblaze/boot.c | 1 + hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 - hw/microblaze/xlnx-zynqmp-pmu.c | 1 - hw/mips/addr.c | 1 - hw/mips/boston.c | 3 +- hw/mips/cps.c | 2 + hw/mips/gt64xxx_pci.c | 3 +- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_int.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/mips/mips_malta.c | 4 +- hw/mips/mips_mipssim.c | 3 +- hw/mips/mips_r4k.c | 4 +- hw/misc/a9scu.c | 2 + hw/misc/applesmc.c | 2 +- hw/misc/arm11scu.c | 1 + hw/misc/arm_integrator_debug.c | 1 - hw/misc/arm_l2x0.c | 2 + hw/misc/arm_sysctl.c | 6 ++- hw/misc/armsse-cpuid.c | 2 +- hw/misc/armsse-mhu.c | 3 +- hw/misc/aspeed_scu.c | 1 + hw/misc/aspeed_sdmc.c | 1 + hw/misc/aspeed_xdma.c | 2 + hw/misc/bcm2835_mbox.c | 2 + hw/misc/bcm2835_property.c | 3 ++ hw/misc/bcm2835_rng.c | 1 + hw/misc/cbus.c | 2 +- hw/misc/debugexit.c | 2 +- hw/misc/eccmemctl.c | 3 ++ hw/misc/edu.c | 1 + hw/misc/exynos4210_clk.c | 1 + hw/misc/exynos4210_pmu.c | 3 +- hw/misc/exynos4210_rng.c | 1 + hw/misc/imx25_ccm.c | 1 + hw/misc/imx31_ccm.c | 1 + hw/misc/imx6_ccm.c | 1 + hw/misc/imx6_src.c | 3 +- hw/misc/imx6ul_ccm.c | 1 + hw/misc/imx7_ccm.c | 1 + hw/misc/imx7_gpr.c | 1 - hw/misc/imx7_snvs.c | 2 +- hw/misc/iotkit-secctl.c | 2 + hw/misc/iotkit-sysctl.c | 4 +- hw/misc/iotkit-sysinfo.c | 2 +- hw/misc/ivshmem.c | 3 +- hw/misc/macio/cuda.c | 5 +- hw/misc/macio/gpio.c | 3 +- hw/misc/macio/mac_dbdma.c | 3 +- hw/misc/macio/macio.c | 4 +- hw/misc/macio/pmu.c | 6 ++- hw/misc/max111x.c | 2 + hw/misc/milkymist-hpdmc.c | 2 +- hw/misc/milkymist-pfpu.c | 3 +- hw/misc/mips_cmgcr.c | 4 +- hw/misc/mips_cpc.c | 2 + hw/misc/mips_itu.c | 1 + hw/misc/mos6522.c | 5 +- hw/misc/mps2-fpgaio.c | 2 + hw/misc/mps2-scc.c | 2 + hw/misc/msf2-sysreg.c | 2 + hw/misc/mst_fpga.c | 3 +- hw/misc/nrf51_rng.c | 3 ++ hw/misc/omap_clk.c | 2 + hw/misc/omap_gpmc.c | 3 +- hw/misc/omap_l4.c | 1 - hw/misc/omap_sdrc.c | 1 - hw/misc/pc-testdev.c | 3 +- hw/misc/pca9552.c | 2 +- hw/misc/pci-testdev.c | 2 +- hw/misc/puv3_pm.c | 1 - hw/misc/pvpanic.c | 3 +- hw/misc/sga.c | 1 - hw/misc/slavio_misc.c | 4 +- hw/misc/tmp105.c | 3 +- hw/misc/tmp421.c | 2 +- hw/misc/tz-mpc.c | 3 ++ hw/misc/tz-msc.c | 3 ++ hw/misc/tz-ppc.c | 3 ++ hw/misc/unimp.c | 1 - hw/misc/vmcoreinfo.c | 2 + hw/misc/zynq-xadc.c | 4 +- hw/misc/zynq_slcr.c | 4 +- hw/moxie/moxiesim.c | 3 +- hw/net/allwinner_emac.c | 3 ++ hw/net/cadence_gem.c | 3 ++ hw/net/can/can_kvaser_pci.c | 4 +- hw/net/can/can_mioe3680_pci.c | 4 +- hw/net/can/can_pcm3680_pci.c | 4 +- hw/net/can/can_sja1000.c | 4 +- hw/net/dp8393x.c | 3 ++ hw/net/e1000.c | 3 +- hw/net/e1000e.c | 3 ++ hw/net/e1000e_core.c | 3 +- hw/net/e1000x_common.c | 1 - hw/net/eepro100.c | 4 +- hw/net/fsl_etsec/etsec.c | 4 +- hw/net/ftgmac100.c | 3 ++ hw/net/imx_fec.c | 3 ++ hw/net/lan9118.c | 6 ++- hw/net/lance.c | 2 + hw/net/mcf_fec.c | 2 + hw/net/milkymist-minimac2.c | 4 +- hw/net/mipsnet.c | 4 +- hw/net/ne2000-isa.c | 2 +- hw/net/ne2000-pci.c | 4 ++ hw/net/ne2000.c | 4 +- hw/net/opencores_eth.c | 4 +- hw/net/pcnet-pci.c | 3 ++ hw/net/pcnet.c | 5 +- hw/net/rocker/rocker.c | 3 +- hw/net/rocker/rocker_desc.c | 1 - hw/net/rtl8139.c | 3 +- hw/net/smc91c111.c | 3 ++ hw/net/spapr_llan.c | 5 +- hw/net/stellaris_enet.c | 3 ++ hw/net/sungem.c | 2 + hw/net/sunhme.c | 3 +- hw/net/vhost_net.c | 2 +- hw/net/virtio-net.c | 3 ++ hw/net/vmxnet3.c | 2 + hw/net/xen_nic.c | 1 - hw/net/xgmac.c | 3 ++ hw/net/xilinx_axienet.c | 4 ++ hw/net/xilinx_ethlite.c | 3 +- hw/nios2/10m50_devboard.c | 2 +- hw/nios2/boot.c | 1 + hw/nios2/cpu_pic.c | 1 + hw/nios2/generic_nommu.c | 2 - hw/nvram/chrp_nvram.c | 1 - hw/nvram/ds1225y.c | 2 + hw/nvram/eeprom93xx.c | 3 +- hw/nvram/eeprom_at24c.c | 2 +- hw/nvram/fw_cfg.c | 5 +- hw/nvram/mac_nvram.c | 3 +- hw/nvram/nrf51_nvm.c | 2 + hw/nvram/spapr_nvram.c | 4 ++ hw/openrisc/cputimer.c | 2 +- hw/openrisc/openrisc_sim.c | 4 +- hw/openrisc/pic_cpu.c | 2 +- hw/pci-bridge/gen_pcie_root_port.c | 2 + hw/pci-bridge/i82801b11.c | 1 + hw/pci-bridge/ioh3420.c | 1 + hw/pci-bridge/pci_bridge_dev.c | 1 + hw/pci-bridge/pci_expander_bridge.c | 1 + hw/pci-bridge/pcie_pci_bridge.c | 1 + hw/pci-bridge/pcie_root_port.c | 1 + hw/pci-bridge/xio3130_downstream.c | 2 + hw/pci-bridge/xio3130_upstream.c | 1 + hw/pci-host/bonito.c | 6 ++- hw/pci-host/designware.c | 3 ++ hw/pci-host/gpex.c | 4 +- hw/pci-host/grackle.c | 2 + hw/pci-host/pam.c | 1 - hw/pci-host/piix.c | 8 ++- hw/pci-host/ppce500.c | 4 +- hw/pci-host/prep.c | 4 +- hw/pci-host/q35.c | 3 +- hw/pci-host/sabre.c | 4 +- hw/pci-host/uninorth.c | 3 +- hw/pci-host/versatile.c | 3 ++ hw/pci-host/xilinx-pcie.c | 2 + hw/pci/msix.c | 3 +- hw/pci/pci.c | 6 ++- hw/pci/pcie_aer.c | 1 + hw/pci/pcie_host.c | 1 - hw/pci/pcie_port.c | 1 + hw/pci/shpc.c | 1 + hw/pcmcia/pcmcia.c | 1 - hw/pcmcia/pxa2xx.c | 2 +- hw/ppc/e500.c | 5 +- hw/ppc/e500plat.c | 1 - hw/ppc/mac_newworld.c | 3 +- hw/ppc/mac_oldworld.c | 3 +- hw/ppc/mpc8544_guts.c | 3 +- hw/ppc/mpc8544ds.c | 1 - hw/ppc/pnv.c | 5 +- hw/ppc/pnv_bmc.c | 2 - hw/ppc/pnv_core.c | 3 +- hw/ppc/pnv_lpc.c | 2 +- hw/ppc/pnv_occ.c | 2 - hw/ppc/pnv_psi.c | 4 +- hw/ppc/pnv_xscom.c | 1 - hw/ppc/ppc.c | 7 ++- hw/ppc/ppc405_boards.c | 3 +- hw/ppc/ppc405_uc.c | 5 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/ppc440_pcix.c | 2 +- hw/ppc/ppc440_uc.c | 5 +- hw/ppc/ppc4xx_devs.c | 4 +- hw/ppc/ppc4xx_pci.c | 4 +- hw/ppc/ppc_booke.c | 5 +- hw/ppc/ppce500_spin.c | 1 - hw/ppc/prep.c | 4 +- hw/ppc/prep_systemio.c | 5 +- hw/ppc/rs6000_mc.c | 2 + hw/ppc/sam460ex.c | 3 +- hw/ppc/spapr.c | 6 ++- hw/ppc/spapr_caps.c | 1 + hw/ppc/spapr_cpu_core.c | 5 +- hw/ppc/spapr_drc.c | 3 +- hw/ppc/spapr_events.c | 5 +- hw/ppc/spapr_hcall.c | 3 +- hw/ppc/spapr_iommu.c | 3 +- hw/ppc/spapr_irq.c | 2 + hw/ppc/spapr_ovec.c | 1 + hw/ppc/spapr_pci.c | 4 +- hw/ppc/spapr_rng.c | 3 +- hw/ppc/spapr_rtas.c | 3 +- hw/ppc/spapr_rtc.c | 1 + hw/ppc/spapr_vio.c | 5 +- hw/ppc/virtex_ml507.c | 3 +- hw/rdma/vmw/pvrdma_cmd.c | 1 - hw/rdma/vmw/pvrdma_main.c | 4 +- hw/riscv/boot.c | 2 +- hw/riscv/riscv_hart.c | 2 + hw/riscv/sifive_clint.c | 1 + hw/riscv/sifive_e.c | 2 +- hw/riscv/sifive_gpio.c | 2 + hw/riscv/sifive_plic.c | 1 + hw/riscv/sifive_prci.c | 2 + hw/riscv/sifive_test.c | 2 + hw/riscv/sifive_u.c | 2 +- hw/riscv/sifive_uart.c | 2 + hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- hw/s390x/3270-ccw.c | 2 + hw/s390x/ap-device.c | 1 - hw/s390x/ccw-device.c | 1 + hw/s390x/css-bridge.c | 1 + hw/s390x/css.c | 2 +- hw/s390x/event-facility.c | 2 +- hw/s390x/ipl.c | 3 ++ hw/s390x/s390-ccw.c | 1 + hw/s390x/s390-pci-bus.c | 1 + hw/s390x/s390-skeys.c | 1 + hw/s390x/s390-stattrib.c | 1 - hw/s390x/s390-virtio-ccw.c | 3 ++ hw/s390x/sclpcpu.c | 1 - hw/s390x/sclpquiesce.c | 4 +- hw/s390x/tod-kvm.c | 2 +- hw/s390x/tod.c | 1 + hw/s390x/vhost-vsock-ccw.c | 1 + hw/s390x/virtio-ccw-9p.c | 1 + hw/s390x/virtio-ccw-balloon.c | 1 + hw/s390x/virtio-ccw-blk.c | 1 + hw/s390x/virtio-ccw-crypto.c | 1 + hw/s390x/virtio-ccw-gpu.c | 1 + hw/s390x/virtio-ccw-input.c | 1 + hw/s390x/virtio-ccw-net.c | 1 + hw/s390x/virtio-ccw-rng.c | 1 + hw/s390x/virtio-ccw-scsi.c | 1 + hw/s390x/virtio-ccw-serial.c | 1 + hw/s390x/virtio-ccw.c | 3 +- hw/scsi/esp-pci.c | 2 + hw/scsi/esp.c | 2 + hw/scsi/lsi53c895a.c | 3 +- hw/scsi/megasas.c | 3 +- hw/scsi/mptconfig.c | 1 - hw/scsi/mptendian.c | 1 - hw/scsi/mptsas.c | 5 +- hw/scsi/scsi-bus.c | 7 ++- hw/scsi/scsi-disk.c | 5 +- hw/scsi/scsi-generic.c | 2 + hw/scsi/spapr_vscsi.c | 4 +- hw/scsi/vhost-scsi.c | 3 +- hw/scsi/vhost-user-scsi.c | 2 + hw/scsi/virtio-scsi.c | 2 + hw/scsi/vmw_pvscsi.c | 3 ++ hw/sd/bcm2835_sdhost.c | 2 + hw/sd/milkymist-memcard.c | 4 +- hw/sd/omap_mmc.c | 3 +- hw/sd/pl181.c | 2 + hw/sd/pxa2xx_mmci.c | 4 +- hw/sd/sd.c | 4 +- hw/sd/sdhci-pci.c | 2 +- hw/sd/sdhci.c | 4 +- hw/sd/ssi-sd.c | 2 + hw/semihosting/config.c | 1 + hw/sh4/r2d.c | 5 +- hw/sh4/sh7750.c | 3 +- hw/sh4/sh7750_regnames.c | 1 - hw/sh4/sh_pci.c | 1 + hw/sh4/shix.c | 1 - hw/smbios/smbios.c | 1 - hw/sparc/leon3.c | 5 +- hw/sparc/sun4m.c | 6 +++ hw/sparc/sun4m_iommu.c | 3 ++ hw/sparc64/niagara.c | 3 +- hw/sparc64/sparc64.c | 1 + hw/sparc64/sun4u.c | 5 +- hw/ssi/aspeed_smc.c | 4 +- hw/ssi/imx_spi.c | 3 +- hw/ssi/mss-spi.c | 2 + hw/ssi/omap_spi.c | 2 + hw/ssi/pl022.c | 2 + hw/ssi/ssi.c | 1 + hw/ssi/stm32f2xx_spi.c | 1 + hw/ssi/xilinx_spi.c | 4 +- hw/ssi/xilinx_spips.c | 4 +- hw/timer/a9gtimer.c | 4 ++ hw/timer/allwinner-a10-pit.c | 5 +- hw/timer/altera_timer.c | 4 +- hw/timer/arm_mptimer.c | 4 ++ hw/timer/arm_timer.c | 4 +- hw/timer/armv7m_systick.c | 2 + hw/timer/aspeed_rtc.c | 1 + hw/timer/aspeed_timer.c | 2 + hw/timer/cadence_ttc.c | 2 + hw/timer/cmsdk-apb-dualtimer.c | 3 ++ hw/timer/cmsdk-apb-timer.c | 2 + hw/timer/digic-timer.c | 1 + hw/timer/ds1338.c | 1 + hw/timer/etraxfs_timer.c | 5 +- hw/timer/exynos4210_mct.c | 4 ++ hw/timer/exynos4210_pwm.c | 2 + hw/timer/exynos4210_rtc.c | 5 +- hw/timer/grlib_gptimer.c | 2 + hw/timer/hpet.c | 3 +- hw/timer/i8254.c | 2 +- hw/timer/i8254_common.c | 3 +- hw/timer/imx_epit.c | 2 + hw/timer/imx_gpt.c | 2 + hw/timer/lm32_timer.c | 4 +- hw/timer/m48t59-isa.c | 1 + hw/timer/m48t59.c | 5 +- hw/timer/mc146818rtc.c | 6 ++- hw/timer/milkymist-sysctl.c | 7 ++- hw/timer/mips_gictimer.c | 1 - hw/timer/mss-timer.c | 3 ++ hw/timer/nrf51_timer.c | 2 + hw/timer/omap_gptimer.c | 3 +- hw/timer/omap_synctimer.c | 1 - hw/timer/pl031.c | 3 ++ hw/timer/puv3_ost.c | 1 + hw/timer/pxa2xx_timer.c | 6 ++- hw/timer/sh_timer.c | 1 + hw/timer/slavio_timer.c | 3 ++ hw/timer/stm32f2xx_timer.c | 3 ++ hw/timer/sun4v-rtc.c | 1 - hw/timer/twl92230.c | 4 +- hw/timer/xilinx_timer.c | 2 + hw/timer/xlnx-zynqmp-rtc.c | 2 + hw/tpm/tpm_crb.c | 2 - hw/tpm/tpm_emulator.c | 2 +- hw/tpm/tpm_passthrough.c | 1 - hw/tpm/tpm_ppi.c | 1 - hw/tpm/tpm_tis.c | 3 ++ hw/tpm/tpm_util.c | 2 +- hw/tricore/tricore_testboard.c | 2 - hw/unicore32/puv3.c | 1 + hw/usb/bus.c | 4 +- hw/usb/ccid-card-emulated.c | 1 + hw/usb/ccid-card-passthru.c | 2 + hw/usb/dev-audio.c | 3 +- hw/usb/dev-bluetooth.c | 1 + hw/usb/dev-hid.c | 3 +- hw/usb/dev-hub.c | 2 + hw/usb/dev-mtp.c | 2 + hw/usb/dev-network.c | 2 + hw/usb/dev-serial.c | 2 + hw/usb/dev-smartcard-reader.c | 2 + hw/usb/dev-storage.c | 2 + hw/usb/dev-uas.c | 3 ++ hw/usb/dev-wacom.c | 2 +- hw/usb/hcd-ehci-pci.c | 2 + hw/usb/hcd-ehci-sysbus.c | 2 + hw/usb/hcd-ehci.c | 4 ++ hw/usb/hcd-ohci-pci.c | 3 +- hw/usb/hcd-ohci.c | 4 +- hw/usb/hcd-uhci.c | 3 +- hw/usb/hcd-xhci-nec.c | 2 +- hw/usb/hcd-xhci.c | 3 +- hw/usb/host-libusb.c | 4 ++ hw/usb/libhw.c | 1 - hw/usb/redirect.c | 4 ++ hw/usb/tusb6010.c | 1 + hw/usb/xen-usb.c | 1 + hw/vfio/amd-xgbe.c | 1 + hw/vfio/ap.c | 4 +- hw/vfio/calxeda-xgmac.c | 1 + hw/vfio/ccw.c | 2 + hw/vfio/common.c | 2 + hw/vfio/pci-quirks.c | 2 + hw/vfio/pci.c | 5 ++ hw/vfio/platform.c | 5 +- hw/virtio/vhost-backend.c | 1 + hw/virtio/vhost-scsi-pci.c | 1 + hw/virtio/vhost-user-blk-pci.c | 1 + hw/virtio/vhost-user-scsi-pci.c | 1 + hw/virtio/vhost-user.c | 1 + hw/virtio/vhost-vsock-pci.c | 1 + hw/virtio/vhost-vsock.c | 1 + hw/virtio/vhost.c | 2 +- hw/virtio/virtio-9p-pci.c | 1 + hw/virtio/virtio-balloon-pci.c | 1 + hw/virtio/virtio-balloon.c | 1 + hw/virtio/virtio-blk-pci.c | 1 + hw/virtio/virtio-bus.c | 2 - hw/virtio/virtio-crypto-pci.c | 1 + hw/virtio/virtio-crypto.c | 3 +- hw/virtio/virtio-input-pci.c | 1 + hw/virtio/virtio-mmio.c | 3 ++ hw/virtio/virtio-net-pci.c | 1 + hw/virtio/virtio-pci.c | 2 + hw/virtio/virtio-pmem.c | 3 ++ hw/virtio/virtio-rng.c | 4 +- hw/virtio/virtio-scsi-pci.c | 1 + hw/virtio/virtio-serial-pci.c | 1 + hw/virtio/virtio.c | 4 ++ hw/watchdog/cmsdk-apb-watchdog.c | 3 ++ hw/watchdog/watchdog.c | 2 +- hw/watchdog/wdt_aspeed.c | 2 + hw/watchdog/wdt_diag288.c | 2 + hw/watchdog/wdt_i6300esb.c | 2 +- hw/watchdog/wdt_ib700.c | 2 +- hw/xen/xen-bus-helper.c | 1 - hw/xen/xen-bus.c | 2 +- hw/xen/xen-common.c | 1 + hw/xen/xen-legacy-backend.c | 3 +- hw/xen/xen_devconfig.c | 1 + hw/xen/xen_pt.c | 1 + hw/xen/xen_pt_load_rom.c | 2 - hw/xen/xen_pvdev.c | 1 + hw/xenpv/xen_machine_pv.c | 2 +- hw/xtensa/mx_pic.c | 2 +- hw/xtensa/pic_cpu.c | 2 +- hw/xtensa/sim.c | 1 + hw/xtensa/xtensa_memory.c | 2 - hw/xtensa/xtfpga.c | 4 ++ linux-user/elfload.c | 1 + linux-user/main.c | 1 + linux-user/syscall.c | 1 + memory.c | 5 +- migration/block-dirty-bitmap.c | 2 +- migration/block.c | 1 + migration/colo.c | 3 ++ migration/global_state.c | 1 + migration/migration.c | 4 ++ migration/postcopy-ram.c | 1 + migration/qemu-file-channel.c | 1 - migration/rdma.c | 1 + migration/savevm.c | 4 ++ migration/vmstate-types.c | 1 - monitor/hmp-cmds.c | 2 +- monitor/hmp.c | 2 +- monitor/misc.c | 2 +- monitor/monitor.c | 1 + monitor/qmp-cmds.c | 2 +- nbd/client.c | 1 + nbd/server.c | 1 + net/can/can_socketcan.c | 1 + net/net.c | 4 +- net/netmap.c | 1 + net/tap-bsd.c | 1 - net/tap-linux.c | 1 - net/tap-solaris.c | 1 - net/tap-win32.c | 2 +- net/tap.c | 1 + os-posix.c | 2 +- os-win32.c | 2 +- qapi/qapi-dealloc-visitor.c | 1 - qapi/qmp-dispatch.c | 2 +- qdev-monitor.c | 2 +- qemu-img.c | 2 +- qom/cpu.c | 3 +- qom/object.c | 1 + qom/qom-qmp-cmds.c | 2 +- qtest.c | 3 +- replay/replay-audio.c | 1 - replay/replay-char.c | 1 - replay/replay-internal.c | 3 +- replay/replay-net.c | 1 - replay/replay-snapshot.c | 1 - replay/replay.c | 2 +- stubs/change-state-handler.c | 2 +- stubs/replay.c | 1 - stubs/runstate-check.c | 2 +- stubs/semihost.c | 1 + stubs/vm-stop.c | 2 +- target/alpha/machine.c | 2 - target/alpha/sys_helper.c | 1 + target/arm/cpu64.c | 1 - target/arm/helper-a64.c | 2 +- target/arm/helper.c | 4 +- target/arm/kvm.c | 2 + target/arm/kvm32.c | 1 - target/arm/kvm64.c | 2 +- target/arm/m_helper.c | 3 +- target/arm/machine.c | 2 - target/arm/monitor.c | 1 - target/arm/psci.c | 4 +- target/cris/machine.c | 1 - target/hppa/machine.c | 2 - target/hppa/op_helper.c | 2 +- target/i386/cpu.c | 2 +- target/i386/excp_helper.c | 2 +- target/i386/hax-all.c | 3 +- target/i386/helper.c | 2 +- target/i386/hvf/hvf.c | 4 +- target/i386/hvf/x86_task.c | 2 - target/i386/kvm.c | 3 ++ target/i386/machine.c | 2 - target/i386/monitor.c | 1 + target/i386/sev.c | 1 + target/i386/whpx-all.c | 4 +- target/lm32/helper.c | 1 - target/lm32/machine.c | 2 - target/lm32/op_helper.c | 3 +- target/m68k/m68k-semi.c | 1 - target/mips/cp0_timer.c | 1 + target/mips/kvm.c | 3 +- target/mips/machine.c | 1 - target/moxie/machine.c | 2 - target/nios2/nios2-semi.c | 1 - target/openrisc/machine.c | 2 - target/ppc/int_helper.c | 2 + target/ppc/kvm.c | 4 +- target/ppc/machine.c | 3 +- target/ppc/mem_helper.c | 2 + target/ppc/misc_helper.c | 2 + target/ppc/mmu_helper.c | 2 + target/ppc/translate.c | 1 + target/s390x/cpu.c | 2 +- target/s390x/helper.c | 2 +- target/s390x/kvm.c | 3 +- target/s390x/machine.c | 2 +- target/s390x/mmu_helper.c | 1 + target/s390x/sigp.c | 2 +- target/sh4/helper.c | 3 +- target/sparc/helper.c | 1 - target/sparc/int32_helper.c | 2 +- target/sparc/machine.c | 2 - target/tilegx/cpu.c | 1 - target/xtensa/translate.c | 1 - target/xtensa/xtensa-semi.c | 1 - tcg/optimize.c | 1 - tcg/tcg-common.c | 1 - tcg/tcg-op-gvec.c | 1 + tcg/tcg.c | 1 - tests/migration-test.c | 1 - tests/test-bdrv-drain.c | 1 + tests/test-bdrv-graph-mod.c | 1 + tests/test-block-backend.c | 1 + tests/test-block-iothread.c | 1 + tests/test-image-locking.c | 1 + tests/test-qdev-global-props.c | 2 +- tests/test-replication.c | 1 + tests/test-throttle.c | 1 + trace/qmp.c | 2 +- ui/gtk.c | 1 + ui/input-keymap.c | 1 - ui/input-legacy.c | 1 - ui/input-linux.c | 2 +- ui/input.c | 1 + ui/kbd-state.c | 1 - ui/keymaps.c | 1 - ui/sdl2-2d.c | 1 - ui/sdl2-gl.c | 1 - ui/sdl2-input.c | 1 - ui/sdl2.c | 1 + ui/spice-core.c | 4 +- ui/spice-display.c | 2 +- ui/vnc.c | 2 + util/fifo8.c | 1 + util/oslib-posix.c | 1 + util/qemu-timer.c | 1 - util/vfio-helpers.c | 1 - vl.c | 11 ++-- MAINTAINERS | 4 ++ hw/tpm/trace-events | 4 +- qapi/Makefile.objs | 2 +- scripts/tracetool/format/c.py | 1 + scripts/tracetool/format/h.py | 7 ++- scripts/tracetool/format/log_stap.py | 3 -- ui/cocoa.m | 1 + 1278 files changed, 2171 insertions(+), 1025 deletions(-) create mode 100644 qapi/error.json delete mode 100644 include/hw/qdev.h create mode 100644 include/sysemu/runstate.h create mode 100644 trace/control-vcpu.h
Signature · 1 line
2.21.0
PATCH v4 1/29 include: Make headers more self-contained
Back in 2016, we discussed[1] 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.
This patch gets include/ closer to obeying 2.
It's actually extracted from my "[RFC] Baby steps towards saner headers" series[2], which demonstrates a possible path towards checking 2 automatically. It passes the RFC test there.
[1] Message-ID: <[email protected]>
https://lists.nongnu.org/archive/html/qemu-devel/2016-03/msg03345.html [2] Message-Id: <[email protected]> https://lists.nongnu.org/archive/html/qemu-devel/2019-07/msg02715.html
--- include/block/raw-aio.h | 2 ++ include/block/write-threshold.h | 2 ++ include/disas/disas.h | 1 + include/exec/cputlb.h | 3 +++ include/exec/exec-all.h | 1 + include/exec/ioport.h | 2 ++ include/exec/memory-internal.h | 2 ++ include/exec/ram_addr.h | 1 + include/exec/softmmu-semi.h | 2 ++ include/exec/tb-hash.h | 2 ++ include/exec/user/thunk.h | 2 ++ include/fpu/softfloat-macros.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 | 1 + include/hw/arm/aspeed_soc.h | 1 + include/hw/arm/bcm2836.h | 1 + include/hw/arm/exynos4210.h | 3 +-- include/hw/arm/fsl-imx25.h | 1 + include/hw/arm/fsl-imx31.h | 1 + include/hw/arm/sharpsl.h | 3 +++ include/hw/arm/xlnx-zynqmp.h | 1 + include/hw/block/fdc.h | 2 ++ include/hw/block/flash.h | 1 + include/hw/char/escc.h | 1 + include/hw/char/xilinx_uartlite.h | 2 ++ include/hw/core/generic-loader.h | 1 + include/hw/cris/etraxfs.h | 1 + include/hw/cris/etraxfs_dma.h | 3 +++ include/hw/display/i2c-ddc.h | 1 + include/hw/empty_slot.h | 2 ++ include/hw/gpio/bcm2835_gpio.h | 1 + include/hw/i2c/aspeed_i2c.h | 2 ++ include/hw/i386/apic_internal.h | 1 + include/hw/i386/ioapic_internal.h | 1 + include/hw/intc/allwinner-a10-pic.h | 2 ++ include/hw/intc/heathrow_pic.h | 2 ++ include/hw/intc/mips_gic.h | 1 + include/hw/isa/vt82c686.h | 2 ++ include/hw/mips/cps.h | 1 + include/hw/misc/macio/cuda.h | 2 ++ include/hw/misc/macio/gpio.h | 3 +++ include/hw/misc/macio/macio.h | 2 ++ include/hw/misc/macio/pmu.h | 3 +++ 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 | 1 + include/hw/net/lance.h | 1 + include/hw/nvram/chrp_nvram.h | 2 ++ include/hw/pci-host/sabre.h | 2 ++ include/hw/pci-host/uninorth.h | 2 +- include/hw/pci/pcie_aer.h | 1 + include/hw/ppc/pnv_core.h | 1 + include/hw/ppc/ppc4xx.h | 4 ++++ include/hw/ppc/spapr_irq.h | 3 +++ include/hw/ppc/spapr_vio.h | 1 + include/hw/ppc/spapr_xive.h | 2 ++ include/hw/ppc/xive_regs.h | 3 +++ include/hw/riscv/boot.h | 2 ++ include/hw/riscv/riscv_hart.h | 3 +++ include/hw/riscv/sifive_clint.h | 2 ++ include/hw/riscv/sifive_e.h | 1 + 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 | 1 + include/hw/riscv/sifive_uart.h | 3 +++ include/hw/riscv/spike.h | 3 +++ include/hw/riscv/virt.h | 3 +++ include/hw/s390x/ap-device.h | 3 +++ include/hw/s390x/css-bridge.h | 3 ++- include/hw/s390x/css.h | 1 + include/hw/s390x/tod.h | 2 +- include/hw/semihosting/console.h | 2 ++ include/hw/sh4/sh_intc.h | 1 + include/hw/sparc/sparc64.h | 2 ++ include/hw/ssi/aspeed_smc.h | 1 + include/hw/ssi/xilinx_spips.h | 1 + include/hw/timer/allwinner-a10-pit.h | 1 + include/hw/timer/i8254_internal.h | 1 + include/hw/timer/m48t59.h | 2 ++ include/hw/timer/mc146818rtc_regs.h | 2 ++ include/hw/timer/xlnx-zynqmp-rtc.h | 1 + include/hw/virtio/virtio-access.h | 1 + include/hw/virtio/virtio-gpu-bswap.h | 1 + include/hw/virtio/virtio-rng.h | 1 + include/hw/watchdog/wdt_aspeed.h | 1 + include/libdecnumber/decNumberLocal.h | 1 + include/migration/cpu.h | 3 +++ include/monitor/hmp-target.h | 2 ++ include/qemu/atomic128.h | 2 ++ include/qemu/ratelimit.h | 2 ++ include/qemu/thread-win32.h | 2 +- include/sysemu/balloon.h | 1 + include/sysemu/cryptodev-vhost-user.h | 3 +++ include/sysemu/hvf.h | 1 + include/sysemu/iothread.h | 1 + include/sysemu/kvm_int.h | 2 ++ include/sysemu/memory_mapping.h | 2 ++ include/sysemu/xen-mapcache.h | 2 ++ include/ui/egl-helpers.h | 3 +++ include/ui/input.h | 1 + include/ui/spice-display.h | 1 + target/hppa/cpu.h | 2 +- 106 files changed, 183 insertions(+), 8 deletions(-)
include/block/raw-aio.h +2 -0
@@ -12,9 +12,11 @@* Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ +#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 +2 -0
@@ -9,9 +9,11 @@* 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. */ +#ifndef BLOCK_WRITE_THRESHOLD_H #define BLOCK_WRITE_THRESHOLD_H +#include "block/block_int.h" /* * bdrv_write_threshold_set:
include/disas/disas.h +1 -0
@@ -1,6 +1,7 @@#ifndef QEMU_DISAS_H #define QEMU_DISAS_H +#include "exec/hwaddr.h" #ifdef NEED_CPU_H #include "cpu.h"
include/exec/cputlb.h +3 -0
@@ -16,9 +16,12 @@* 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/>. */ +#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 -0
@@ -20,6 +20,7 @@#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 -0
@@ -24,6 +24,8 @@#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 +2 -0
@@ -20,6 +20,8 @@ #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 -0
@@ -20,6 +20,7 @@#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 -0
@@ -10,6 +10,8 @@#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 -0
@@ -20,6 +20,8 @@#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/user/thunk.h +2 -0
@@ -16,10 +16,12 @@* 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/>. */ +#ifndef THUNK_H #define THUNK_H #include "cpu.h" +#include "exec/user/abitypes.h" /* types enums definitions */
include/fpu/softfloat-macros.h +2 -0
@@ -82,6 +82,8 @@ this code that are retained.#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 +3 -0
@@ -22,9 +22,12 @@* You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ + #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 +3 -0
@@ -6,9 +6,12 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#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 -0
@@ -25,6 +25,8 @@#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 +1 -0
@@ -11,6 +11,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/aspeed_soc.h +1 -0
@@ -22,6 +22,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 +1 -0
@@ -13,6 +13,7 @@#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/exynos4210.h +1 -2
@@ -19,13 +19,12 @@* * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. -* */ #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 +1 -0
@@ -27,6 +27,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 +1 -0
@@ -26,6 +26,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/sharpsl.h +3 -0
@@ -3,9 +3,12 @@* * This file is licensed under the GNU GPL. */ +#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/xlnx-zynqmp.h +1 -0
@@ -32,6 +32,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 -0
@@ -1,6 +1,8 @@#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 -0
@@ -4,6 +4,7 @@/* NOR flash devices */ #include "exec/memory.h" +#include "migration/vmstate.h" /* pflash_cfi01.c */
include/hw/char/escc.h +1 -0
@@ -3,6 +3,7 @@#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 -0
@@ -15,6 +15,8 @@#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 -0
@@ -19,6 +19,7 @@#define GENERIC_LOADER_H #include "elf.h" +#include "hw/qdev-core.h" typedef struct GenericLoaderState { /* <private> */
include/hw/cris/etraxfs.h +1 -0
@@ -27,6 +27,7 @@#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 -0
@@ -1,6 +1,9 @@ #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 -0
@@ -20,6 +20,7 @@#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 -0
@@ -1,6 +1,8 @@#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 -0
@@ -15,6 +15,7 @@#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 +2 -0
@@ -17,10 +17,12 @@* with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#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 +1 -0
@@ -24,6 +24,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 -0
@@ -24,6 +24,7 @@#include "hw/hw.h" #include "exec/memory.h" +#include "hw/i386/ioapic.h" #include "hw/sysbus.h" #include "qemu/notify.h"
include/hw/intc/allwinner-a10-pic.h +2 -0
@@ -1,6 +1,8 @@#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/heathrow_pic.h +2 -0
@@ -26,6 +26,8 @@#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 +1 -0
@@ -13,6 +13,7 @@#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 -0
@@ -1,6 +1,8 @@#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 +1 -0
@@ -25,6 +25,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 -0
@@ -26,6 +26,8 @@#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 -0
@@ -26,6 +26,9 @@#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 -0
@@ -27,10 +27,12 @@#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 -0
@@ -10,6 +10,9 @@#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 -0
@@ -10,6 +10,8 @@#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 -0
@@ -20,6 +20,8 @@#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 +3 -0
@@ -11,9 +11,12 @@* See the COPYING file in the top-level directory. * */ +#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 -0
@@ -27,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 -0
@@ -31,6 +31,7 @@#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 -0
@@ -18,6 +18,8 @@ #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 -0
@@ -1,6 +1,8 @@#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/uninorth.h +1 -1
@@ -26,7 +26,7 @@#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 -0
@@ -22,6 +22,7 @@#define QEMU_PCIE_AER_H #include "hw/hw.h" +#include "hw/pci/pci_regs.h" /* definitions which PCIExpressDevice uses */
include/hw/ppc/pnv_core.h +1 -0
@@ -21,6 +21,7 @@#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 +4 -0
@@ -25,6 +25,10 @@#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_irq.h +3 -0
@@ -10,6 +10,9 @@#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 +1 -0
@@ -22,6 +22,7 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "hw/ppc/spapr.h" #include "sysemu/dma.h" #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device"
include/hw/ppc/spapr_xive.h +2 -0
@@ -10,7 +10,9 @@#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/xive_regs.h +3 -0
@@ -16,6 +16,9 @@#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 +2 -0
@@ -20,6 +20,8 @@#ifndef RISCV_BOOT_H #define RISCV_BOOT_H +#include "exec/cpu-defs.h" +void riscv_find_and_load_firmware (MachineState *machine,const char *default_machine_firmware,hwaddr firmware_load_addr);
include/hw/riscv/riscv_hart.h +3 -0
@@ -21,6 +21,9 @@#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/sifive_clint.h +2 -0
@@ -20,6 +20,8 @@#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 +1 -0
@@ -19,6 +19,7 @@#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 -1
@@ -21,7 +21,7 @@#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 -0
@@ -19,6 +19,8 @@#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 -0
@@ -19,6 +19,8 @@#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 +1 -0
@@ -20,6 +20,7 @@#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 -0
@@ -20,6 +20,9 @@#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 +3 -0
@@ -19,6 +19,9 @@ #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 +3 -0
@@ -19,6 +19,9 @@ #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/ap-device.h +3 -0
@@ -7,9 +7,12 @@* your option) any later version. See the COPYING file in the top-level * directory. */ + #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 -1
@@ -12,8 +12,9 @@ #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 +1 -0
@@ -17,6 +17,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/tod.h +1 -1
@@ -12,7 +12,7 @@#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/semihosting/console.h +2 -0
@@ -9,6 +9,8 @@#ifndef SEMIHOST_CONSOLE_H #define SEMIHOST_CONSOLE_H +#include "cpu.h" +/** * qemu_semihosting_console_outs: * @env: CPUArchState
include/hw/sh4/sh_intc.h +1 -0
@@ -1,6 +1,7 @@#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 +2 -0
@@ -1,6 +1,8 @@#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 -0
@@ -26,6 +26,7 @@#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 -0
@@ -28,6 +28,7 @@#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 -0
@@ -2,6 +2,7 @@#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 -0
@@ -27,6 +27,7 @@#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 -0
@@ -1,6 +1,8 @@#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_regs.h +2 -0
@@ -25,6 +25,8 @@#ifndef MC146818RTC_REGS_H #define MC146818RTC_REGS_H +#include "qemu/timer.h" +#define RTC_ISA_IRQ 8#define RTC_SECONDS 0
include/hw/timer/xlnx-zynqmp-rtc.h +1 -0
@@ -28,6 +28,7 @@#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 +1 -0
@@ -16,6 +16,7 @@#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 -0
@@ -15,6 +15,7 @@#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-rng.h +1 -0
@@ -12,6 +12,7 @@#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 -0
@@ -10,6 +10,7 @@#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 -0
@@ -44,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 +3 -0
@@ -1,7 +1,10 @@/* Declarations for use for CPU state serialization. */ +#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 -0
@@ -25,6 +25,8 @@#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 -0
@@ -13,6 +13,8 @@#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 -0
@@ -14,6 +14,8 @@ #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 +1 -1
@@ -47,6 +47,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 -0
@@ -14,6 +14,7 @@#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 +3 -0
@@ -20,9 +20,12 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. * */ +#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/hvf.h +1 -0
@@ -13,6 +13,7 @@#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 -0
@@ -16,6 +16,7 @@#include "block/aio.h" #include "qemu/thread.h" +#include "qom/object.h" #define TYPE_IOTHREAD "iothread"
include/sysemu/kvm_int.h +2 -0
@@ -9,6 +9,8 @@#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 +2 -0
@@ -15,6 +15,8 @@#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 -0
@@ -9,6 +9,8 @@#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 +3 -0
@@ -4,6 +4,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 -0
@@ -2,6 +2,7 @@#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/spice-display.h +1 -0
@@ -18,6 +18,7 @@#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
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH v4 01/29] include: Make headers more self-contained
Quoted 19 lines · Markus Armbruster
Back in 2016, we discussed[1] 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 intoqemu/typedefs.hinstead of including the header.3. Cyclic inclusion is forbidden.
This patch gets
include/closer to obeying 2.It's actually extracted from my "[RFC] Baby steps towards saner headers" series[2], which demonstrates a possible path towards checking 2 automatically. It passes the RFC test there.
Quoted 7 lines
[1] Message-ID: <[email protected]>
https://lists.nongnu.org/archive/html/qemu-devel/2016-03/msg03345.html [2] Message-Id: <[email protected]> https://lists.nongnu.org/archive/html/qemu-devel/2019-07/msg02715.htmlSigned-off-by Markus Armbruster <[email protected]>Reviewed-by Alistair Francis <[email protected]>
Quoted 108 lines
--- include/block/raw-aio.h | 2 ++ include/block/write-threshold.h | 2 ++ include/disas/disas.h | 1 + include/exec/cputlb.h | 3 +++ include/exec/exec-all.h | 1 + include/exec/ioport.h | 2 ++ include/exec/memory-internal.h | 2 ++ include/exec/ram_addr.h | 1 + include/exec/softmmu-semi.h | 2 ++ include/exec/tb-hash.h | 2 ++ include/exec/user/thunk.h | 2 ++ include/fpu/softfloat-macros.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 | 1 + include/hw/arm/aspeed_soc.h | 1 + include/hw/arm/bcm2836.h | 1 + include/hw/arm/exynos4210.h | 3 +-- include/hw/arm/fsl-imx25.h | 1 + include/hw/arm/fsl-imx31.h | 1 + include/hw/arm/sharpsl.h | 3 +++ include/hw/arm/xlnx-zynqmp.h | 1 + include/hw/block/fdc.h | 2 ++ include/hw/block/flash.h | 1 + include/hw/char/escc.h | 1 + include/hw/char/xilinx_uartlite.h | 2 ++ include/hw/core/generic-loader.h | 1 + include/hw/cris/etraxfs.h | 1 + include/hw/cris/etraxfs_dma.h | 3 +++ include/hw/display/i2c-ddc.h | 1 + include/hw/empty_slot.h | 2 ++ include/hw/gpio/bcm2835_gpio.h | 1 + include/hw/i2c/aspeed_i2c.h | 2 ++ include/hw/i386/apic_internal.h | 1 + include/hw/i386/ioapic_internal.h | 1 + include/hw/intc/allwinner-a10-pic.h | 2 ++ include/hw/intc/heathrow_pic.h | 2 ++ include/hw/intc/mips_gic.h | 1 + include/hw/isa/vt82c686.h | 2 ++ include/hw/mips/cps.h | 1 + include/hw/misc/macio/cuda.h | 2 ++ include/hw/misc/macio/gpio.h | 3 +++ include/hw/misc/macio/macio.h | 2 ++ include/hw/misc/macio/pmu.h | 3 +++ 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 | 1 + include/hw/net/lance.h | 1 + include/hw/nvram/chrp_nvram.h | 2 ++ include/hw/pci-host/sabre.h | 2 ++ include/hw/pci-host/uninorth.h | 2 +- include/hw/pci/pcie_aer.h | 1 + include/hw/ppc/pnv_core.h | 1 + include/hw/ppc/ppc4xx.h | 4 ++++ include/hw/ppc/spapr_irq.h | 3 +++ include/hw/ppc/spapr_vio.h | 1 + include/hw/ppc/spapr_xive.h | 2 ++ include/hw/ppc/xive_regs.h | 3 +++ include/hw/riscv/boot.h | 2 ++ include/hw/riscv/riscv_hart.h | 3 +++ include/hw/riscv/sifive_clint.h | 2 ++ include/hw/riscv/sifive_e.h | 1 + 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 | 1 + include/hw/riscv/sifive_uart.h | 3 +++ include/hw/riscv/spike.h | 3 +++ include/hw/riscv/virt.h | 3 +++ include/hw/s390x/ap-device.h | 3 +++ include/hw/s390x/css-bridge.h | 3 ++- include/hw/s390x/css.h | 1 + include/hw/s390x/tod.h | 2 +- include/hw/semihosting/console.h | 2 ++ include/hw/sh4/sh_intc.h | 1 + include/hw/sparc/sparc64.h | 2 ++ include/hw/ssi/aspeed_smc.h | 1 + include/hw/ssi/xilinx_spips.h | 1 + include/hw/timer/allwinner-a10-pit.h | 1 + include/hw/timer/i8254_internal.h | 1 + include/hw/timer/m48t59.h | 2 ++ include/hw/timer/mc146818rtc_regs.h | 2 ++ include/hw/timer/xlnx-zynqmp-rtc.h | 1 + include/hw/virtio/virtio-access.h | 1 + include/hw/virtio/virtio-gpu-bswap.h | 1 + include/hw/virtio/virtio-rng.h | 1 + include/hw/watchdog/wdt_aspeed.h | 1 + include/libdecnumber/decNumberLocal.h | 1 + include/migration/cpu.h | 3 +++ include/monitor/hmp-target.h | 2 ++ include/qemu/atomic128.h | 2 ++ include/qemu/ratelimit.h | 2 ++ include/qemu/thread-win32.h | 2 +- include/sysemu/balloon.h | 1 + include/sysemu/cryptodev-vhost-user.h | 3 +++ include/sysemu/hvf.h | 1 + include/sysemu/iothread.h | 1 + include/sysemu/kvm_int.h | 2 ++ include/sysemu/memory_mapping.h | 2 ++ include/sysemu/xen-mapcache.h | 2 ++ include/ui/egl-helpers.h | 3 +++ include/ui/input.h | 1 + include/ui/spice-display.h | 1 + target/hppa/cpu.h | 2 +- 106 files changed, 183 insertions(+), 8 deletions(-)
PATCH v4 2/29 Include generated QAPI headers less
In reply to Markus ArmbrusterSome of the generated qapi-types-MODULE.h are included all over the place. Changing a QAPI type can trigger massive recompiling. Top scorers recompile more than 1000 out of some 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h):
6300 qapi/qapi-builtin-types.h
5700 qapi/qapi-types-run-state.h
3900 qapi/qapi-types-common.h
3300 qapi/qapi-types-sockets.h
3000 qapi/qapi-types-misc.h
3000 qapi/qapi-types-crypto.h
3000 qapi/qapi-types-job.h
3000 qapi/qapi-types-block-core.h
2800 qapi/qapi-types-block.h
1300 qapi/qapi-types-net.hClean up headers to include generated QAPI headers only where needed. Impact is negligible except for hw/qdev-properties.h.
This header includes qapi/qapi-types-block.h and qapi/qapi-types-misc.h. They are used only in expansions of property definition macros such as DEFINE_PROP_BLOCKDEV_ON_ERROR() and DEFINE_PROP_OFF_AUTO(). Moving their inclusion from hw/qdev-properties.h to the users of these macros avoids pointless recompiles. This is how other property definition macros, such as DEFINE_PROP_NETDEV(), already work.
Improves things for some of the top scorers:
3600 qapi/qapi-types-common.h
2800 qapi/qapi-types-sockets.h
900 qapi/qapi-types-misc.h
2200 qapi/qapi-types-crypto.h
2100 qapi/qapi-types-job.h
2100 qapi/qapi-types-block-core.h
270 qapi/qapi-types-block.h--- include/authz/listfile.h | 1 - include/block/block.h | 1 - include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/mem/memory-device.h | 1 + include/hw/ppc/spapr_drc.h | 1 - include/hw/qdev-properties.h | 2 -- include/hw/virtio/virtio-pmem.h | 1 + include/migration/global_state.h | 1 - include/qemu/job.h | 2 +- include/sysemu/arch_init.h | 1 - include/ui/egl-helpers.h | 1 - monitor/monitor-internal.h | 1 - target/i386/sev_i386.h | 2 +- ui/vnc.h | 1 - hw/core/qdev-properties.c | 2 ++ hw/i386/kvm/i8254.c | 1 + hw/ide/qdev.c | 1 + target/i386/monitor.c | 1 + 18 files changed, 10 insertions(+), 12 deletions(-)
include/authz/listfile.h +0 -1
@@ -22,7 +22,6 @@#define QAUTHZ_LISTFILE_H #include "authz/list.h" -#include "qapi/qapi-types-authz.h" #include "qemu/filemonitor.h" #define TYPE_QAUTHZ_LIST_FILE "authz-list-file"
include/block/block.h +0 -1
@@ -2,7 +2,6 @@#define BLOCK_H #include "block/aio.h" -#include "qapi/qapi-types-block-core.h" #include "block/aio-wait.h" #include "qemu/iov.h" #include "qemu/coroutine.h"
include/hw/acpi/acpi_dev_interface.h +1 -0
@@ -1,6 +1,7 @@#ifndef ACPI_DEV_INTERFACE_H #define ACPI_DEV_INTERFACE_H +#include "qapi/qapi-types-misc.h" #include "qom/object.h" #include "hw/boards.h"
include/hw/mem/memory-device.h +1 -0
@@ -13,6 +13,7 @@#ifndef MEMORY_DEVICE_H #define MEMORY_DEVICE_H +#include "qapi/qapi-types-misc.h" #include "qom/object.h" #include "hw/qdev.h"
include/hw/ppc/spapr_drc.h +0 -1
@@ -14,7 +14,6 @@#define HW_SPAPR_DRC_H #include <libfdt.h> -#include "qapi/qapi-types-run-state.h" #include "qom/object.h" #include "sysemu/sysemu.h" #include "hw/qdev.h"
include/hw/qdev-properties.h +0 -2
@@ -1,8 +1,6 @@#ifndef QEMU_QDEV_PROPERTIES_H #define QEMU_QDEV_PROPERTIES_H -#include "qapi/qapi-types-block.h" -#include "qapi/qapi-types-misc.h" #include "hw/qdev-core.h" /*** qdev-properties.c ***/
include/hw/virtio/virtio-pmem.h +1 -0
@@ -15,6 +15,7 @@#define HW_VIRTIO_PMEM_H #include "hw/virtio/virtio.h" +#include "qapi/qapi-types-misc.h" #include "sysemu/hostmem.h" #define TYPE_VIRTIO_PMEM "virtio-pmem"
include/migration/global_state.h +0 -1
@@ -13,7 +13,6 @@#ifndef QEMU_MIGRATION_GLOBAL_STATE_H #define QEMU_MIGRATION_GLOBAL_STATE_H -#include "qapi/qapi-types-run-state.h" #include "sysemu/sysemu.h" void register_global_state (void );
include/qemu/job.h +1 -1
@@ -26,7 +26,7 @@#ifndef JOB_H #define JOB_H -#include "qapi/qapi-types-block-core.h" +#include "qapi/qapi-types-job.h" #include "qemu/queue.h" #include "qemu/coroutine.h" #include "block/aio.h"
include/sysemu/arch_init.h +0 -1
@@ -1,7 +1,6 @@#ifndef QEMU_ARCH_INIT_H #define QEMU_ARCH_INIT_H -#include "qapi/qapi-types-misc.h" enum { QEMU_ARCH_ALL = -1,
include/ui/egl-helpers.h +0 -1
@@ -4,7 +4,6 @@#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"
monitor/monitor-internal.h +0 -1
@@ -27,7 +27,6 @@#include "chardev/char-fe.h" #include "monitor/monitor.h" -#include "qapi/qapi-types-misc.h" #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qemu/readline.h"
target/i386/sev_i386.h +1 -1
@@ -19,7 +19,7 @@#include "sysemu/kvm.h" #include "sysemu/sev.h" #include "qemu/error-report.h" -#include "qapi/qapi-commands-misc-target.h" +#include "qapi/qapi-types-misc-target.h" #define SEV_POLICY_NODBG 0x1#define SEV_POLICY_NOKS 0x2
ui/vnc.h +0 -1
@@ -27,7 +27,6 @@#ifndef QEMU_VNC_H #define QEMU_VNC_H -#include "qapi/qapi-types-ui.h" #include "qemu/queue.h" #include "qemu/thread.h" #include "ui/console.h"
hw/core/qdev-properties.c +2 -0
@@ -3,6 +3,8 @@#include "hw/qdev.h" #include "qapi/error.h" #include "hw/pci/pci.h" +#include "qapi/qapi-types-block.h" +#include "qapi/qapi-types-misc.h" #include "qapi/qmp/qerror.h" #include "qemu/ctype.h" #include "qemu/error-report.h"
hw/i386/kvm/i8254.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include <linux/kvm.h> +#include "qapi/qapi-types-misc.h" #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h"
hw/ide/qdev.c +1 -0
@@ -21,6 +21,7 @@#include "hw/hw.h" #include "sysemu/dma.h" #include "qapi/error.h" +#include "qapi/qapi-types-block.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/ide/internal.h"
target/i386/monitor.c +1 -0
@@ -33,6 +33,7 @@#include "sysemu/sev.h" #include "qapi/error.h" #include "sev_i386.h" +#include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-commands-misc.h" /* Perform linear address sign extension */
Signature · 1 line
2.21.0
PATCH v4 3/29 qapi: Split error.json off common.json
In reply to Markus ArmbrusterIn my "build everything" tree, changing a type in qapi/common.json triggers a recompile of some 3600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h).
One common dependency is QapiErrorClass: it's used only in in qapi/error.h, which uses nothing else, and is widely included.
Move QapiErrorClass from common.json to new error.json. Touching common.json now recompiles only some 2900 objects.
--- qapi/common.json | 24 ------------------------ qapi/error.json | 29 +++++++++++++++++++++++++++++ qapi/qapi-schema.json | 1 + include/qapi/error.h | 2 +- MAINTAINERS | 2 ++ qapi/Makefile.objs | 2 +- 6 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 qapi/error.json
qapi/common.json +0 -24
@@ -4,30 +4,6 @@ # = Common data types ## -## -# @QapiErrorClass: -# -# QEMU error classes -# -# @GenericError: this is used for errors that don't require a specific error -# class. This should be the default case for most errors -# -# @CommandNotFound: the requested command has not been found -# -# @DeviceNotActive: a device has failed to be become active -# -# @DeviceNotFound: the requested device has not been found -# -# @KVMMissingCap: the requested operation can't be fulfilled because a -# required KVM capability is missing -# -# Since: 1.2 -## -{ 'enum': 'QapiErrorClass', - # Keep this in sync with ErrorClass in error.h - 'data': [ 'GenericError', 'CommandNotFound', - 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] } - ## # @IoOperationType: #
qapi/error.json new file +29 -0
@@ -0,0 +1,29 @@ +# -*- Mode: Python -*- + +## +# = QMP errors +## + +## +# @QapiErrorClass: +# +# QEMU error classes +# +# @GenericError: this is used for errors that don't require a specific error +# class. This should be the default case for most errors +# +# @CommandNotFound: the requested command has not been found +# +# @DeviceNotActive: a device has failed to be become active +# +# @DeviceNotFound: the requested device has not been found +# +# @KVMMissingCap: the requested operation can't be fulfilled because a +# required KVM capability is missing +# +# Since: 1.2 +## +{ 'enum': 'QapiErrorClass', + # Keep this in sync with ErrorClass in error.h + 'data': [ 'GenericError', 'CommandNotFound', + 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] }
qapi/qapi-schema.json +1 -0
@@ -80,6 +80,7 @@ # stable order, it's best to include each sub-schema just once, or # include it first right here. +{ 'include': 'error.json' } { 'include': 'common.json' } { 'include': 'sockets.json' } { 'include': 'run-state.json' }
include/qapi/error.h +1 -1
@@ -119,7 +119,7 @@#ifndef ERROR_H #define ERROR_H -#include "qapi/qapi-types-common.h" +#include "qapi/qapi-types-error.h" /* * Overall category of an error.
MAINTAINERS +2 -0
@@ -1874,6 +1874,7 @@ M: Markus Armbruster <[email protected]> S: Supported F: include/qapi/error.h F: include/qemu/error-report.h +F: qapi/error.json F: util/error.c F: util/qemu-error.c
@@ -2062,6 +2063,7 @@ F: monitor/monitor-internal.h F: monitor/qmp* F: monitor/misc.c F: monitor/monitor.c +F: qapi/error.json F: docs/devel/*qmp-* F: docs/interop/*qmp-* F: scripts/qmp/
qapi/Makefile.objs +1 -1
@@ -6,7 +6,7 @@ util-obj-y += qmp-event.o util-obj-y += qapi-util.o QAPI_COMMON_MODULES = audio authz block-core block char common crypto -QAPI_COMMON_MODULES += dump introspect job machine migration misc net +QAPI_COMMON_MODULES += dump error introspect job machine migration misc net QAPI_COMMON_MODULES += qdev qom rdma rocker run-state sockets tpm QAPI_COMMON_MODULES += trace transaction ui QAPI_TARGET_MODULES = machine-target misc-target
Signature · 1 line
2.21.0
PATCH v4 4/29 memory: Fix type of IOMMUMemoryRegionClass member @parent_class
In reply to Markus ArmbrusterTYPE_IOMMU_MEMORY_REGION is a direct subtype of TYPE_MEMORY_REGION. Its instance struct is IOMMUMemoryRegion, and its first member is a MemoryRegion. Correct. Its class struct is IOMMUMemoryRegionClass, and its first member is a DeviceClass. Wrong. Messed up when commit 1221a474676 introduced the QOM type. It even included hw/qdev-core.h just for that.
TYPE_MEMORY_REGION doesn't bother to define a class struct. This is fine, it simply defaults to its super-type TYPE_OBJECT's class struct ObjectClass. Changing IOMMUMemoryRegionClass's first member's type to ObjectClass would be a minimal fix, if a bit brittle: if TYPE_MEMORY_REGION ever acquired own class struct, we'd have to update IOMMUMemoryRegionClass to use it.
Fix it the clean and robust way instead: give TYPE_MEMORY_REGION its own class struct MemoryRegionClass now, and use it for IOMMUMemoryRegionClass's first member.
Revert the include of hw/qdev-core.h, and fix the few files that have come to rely on it.
--- hw/net/pcnet.h | 1 + include/exec/memory.h | 10 ++++++++-- hw/display/vga-isa-mm.c | 1 + memory.c | 1 + 4 files changed, 11 insertions(+), 2 deletions(-)
hw/net/pcnet.h +1 -0
@@ -8,6 +8,7 @@#define PCNET_LOOPTEST_NOCRC 2#include "exec/memory.h" +#include "hw/irq.h" /* BUS CONFIGURATION REGISTERS */ #define BCR_MSRDA 0
include/exec/memory.h +8 -2
@@ -20,12 +20,12 @@#include "exec/hwaddr.h" #include "exec/memattrs.h" #include "exec/ramlist.h" +#include "qemu/bswap.h" #include "qemu/queue.h" #include "qemu/int128.h" #include "qemu/notify.h" #include "qom/object.h" #include "qemu/rcu.h" -#include "hw/qdev-core.h" #define RAM_ADDR_INVALID (~(ram_addr_t)0)
@@ -205,6 +205,12 @@ struct MemoryRegionOps { } impl; }; +typedef struct MemoryRegionClass { +/* private */ +ObjectClass parent_class; +}MemoryRegionClass ; + +enum IOMMUMemoryRegionAttr {IOMMU_ATTR_SPAPR_TCE_FD };
@@ -237,7 +243,7 @@ enum IOMMUMemoryRegionAttr {*/ typedef struct IOMMUMemoryRegionClass { /* private */ - struct DeviceClass parent_class; + MemoryRegionClass parent_class; /* * Return a TLB entry that contains a given address.
hw/display/vga-isa-mm.c +1 -0
@@ -22,6 +22,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/bitops.h" #include "qemu/units.h" #include "hw/hw.h" #include "hw/display/vga.h"
memory.c +1 -0
@@ -3245,6 +3245,7 @@ void memory_region_init_rom_device(MemoryRegion *mr,static const TypeInfo memory_region_info = { .parent =TYPE_OBJECT , .name =TYPE_MEMORY_REGION , + .class_size =sizeof (MemoryRegionClass), .instance_size =sizeof (MemoryRegion), .instance_init = memory_region_initfn, .instance_finalize = memory_region_finalize,
Signature · 1 line
2.21.0
PATCH v4 5/29 queue: Drop superfluous #include qemu/atomic.h
In reply to Markus ArmbrusterWhen commit 5f7d05ecfda added QLIST_INSERT_HEAD_RCU() to qemu/queue.h, it had to include qemu/atomic.h. Commit 341774fe6cc removed QLIST_INSERT_HEAD_RCU() again, but neglected to remove the #include. Do that now.
--- include/qemu/queue.h | 2 -- 1 file changed, 2 deletions(-)
include/qemu/queue.h +0 -2
@@ -78,8 +78,6 @@* For details on the use of these macros, see the queue(3) manual page. */ -#include "qemu/atomic.h" /* for smp_wmb() */ -/* * List definitions. */
Signature · 1 line
2.21.0
PATCH v4 6/29 trace: Eliminate use of TARGET_FMT_plx
In reply to Markus Armbrusterhw/tpm/trace-events uses TARGET_FMT_plx formats with uint64_t arguments. That's wrong, TARGET_FMT_plx takes hwaddr. Since hwaddr happens to be uint64_t, it works anyway. Messed up in commit ec427498da5, v2.12.0. Clean up by replacing TARGET_FMT_plx with its macro expansion.
scripts/tracetool/format/log_stap.py (commit 62dd1048c0b, v4.0.0) has a special case for TARGET_FMT_plx. Delete it.
--- hw/tpm/trace-events | 4 ++-- scripts/tracetool/format/log_stap.py | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-)
hw/tpm/trace-events +2 -2
@@ -1,8 +1,8 @@ # See docs/devel/tracing.txt for syntax documentation. # tpm_crb.c -tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 -tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 +tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x%016" PRIx64 " len:%u val: 0x%" PRIx32 +tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write 0x%016" PRIx64 " len:%u val: 0x%" PRIx32 # tpm_passthrough.c tpm_passthrough_handle_request(void *cmd) "processing command %p"
scripts/tracetool/format/log_stap.py +0 -3
@@ -30,9 +30,6 @@ def c_macro_to_format(macro): if macro.startswith("PRI"): return macro[3] - if macro == "TARGET_FMT_plx": - return "%016x" - raise Exception("Unhandled macro '%s'" % macro) def c_fmt_to_stap(fmt):
Signature · 1 line
2.21.0
PATCH v4 7/29 trace: Do not include qom/cpu.h into generated trace.h
In reply to Markus Armbrusterdocs/devel/tracing.txt explains "since many source files include trace.h, [the generated trace.h use] a minimum of types and other header files included to keep the namespace clean and compile times and dependencies down."
Commit 4815185902 "trace: Add per-vCPU tracing states for events with the 'vcpu' property" made them all include qom/cpu.h via control-internal.h. qom/cpu.h in turn includes about thirty headers. Ouch.
Per-vCPU tracing is currently not supported in sub-directories' trace-events. In other words, qom/cpu.h can only be used in trace-root.h, not in any trace.h.
Split trace/control-vcpu.h off trace/control.h and trace/control-internal.h. Have the generated trace.h include trace/control.h (which no longer includes qom/cpu.h), and trace-root.h include trace/control-vcpu.h (which includes it).
The resulting improvement is a bit disappointing: in my "build everything" tree, some 1100 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h) depend on a trace.h, and about 600 of them no longer depend on qom/cpu.h. But more than 1300 others depend on trace-root.h. More work is clearly needed. Left for another day.
--- trace/control-internal.h | 25 -------------- trace/control-vcpu.h | 63 +++++++++++++++++++++++++++++++++++ trace/control.h | 24 ------------- block/block-backend.c | 1 + qom/object.c | 1 + trace/qmp.c | 2 +- ui/vnc.c | 1 + scripts/tracetool/format/c.py | 1 + scripts/tracetool/format/h.py | 7 +++- 9 files changed, 74 insertions(+), 51 deletions(-) create mode 100644 trace/control-vcpu.h
trace/control-internal.h +0 -25
@@ -10,9 +10,6 @@#ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H -#include "qom/cpu.h" - -extern int trace_events_enabled_count;
@@ -59,28 +56,6 @@ static inline bool trace_event_get_state_dynamic(TraceEvent *ev) return unlikely(trace_events_enabled_count) && *ev->dstate; } -static inline bool -trace_event_get_vcpu_state_dynamic_by_vcpu_id (CPUState *vcpu, -uint32_t vcpu_id) -{ -/* it's on fast path, avoid consistency checks (asserts) */ -if (unlikely (trace_events_enabled_count)) { -return test_bit (vcpu_id, vcpu->trace_dstate); - }else { -return false; - } -} - -static inline bool trace_event_get_vcpu_state_dynamic (CPUState *vcpu, -TraceEvent *ev) -{ -uint32_t vcpu_id; -assert (trace_event_is_vcpu (ev)); - vcpu_id =trace_event_get_vcpu_id (ev); -return trace_event_get_vcpu_state_dynamic_by_vcpu_id (vcpu, vcpu_id); -} - -void trace_event_register_group (TraceEvent **events);#endif /* TRACE__CONTROL_INTERNAL_H */
trace/control-vcpu.h new file +63 -0
63 lines not on this page · raw message
trace/control.h +0 -24
@@ -119,22 +119,6 @@ static const char * trace_event_get_name(TraceEvent *ev);#define trace_event_get_state_backends (id) \ ((id ##_ENABLED) && id ##_BACKEND_DSTATE()) -/** -* trace_event_get_vcpu_state: -* @vcpu: Target vCPU. -* @id: Event identifier name. -* -* Get the tracing state of an event (both static and dynamic) for the given -* vCPU. -* -* If the event has the disabled property, the check will have no performance -* impact. -*/ -#define trace_event_get_vcpu_state (vcpu, id) \ - ((id ##_ENABLED) && \ - trace_event_get_vcpu_state_dynamic_by_vcpu_id( \ - vcpu, _ ## id ## _EVENT.vcpu_id)) -/** * trace_event_get_state_static: * @id: Event identifier.
@@ -155,14 +139,6 @@ static bool trace_event_get_state_static(TraceEvent *ev);*/ static bool trace_event_get_state_dynamic (TraceEvent *ev); -/** -* trace_event_get_vcpu_state_dynamic: -* -* Get the dynamic tracing state of an event for the given vCPU. -*/ -static bool trace_event_get_vcpu_state_dynamic (CPUState *vcpu,TraceEvent *ev); - -/** * trace_event_set_state_dynamic: *
block/block-backend.c +1 -0
@@ -15,6 +15,7 @@#include "block/block_int.h" #include "block/blockjob.h" #include "block/throttle-groups.h" +#include "hw/qdev-core.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qapi/error.h"
qom/object.c +1 -0
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "hw/qdev-core.h" #include "qapi/error.h" #include "qom/object.h" #include "qom/object_interfaces.h"
trace/qmp.c +1 -1
@@ -10,7 +10,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/qapi-commands-trace.h" -#include "control.h" +#include "control-vcpu.h" static CPUState *get_cpu (bool has_vcpu,int vcpu,Error **errp)
ui/vnc.c +1 -0
@@ -28,6 +28,7 @@#include "vnc.h" #include "vnc-jobs.h" #include "trace.h" +#include "hw/qdev-core.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "qemu/module.h"
scripts/tracetool/format/c.py +1 -0
@@ -28,6 +28,7 @@ def generate(events, backend, group): out('/* This file is autogenerated by tracetool, do not edit. */', '', '#include "qemu/osdep.h"', + '#include "qemu/module.h"', '#include "%s"' % header, '')
scripts/tracetool/format/h.py +6 -1
@@ -17,12 +17,17 @@ from tracetool import out def generate(events, backend, group): + if group == "root": + header = "trace/control-vcpu.h" + else: + header = "trace/control.h" + out('/* This file is autogenerated by tracetool, do not edit. */', '', '#ifndef TRACE_%s_GENERATED_TRACERS_H' % group.upper(), '#define TRACE_%s_GENERATED_TRACERS_H' % group.upper(), '', - '#include "trace/control.h"', + '#include "%s"' % header, '') for e in events:
Signature · 1 line
2.21.0
PATCH v4 8/29 Include sysemu/reset.h a lot less
In reply to Markus ArmbrusterIn my "build everything" tree, changing sysemu/reset.h triggers a recompile of some 2600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h).
The main culprit is hw/hw.h, which supposedly includes it for convenience.
Include sysemu/reset.h only where it's needed. Touching it now recompiles less than 200 objects.
--- include/hw/hw.h | 1 - hw/acpi/ich9.c | 2 ++ hw/acpi/piix4.c | 2 ++ hw/acpi/vmgenid.c | 1 + hw/arm/armv7m.c | 1 + hw/arm/boot.c | 1 + hw/arm/nseries.c | 1 + hw/arm/omap1.c | 1 + hw/arm/omap2.c | 1 + hw/arm/virt-acpi-build.c | 1 + hw/char/parallel.c | 1 + hw/char/serial.c | 1 + hw/core/generic-loader.c | 1 + hw/core/loader.c | 1 + hw/cris/boot.c | 1 + hw/display/cirrus_vga.c | 1 + hw/display/ramfb.c | 2 ++ hw/display/vga.c | 2 ++ hw/hppa/machine.c | 1 + hw/i386/acpi-build.c | 1 + hw/i386/pc.c | 1 + hw/ide/cmd646.c | 1 + hw/ide/piix.c | 1 + hw/ide/sii3112.c | 1 + hw/ide/via.c | 1 + hw/input/lm832x.c | 1 + hw/input/pckbd.c | 2 ++ hw/input/ps2.c | 2 ++ hw/input/tsc2005.c | 1 + hw/input/tsc210x.c | 1 + hw/intc/mips_gic.c | 1 + hw/intc/pnv_xive.c | 1 + hw/intc/spapr_xive.c | 1 + hw/intc/xics.c | 1 + hw/intc/xive.c | 1 + hw/isa/piix4.c | 1 + hw/isa/vt82c686.c | 1 + hw/lm32/lm32_boards.c | 1 + hw/lm32/milkymist.c | 1 + hw/microblaze/boot.c | 1 + hw/mips/cps.c | 1 + hw/mips/mips_fulong2e.c | 1 + hw/mips/mips_jazz.c | 1 + hw/mips/mips_malta.c | 1 + hw/mips/mips_mipssim.c | 2 ++ hw/mips/mips_r4k.c | 2 ++ hw/misc/vmcoreinfo.c | 1 + hw/moxie/moxiesim.c | 2 ++ hw/net/eepro100.c | 1 + hw/nios2/boot.c | 1 + hw/nvram/fw_cfg.c | 1 + hw/openrisc/openrisc_sim.c | 1 + hw/pci-host/bonito.c | 1 + hw/pci-host/piix.c | 1 + hw/ppc/e500.c | 1 + hw/ppc/mac_newworld.c | 1 + hw/ppc/mac_oldworld.c | 1 + hw/ppc/pnv.c | 1 + hw/ppc/pnv_core.c | 1 + hw/ppc/pnv_psi.c | 1 + hw/ppc/ppc405_boards.c | 2 ++ hw/ppc/ppc405_uc.c | 2 ++ hw/ppc/ppc440_bamboo.c | 1 + hw/ppc/ppc440_uc.c | 1 + hw/ppc/ppc4xx_devs.c | 2 ++ hw/ppc/ppc4xx_pci.c | 1 + hw/ppc/ppc_booke.c | 2 ++ hw/ppc/prep.c | 2 ++ hw/ppc/sam460ex.c | 1 + hw/ppc/spapr.c | 1 + hw/ppc/spapr_cpu_core.c | 2 ++ hw/ppc/spapr_drc.c | 1 + hw/ppc/virtex_ml507.c | 1 + hw/riscv/riscv_hart.c | 1 + hw/s390x/ipl.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 + hw/sh4/r2d.c | 1 + hw/sparc/leon3.c | 2 ++ hw/sparc/sun4m.c | 2 ++ hw/sparc64/sparc64.c | 1 + hw/timer/etraxfs_timer.c | 1 + hw/timer/mc146818rtc.c | 1 + hw/tpm/tpm_ppi.c | 1 - hw/vfio/common.c | 1 + hw/watchdog/wdt_diag288.c | 1 + hw/xtensa/sim.c | 1 + hw/xtensa/xtfpga.c | 1 + target/i386/cpu.c | 1 + target/i386/hax-all.c | 1 + target/i386/kvm.c | 1 + target/s390x/cpu.c | 1 + vl.c | 1 + 92 files changed, 107 insertions(+), 2 deletions(-)
include/hw/hw.h +0 -1
@@ -12,7 +12,6 @@#include "hw/irq.h" #include "migration/vmstate.h" #include "migration/qemu-file-types.h" -#include "sysemu/reset.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
hw/acpi/ich9.c +2 -0
@@ -23,6 +23,7 @@* Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "qapi/error.h"
@@ -30,6 +31,7 @@#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/acpi/acpi.h" #include "hw/acpi/tco.h"
hw/acpi/piix4.c +2 -0
@@ -18,6 +18,7 @@* Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h"
@@ -25,6 +26,7 @@#include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" #include "hw/acpi/acpi.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qemu/range.h"
hw/acpi/vmgenid.c +1 -0
@@ -18,6 +18,7 @@#include "hw/acpi/aml-build.h" #include "hw/acpi/vmgenid.h" #include "hw/nvram/fw_cfg.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,
hw/arm/armv7m.c +1 -0
@@ -16,6 +16,7 @@#include "hw/loader.h" #include "elf.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "exec/address-spaces.h"
hw/arm/boot.c +1 -0
@@ -18,6 +18,7 @@#include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/loader.h" #include "elf.h"
hw/arm/nseries.c +1 -0
@@ -23,6 +23,7 @@#include "cpu.h" #include "qemu/cutils.h" #include "qemu/bswap.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/arm/omap.h" #include "hw/arm/boot.h"
hw/arm/omap1.c +1 -0
@@ -29,6 +29,7 @@#include "sysemu/sysemu.h" #include "hw/arm/soc_dma.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qemu/range.h" #include "hw/sysbus.h" #include "qemu/cutils.h"
hw/arm/omap2.c +1 -0
@@ -23,6 +23,7 @@#include "qapi/error.h" #include "cpu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/hw.h" #include "hw/arm/boot.h"
hw/arm/virt-acpi-build.c +1 -0
@@ -44,6 +44,7 @@#include "hw/pci/pci.h" #include "hw/arm/virt.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" #include "kvm_arm.h" #define ARM_SPI_BASE 32
hw/char/parallel.c +1 -0
@@ -31,6 +31,7 @@#include "chardev/char-fe.h" #include "hw/isa/isa.h" #include "hw/char/parallel.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "trace.h"
hw/char/serial.c +1 -0
@@ -28,6 +28,7 @@#include "chardev/char-serial.h" #include "qapi/error.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #include "trace.h"
hw/core/generic-loader.c +1 -0
@@ -34,6 +34,7 @@#include "qom/cpu.h" #include "hw/sysbus.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/loader.h" #include "qapi/error.h" #include "qemu/module.h"
hw/core/loader.c +1 -0
@@ -48,6 +48,7 @@#include "hw/hw.h" #include "disas/disas.h" #include "monitor/monitor.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "uboot_image.h" #include "hw/loader.h"
hw/cris/boot.c +1 -0
@@ -29,6 +29,7 @@#include "elf.h" #include "boot.h" #include "qemu/cutils.h" +#include "sysemu/reset.h" static void main_cpu_reset (void *opaque) {
hw/display/cirrus_vga.c +1 -0
@@ -35,6 +35,7 @@#include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/units.h" +#include "sysemu/reset.h" #include "qapi/error.h" #include "trace.h" #include "hw/hw.h"
hw/display/ramfb.c +2 -0
@@ -10,12 +10,14 @@* 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" #include "qapi/error.h" #include "qemu/option.h" #include "hw/loader.h" #include "hw/display/ramfb.h" #include "ui/console.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" struct QEMU_PACKED RAMFBCfg {
hw/display/vga.c +2 -0
@@ -21,8 +21,10 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/units.h" +#include "sysemu/reset.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/display/vga.h"
hw/hppa/machine.c +1 -0
@@ -11,6 +11,7 @@#include "hw/loader.h" #include "hw/boards.h" #include "qemu/error-report.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/timer/mc146818rtc.h" #include "hw/ide.h"
hw/i386/acpi-build.c +1 -0
@@ -48,6 +48,7 @@#include "hw/timer/mc146818rtc_regs.h" #include "hw/mem/memory-device.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" /* Supported chipsets: */ #include "hw/acpi/piix4.h"
hw/i386/pc.c +1 -0
@@ -54,6 +54,7 @@#include "sysemu/numa.h" #include "sysemu/kvm.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "kvm_i386.h" #include "hw/xen/xen.h" #include "hw/xen/start_info.h"
hw/ide/cmd646.c +1 -0
@@ -30,6 +30,7 @@#include "hw/isa/isa.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/ide/pci.h" #include "trace.h"
hw/ide/piix.c +1 -0
@@ -31,6 +31,7 @@#include "sysemu/sysemu.h" #include "sysemu/blockdev.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/ide/pci.h" #include "trace.h"
hw/ide/sii3112.c +1 -0
@@ -15,6 +15,7 @@#include "qemu/osdep.h" #include "hw/ide/pci.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "trace.h" #define TYPE_SII3112_PCI "sii3112"
hw/ide/via.c +1 -0
@@ -30,6 +30,7 @@#include "qemu/module.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/ide/pci.h" #include "trace.h"
hw/input/lm832x.c +1 -0
@@ -23,6 +23,7 @@#include "hw/i2c/i2c.h" #include "qemu/module.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "ui/console.h" #define TYPE_LM8323 "lm8323"
hw/input/pckbd.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/log.h" #include "hw/hw.h"
@@ -28,6 +29,7 @@#include "hw/i386/pc.h" #include "hw/input/ps2.h" #include "hw/input/i8042.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "trace.h"
hw/input/ps2.c +2 -0
@@ -21,12 +21,14 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/log.h" #include "hw/hw.h" #include "hw/input/ps2.h" #include "ui/console.h" #include "ui/input.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "trace.h"
hw/input/tsc2005.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/log.h" #include "hw/hw.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "ui/console.h" #include "hw/input/tsc2xxx.h" #include "trace.h"
hw/input/tsc210x.c +1 -0
@@ -23,6 +23,7 @@#include "hw/hw.h" #include "audio/audio.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "ui/console.h" #include "hw/arm/omap.h" /* For I2SCodec */ #include "hw/input/tsc2xxx.h"
hw/intc/mips_gic.c +1 -0
@@ -18,6 +18,7 @@#include "exec/memory.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "kvm_mips.h" #include "hw/intc/mips_gic.h"
hw/intc/pnv_xive.c +1 -0
@@ -14,6 +14,7 @@#include "target/ppc/cpu.h" #include "sysemu/cpus.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "monitor/monitor.h" #include "hw/ppc/fdt.h" #include "hw/ppc/pnv.h"
hw/intc/spapr_xive.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/error-report.h" #include "target/ppc/cpu.h" #include "sysemu/cpus.h" +#include "sysemu/reset.h" #include "monitor/monitor.h" #include "hw/ppc/fdt.h" #include "hw/ppc/spapr.h"
hw/intc/xics.c +1 -0
@@ -38,6 +38,7 @@#include "monitor/monitor.h" #include "hw/intc/intc.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" void icp_pic_print_info (ICPState *icp,Monitor *mon) {
hw/intc/xive.c +1 -0
@@ -14,6 +14,7 @@#include "target/ppc/cpu.h" #include "sysemu/cpus.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/qdev-properties.h" #include "monitor/monitor.h" #include "hw/ppc/xive.h"
hw/isa/piix4.c +1 -0
@@ -28,6 +28,7 @@#include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" +#include "sysemu/reset.h" PCIDevice *piix4_dev;
hw/isa/vt82c686.c +1 -0
@@ -22,6 +22,7 @@#include "hw/isa/apm.h" #include "hw/acpi/acpi.h" #include "hw/i2c/pm_smbus.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/module.h" #include "qemu/timer.h"
hw/lm32/lm32_boards.c +1 -0
@@ -30,6 +30,7 @@#include "lm32_hwsetup.h" #include "lm32.h" #include "exec/address-spaces.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" typedef struct {
hw/lm32/milkymist.c +1 -0
@@ -27,6 +27,7 @@#include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/loader.h" #include "elf.h"
hw/microblaze/boot.c +1 -0
@@ -31,6 +31,7 @@#include "qemu/config-file.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/loader.h" #include "elf.h"
hw/mips/cps.c +1 -0
@@ -24,6 +24,7 @@#include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" qemu_irq get_cps_irq (MIPSCPSState *s,int pin_number) {
hw/mips/mips_fulong2e.c +1 -0
@@ -44,6 +44,7 @@#include "hw/timer/i8254.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #define DEBUG_FULONG2E_INIT
hw/mips/mips_jazz.c +1 -0
@@ -48,6 +48,7 @@#include "hw/sysbus.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/help_option.h"
hw/mips/mips_malta.c +1 -0
@@ -51,6 +51,7 @@#include "hw/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/empty_slot.h"
hw/mips/mips_mipssim.c +2 -0
@@ -24,6 +24,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h"
@@ -43,6 +44,7 @@#include "exec/address-spaces.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" static struct _loaderparams { int ram_size;
hw/mips/mips_r4k.c +2 -0
@@ -7,6 +7,7 @@* All peripherial devices are attached to this "bus" with * the standard PC ISA addresses. */ +#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h"
@@ -33,6 +34,7 @@#include "hw/timer/i8254.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #define MAX_IDE_BUS 2
hw/misc/vmcoreinfo.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "hw/nvram/fw_cfg.h" #include "hw/misc/vmcoreinfo.h"
hw/moxie/moxiesim.c +2 -0
@@ -24,6 +24,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h"
@@ -31,6 +32,7 @@#include "hw/sysbus.h" #include "hw/hw.h" #include "net/net.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h"
hw/net/eepro100.c +1 -0
@@ -49,6 +49,7 @@#include "hw/nvram/eeprom93xx.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "qapi/error.h"
hw/nios2/boot.c +1 -0
@@ -36,6 +36,7 @@#include "qemu/config-file.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/loader.h" #include "elf.h"
hw/nvram/fw_cfg.c +1 -0
@@ -27,6 +27,7 @@#include "hw/hw.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h"
hw/openrisc/openrisc_sim.c +1 -0
@@ -32,6 +32,7 @@#include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #define KERNEL_LOAD_ADDR 0x100
hw/pci-host/bonito.c +1 -0
@@ -44,6 +44,7 @@#include "hw/i386/pc.h" #include "hw/mips/mips.h" #include "hw/pci/pci_host.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h"
hw/pci-host/piix.c +1 -0
@@ -33,6 +33,7 @@#include "qemu/range.h" #include "hw/xen/xen.h" #include "hw/pci-host/pam.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/i386/ioapic.h" #include "qapi/visitor.h"
hw/ppc/e500.c +1 -0
@@ -28,6 +28,7 @@#include "hw/boards.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "kvm_ppc.h" #include "sysemu/device_tree.h" #include "hw/ppc/openpic.h"
hw/ppc/mac_newworld.c +1 -0
@@ -68,6 +68,7 @@#include "elf.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "kvm_ppc.h" #include "hw/usb.h" #include "exec/address-spaces.h"
hw/ppc/mac_oldworld.c +1 -0
@@ -47,6 +47,7 @@#include "elf.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "kvm_ppc.h" #include "exec/address-spaces.h"
hw/ppc/pnv.c +1 -0
@@ -23,6 +23,7 @@#include "qapi/error.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" #include "sysemu/cpus.h" #include "sysemu/device_tree.h" #include "hw/hw.h"
hw/ppc/pnv_core.c +1 -0
@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qemu/log.h"
hw/ppc/pnv_psi.c +1 -0
@@ -22,6 +22,7 @@#include "target/ppc/cpu.h" #include "qemu/log.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "qapi/error.h" #include "monitor/monitor.h"
hw/ppc/ppc405_boards.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h"
@@ -33,6 +34,7 @@#include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "sysemu/block-backend.h" #include "hw/boards.h" #include "qemu/log.h"
hw/ppc/ppc405_uc.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h"
@@ -32,6 +33,7 @@#include "ppc405.h" #include "hw/char/serial.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "exec/address-spaces.h"
hw/ppc/ppc440_bamboo.c +1 -0
@@ -31,6 +31,7 @@#include "ppc405.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/sysbus.h" #define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
hw/ppc/ppc440_uc.c +1 -0
@@ -21,6 +21,7 @@#include "hw/ppc/ppc.h" #include "hw/pci/pci.h" #include "sysemu/block-backend.h" +#include "sysemu/reset.h" #include "ppc440.h" /*****************************************************************************/
hw/ppc/ppc4xx_devs.c +2 -0
@@ -21,8 +21,10 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/units.h" +#include "sysemu/reset.h" #include "cpu.h" #include "hw/hw.h" #include "hw/ppc/ppc.h"
hw/ppc/ppc4xx_pci.c +1 -0
@@ -24,6 +24,7 @@#include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "exec/address-spaces.h"
hw/ppc/ppc_booke.c +2 -0
@@ -21,11 +21,13 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "hw/loader.h"
hw/ppc/prep.c +2 -0
@@ -22,6 +22,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h"
@@ -45,6 +46,7 @@#include "sysemu/arch_init.h" #include "sysemu/kvm.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "exec/address-spaces.h" #include "trace.h" #include "elf.h"
hw/ppc/sam460ex.c +1 -0
@@ -31,6 +31,7 @@#include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/sysbus.h" #include "hw/char/serial.h" #include "hw/i2c/ppc4xx_i2c.h"
hw/ppc/spapr.c +1 -0
@@ -31,6 +31,7 @@#include "sysemu/sysemu.h" #include "sysemu/numa.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/hw.h" #include "qemu/log.h" #include "hw/fw-path-provider.h"
hw/ppc/spapr_cpu_core.c +2 -0
@@ -6,6 +6,7 @@* 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" #include "hw/cpu/core.h" #include "hw/ppc/spapr_cpu_core.h"
@@ -19,6 +20,7 @@#include "hw/ppc/ppc.h" #include "target/ppc/mmu-hash64.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" #include "sysemu/hw_accel.h" #include "qemu/error-report.h"
hw/ppc/spapr_drc.c +1 -0
@@ -23,6 +23,7 @@#include "hw/ppc/spapr.h" /* for RTAS return codes */ #include "hw/pci-host/spapr.h" /* spapr_phb_remove_pci_device_cb callback */ #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "trace.h" #define DRC_CONTAINER_PATH "/dr-connector"
hw/ppc/virtex_ml507.c +1 -0
@@ -32,6 +32,7 @@#include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "sysemu/device_tree.h" #include "hw/loader.h"
hw/riscv/riscv_hart.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h"
hw/s390x/ipl.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/error.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "sysemu/tcg.h" #include "cpu.h"
hw/s390x/s390-virtio-ccw.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/error-report.h" #include "qemu/option.h" #include "s390-pci-bus.h" +#include "sysemu/reset.h" #include "hw/s390x/storage-keys.h" #include "hw/s390x/storage-attributes.h" #include "hw/s390x/event-facility.h"
hw/sh4/r2d.c +1 -0
@@ -30,6 +30,7 @@#include "hw/sysbus.h" #include "hw/hw.h" #include "hw/sh4/sh.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/pci/pci.h"
hw/sparc/leon3.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h"
@@ -32,6 +33,7 @@#include "hw/ptimer.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/loader.h" #include "elf.h"
hw/sparc/sun4m.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h"
@@ -33,6 +34,7 @@#include "hw/timer/m48t59.h" #include "hw/sparc/sparc32_dma.h" #include "hw/block/fdc.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "net/net.h" #include "hw/boards.h"
hw/sparc64/sparc64.c +1 -0
@@ -28,6 +28,7 @@#include "hw/char/serial.h" #include "hw/sparc/sparc64.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "trace.h"
hw/timer/etraxfs_timer.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/module.h" #include "qemu/timer.h"
hw/timer/mc146818rtc.c +1 -0
@@ -31,6 +31,7 @@#include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/replay.h" +#include "sysemu/reset.h" #include "hw/timer/mc146818rtc.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h"
hw/tpm/tpm_ppi.c +0 -1
@@ -16,7 +16,6 @@#include "qapi/error.h" #include "cpu.h" #include "sysemu/memory_mapping.h" -#include "sysemu/reset.h" #include "migration/vmstate.h" #include "tpm_ppi.h" #include "trace.h"
hw/vfio/common.c +1 -0
@@ -34,6 +34,7 @@#include "qemu/range.h" #include "sysemu/balloon.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "trace.h" #include "qapi/error.h"
hw/watchdog/wdt_diag288.c +1 -0
@@ -12,6 +12,7 @@*/ #include "qemu/osdep.h" +#include "sysemu/reset.h" #include "sysemu/watchdog.h" #include "hw/sysbus.h" #include "qemu/timer.h"
hw/xtensa/sim.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h"
hw/xtensa/xtfpga.c +1 -0
@@ -41,6 +41,7 @@#include "hw/block/flash.h" #include "chardev/char.h" #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "bootparam.h"
target/i386/cpu.c +1 -0
@@ -26,6 +26,7 @@#include "cpu.h" #include "exec/exec-all.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "sysemu/hvf.h" #include "sysemu/cpus.h" #include "kvm_i386.h"
target/i386/hax-all.c +1 -0
@@ -30,6 +30,7 @@#include "qemu-common.h" #include "hax-i386.h" #include "sysemu/accel.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/main-loop.h" #include "hw/boards.h"
target/i386/kvm.c +1 -0
@@ -24,6 +24,7 @@#include "sysemu/sysemu.h" #include "sysemu/hw_accel.h" #include "sysemu/kvm_int.h" +#include "sysemu/reset.h" #include "kvm_i386.h" #include "hyperv.h" #include "hyperv-proto.h"
target/s390x/cpu.c +1 -0
@@ -26,6 +26,7 @@#include "internal.h" #include "kvm_s390x.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "qemu/timer.h" #include "qemu/error-report.h" #include "qemu/module.h"
vl.c +1 -0
@@ -30,6 +30,7 @@#include "qemu/cutils.h" #include "qemu/help_option.h" #include "qemu/uuid.h" +#include "sysemu/reset.h" #include "sysemu/seccomp.h" #include "sysemu/tcg.h"
Signature · 1 line
2.21.0
PATCH v4 9/29 Include migration/qemu-file-types.h a lot less
In reply to Markus ArmbrusterIn my "build everything" tree, changing migration/qemu-file-types.h triggers a recompile of some 2600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h).
The culprit is again hw/hw.h, which supposedly includes it for convenience.
Include migration/qemu-file-types.h only where it's needed. Touching it now recompiles less than 200 objects.
--- include/hw/hw.h | 1 - include/migration/cpu.h | 1 + hw/acpi/piix4.c | 1 + hw/block/virtio-blk.c | 1 + hw/char/virtio-serial-bus.c | 1 + hw/display/virtio-gpu.c | 1 + hw/intc/apic_common.c | 1 + hw/intc/s390_flic_kvm.c | 1 + hw/nvram/eeprom93xx.c | 1 + hw/nvram/fw_cfg.c | 1 + hw/pci-host/piix.c | 1 + hw/pci/msix.c | 1 + hw/pci/pci.c | 1 + hw/pci/shpc.c | 1 + hw/ppc/spapr.c | 1 + hw/s390x/s390-skeys.c | 1 + hw/s390x/tod.c | 1 + hw/s390x/virtio-ccw.c | 1 + hw/scsi/mptsas.c | 1 + hw/scsi/scsi-bus.c | 1 + hw/scsi/scsi-disk.c | 1 + hw/scsi/scsi-generic.c | 1 + hw/scsi/virtio-scsi.c | 1 + hw/timer/i8254_common.c | 1 + hw/timer/twl92230.c | 1 + hw/usb/redirect.c | 1 + hw/virtio/vhost.c | 1 + hw/virtio/virtio-mmio.c | 1 + hw/virtio/virtio-pci.c | 1 + hw/virtio/virtio.c | 1 + target/ppc/kvm.c | 1 + 31 files changed, 30 insertions(+), 1 deletion(-)
include/hw/hw.h +0 -1
@@ -11,7 +11,6 @@#include "exec/memory.h" #include "hw/irq.h" #include "migration/vmstate.h" -#include "migration/qemu-file-types.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
include/migration/cpu.h +1 -0
@@ -4,6 +4,7 @@#define MIGRATION_CPU_H #include "exec/cpu-defs.h" +#include "migration/qemu-file-types.h" #if TARGET_LONG_BITS ==64 #define qemu_put_betl qemu_put_be64
hw/acpi/piix4.c +1 -0
@@ -40,6 +40,7 @@#include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/xen/xen.h" +#include "migration/qemu-file-types.h" #include "qom/cpu.h" #include "trace.h"
hw/block/virtio-blk.c +1 -0
@@ -26,6 +26,7 @@# include <scsi/sg.h> #endif #include "hw/virtio/virtio-bus.h" +#include "migration/qemu-file-types.h" #include "hw/virtio/virtio-access.h" /* Config size before the discard support (hide associated config fields) */
hw/char/virtio-serial-bus.c +1 -0
@@ -22,6 +22,7 @@#include "qapi/error.h" #include "qemu/iov.h" #include "qemu/module.h" +#include "migration/qemu-file-types.h" #include "monitor/monitor.h" #include "qemu/error-report.h" #include "qemu/queue.h"
hw/display/virtio-gpu.c +1 -0
@@ -18,6 +18,7 @@#include "trace.h" #include "sysemu/dma.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "hw/virtio/virtio-gpu.h" #include "hw/virtio/virtio-gpu-bswap.h" #include "hw/virtio/virtio-gpu-pixman.h"
hw/intc/apic_common.c +1 -0
@@ -31,6 +31,7 @@#include "sysemu/kvm.h" #include "hw/qdev.h" #include "hw/sysbus.h" +#include "migration/qemu-file-types.h" static int apic_irq_delivered;bool apic_report_tpr_access;
hw/intc/s390_flic_kvm.c +1 -0
@@ -22,6 +22,7 @@#include "hw/s390x/s390_flic.h" #include "hw/s390x/adapter.h" #include "hw/s390x/css.h" +#include "migration/qemu-file-types.h" #include "trace.h" #define FLIC_SAVE_INITIAL_SIZE getpagesize()
hw/nvram/eeprom93xx.c +1 -0
@@ -38,6 +38,7 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/nvram/eeprom93xx.h" +#include "migration/qemu-file-types.h" /* Debug EEPROM emulation. */ //~ #define DEBUG_EEPROM
hw/nvram/fw_cfg.c +1 -0
@@ -31,6 +31,7 @@#include "hw/boards.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" +#include "migration/qemu-file-types.h" #include "trace.h" #include "qemu/error-report.h" #include "qemu/option.h"
hw/pci-host/piix.c +1 -0
@@ -32,6 +32,7 @@#include "qapi/error.h" #include "qemu/range.h" #include "hw/xen/xen.h" +#include "migration/qemu-file-types.h" #include "hw/pci-host/pam.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h"
hw/pci/msix.c +1 -0
@@ -20,6 +20,7 @@#include "hw/pci/msix.h" #include "hw/pci/pci.h" #include "hw/xen/xen.h" +#include "migration/qemu-file-types.h" #include "qemu/range.h" #include "qapi/error.h" #include "trace.h"
hw/pci/pci.c +1 -0
@@ -29,6 +29,7 @@#include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" +#include "migration/qemu-file-types.h" #include "monitor/monitor.h" #include "net/net.h" #include "sysemu/sysemu.h"
hw/pci/shpc.c +1 -0
@@ -4,6 +4,7 @@#include "qemu/range.h" #include "qemu/error-report.h" #include "hw/pci/shpc.h" +#include "migration/qemu-file-types.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/msi.h"
hw/ppc/spapr.c +1 -0
@@ -42,6 +42,7 @@#include "sysemu/hw_accel.h" #include "kvm_ppc.h" #include "migration/misc.h" +#include "migration/qemu-file-types.h" #include "migration/global_state.h" #include "migration/register.h" #include "mmu-hash64.h"
hw/s390x/s390-skeys.c +1 -0
@@ -18,6 +18,7 @@#include "qapi/qmp/qdict.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" +#include "migration/qemu-file-types.h" #include "migration/register.h" #define S390_SKEYS_BUFFER_SIZE (128 * KiB)/* Room for 128k storage keys */
hw/s390x/tod.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "sysemu/kvm.h" +#include "migration/qemu-file-types.h" #include "migration/register.h" void s390_init_tod (void )
hw/s390x/virtio-ccw.c +1 -0
@@ -17,6 +17,7 @@#include "sysemu/kvm.h" #include "net/net.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "hw/virtio/virtio-net.h" #include "hw/sysbus.h" #include "qemu/bitops.h"
hw/scsi/mptsas.c +1 -0
@@ -34,6 +34,7 @@#include "trace.h" #include "qapi/error.h" #include "mptsas.h" +#include "migration/qemu-file-types.h" #include "mpi.h" #define NAA_LOCALLY_ASSIGNED_ID 0x3ULL
hw/scsi/scsi-bus.c +1 -0
@@ -5,6 +5,7 @@#include "qemu/module.h" #include "qemu/option.h" #include "hw/scsi/scsi.h" +#include "migration/qemu-file-types.h" #include "scsi/constants.h" #include "hw/qdev.h" #include "sysemu/block-backend.h"
hw/scsi/scsi-disk.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" +#include "migration/qemu-file-types.h" #include "hw/scsi/emulation.h" #include "scsi/constants.h" #include "sysemu/sysemu.h"
hw/scsi/scsi-generic.c +1 -0
@@ -17,6 +17,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" +#include "migration/qemu-file-types.h" #include "hw/scsi/emulation.h" #include "sysemu/block-backend.h" #include "trace.h"
hw/scsi/virtio-scsi.c +1 -0
@@ -17,6 +17,7 @@#include "qapi/error.h" #include "standard-headers/linux/virtio_ids.h" #include "hw/virtio/virtio-scsi.h" +#include "migration/qemu-file-types.h" #include "qemu/error-report.h" #include "qemu/iov.h" #include "qemu/module.h"
hw/timer/i8254_common.c +1 -0
@@ -30,6 +30,7 @@#include "qemu/timer.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" +#include "migration/qemu-file-types.h" /* val must be 0 or 1 */ void pit_set_gate (ISADevice *dev,int channel,int val)
hw/timer/twl92230.c +1 -0
@@ -24,6 +24,7 @@#include "hw/hw.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" +#include "migration/qemu-file-types.h" #include "sysemu/sysemu.h" #include "ui/console.h" #include "qemu/bcd.h"
hw/usb/redirect.c +1 -0
@@ -41,6 +41,7 @@#include <usbredirfilter.h> #include "hw/usb.h" +#include "migration/qemu-file-types.h" /* ERROR is defined below. Remove any previous definition. */ #undef ERROR
hw/virtio/vhost.c +1 -0
@@ -26,6 +26,7 @@#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" #include "migration/blocker.h" +#include "migration/qemu-file-types.h" #include "sysemu/dma.h" #include "trace.h"
hw/virtio/virtio-mmio.c +1 -0
@@ -23,6 +23,7 @@#include "standard-headers/linux/virtio_mmio.h" #include "hw/sysbus.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "qemu/host-utils.h" #include "qemu/module.h" #include "sysemu/kvm.h"
hw/virtio/virtio-pci.c +1 -0
@@ -19,6 +19,7 @@#include "standard-headers/linux/virtio_pci.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "qapi/error.h"
hw/virtio/virtio.c +1 -0
@@ -19,6 +19,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h"
target/ppc/kvm.c +1 -0
@@ -38,6 +38,7 @@#include "hw/ppc/spapr.h" #include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/ppc.h" +#include "migration/qemu-file-types.h" #include "sysemu/watchdog.h" #include "trace.h" #include "exec/gdbstub.h"
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH v4 09/29] Include migration/qemu-file-types.h a lot less
Quoted 11 lines · Markus Armbruster
In my "build everything" tree, changing
migration/qemu-file-types.htriggers a recompile of some 2600 out of 6600 objects (not counting tests and objects that don't depend onqemu/osdep.h).The culprit is again
hw/hw.h, which supposedly includes it for convenience.Include
migration/qemu-file-types.honly where it's needed. Touching it now recompiles less than 200 objects.Signed-off-by Markus Armbruster <[email protected]>
Quoted 33 lines
--- include/hw/hw.h | 1 - include/migration/cpu.h | 1 + hw/acpi/piix4.c | 1 + hw/block/virtio-blk.c | 1 + hw/char/virtio-serial-bus.c | 1 + hw/display/virtio-gpu.c | 1 + hw/intc/apic_common.c | 1 + hw/intc/s390_flic_kvm.c | 1 + hw/nvram/eeprom93xx.c | 1 + hw/nvram/fw_cfg.c | 1 + hw/pci-host/piix.c | 1 + hw/pci/msix.c | 1 + hw/pci/pci.c | 1 + hw/pci/shpc.c | 1 + hw/ppc/spapr.c | 1 + hw/s390x/s390-skeys.c | 1 + hw/s390x/tod.c | 1 + hw/s390x/virtio-ccw.c | 1 + hw/scsi/mptsas.c | 1 + hw/scsi/scsi-bus.c | 1 + hw/scsi/scsi-disk.c | 1 + hw/scsi/scsi-generic.c | 1 + hw/scsi/virtio-scsi.c | 1 + hw/timer/i8254_common.c | 1 + hw/timer/twl92230.c | 1 + hw/usb/redirect.c | 1 + hw/virtio/vhost.c | 1 + hw/virtio/virtio-mmio.c | 1 + hw/virtio/virtio-pci.c | 1 + hw/virtio/virtio.c | 1 + target/ppc/kvm.c | 1 + 31 files changed, 30 insertions(+), 1 deletion(-)
PATCH v4 10/29 ide: Include hw/ide/internal a bit less outside hw/ide/
In reply to Markus ArmbrusterAccording to hw/ide/internal's file comment, only files in hw/ide/ are supposed to include it. Drag reality slightly closer to supposition.
Three includes outside hw/ide remain: hw/arm/sbsa-ref.c, include/hw/ide/pci.h, and include/hw/misc/macio/macio.h. Turns out board code needs ide-internal.h to wire up IDE stuff. More cleanup is needed. Left for another day.
--- hw/ide/ahci_internal.h | 1 + hw/ppc/mac.h | 1 - include/hw/arm/allwinner-a10.h | 1 - include/hw/arm/xlnx-zynqmp.h | 1 - include/hw/misc/mos6522.h | 1 - hw/arm/allwinner-a10.c | 1 + hw/arm/cubieboard.c | 1 + hw/arm/xlnx-zynqmp.c | 1 + 8 files changed, 4 insertions(+), 4 deletions(-)
hw/ide/ahci_internal.h +1 -0
@@ -25,6 +25,7 @@#define HW_IDE_AHCI_INTERNAL_H #include "hw/ide/ahci.h" +#include "hw/ide/internal.h" #include "hw/sysbus.h" #define AHCI_MEM_BAR_SIZE 0x1000
hw/ppc/mac.h +0 -1
@@ -30,7 +30,6 @@#include "exec/memory.h" #include "hw/boards.h" #include "hw/sysbus.h" -#include "hw/ide/internal.h" #include "hw/input/adb.h" #include "hw/misc/mos6522.h" #include "hw/pci/pci_host.h"
include/hw/arm/allwinner-a10.h +0 -1
@@ -7,7 +7,6 @@#include "hw/timer/allwinner-a10-pit.h" #include "hw/intc/allwinner-a10-pic.h" #include "hw/net/allwinner_emac.h" -#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "sysemu/sysemu.h"
include/hw/arm/xlnx-zynqmp.h +0 -1
@@ -22,7 +22,6 @@#include "hw/intc/arm_gic.h" #include "hw/net/cadence_gem.h" #include "hw/char/cadence_uart.h" -#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/sd/sdhci.h" #include "hw/ssi/xilinx_spips.h"
include/hw/misc/mos6522.h +0 -1
@@ -29,7 +29,6 @@#include "exec/memory.h" #include "hw/sysbus.h" -#include "hw/ide/internal.h" #include "hw/input/adb.h" /* Bits in ACR */
hw/arm/allwinner-a10.c +1 -0
@@ -16,6 +16,7 @@*/ #include "qemu/osdep.h" +#include "exec/address-spaces.h" #include "qapi/error.h" #include "qemu/module.h" #include "cpu.h"
hw/arm/cubieboard.c +1 -0
@@ -16,6 +16,7 @@*/ #include "qemu/osdep.h" +#include "exec/address-spaces.h" #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h"
hw/arm/xlnx-zynqmp.c +1 -0
@@ -24,6 +24,7 @@#include "hw/boards.h" #include "exec/address-spaces.h" #include "sysemu/kvm.h" +#include "sysemu/sysemu.h" #include "kvm_arm.h" #define GIC_NUM_SPI_INTR 160
Signature · 1 line
2.21.0
PATCH v4 11/29 typedefs: Separate incomplete types and function types
In reply to Markus ArmbrusterWhile there, drop the obsolete file comment.
--- include/qemu/typedefs.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
include/qemu/typedefs.h +8 -4
@@ -1,10 +1,10 @@#ifndef QEMU_TYPEDEFS_H #define QEMU_TYPEDEFS_H -/* A load of opaque types so that device init declarations don't have to -pull in all the real definitions. */ - -/* Please keep this list in case-insensitive alphabetical order */ +/* +* Incomplete struct types +* Please keep this list in case-insensitive alphabetical order. +*/ typedef struct AdapterInfo AdapterInfo ;typedef struct AddressSpace AddressSpace ;typedef struct AioContext AioContext ;
@@ -101,6 +101,10 @@ typedef struct SHPCDevice SHPCDevice;typedef struct SSIBus SSIBus ;typedef struct VirtIODevice VirtIODevice ;typedef struct Visitor Visitor ; + +/* +* Function types +*/ typedef void SaveStateHandler (QEMUFile *f,void *opaque);typedef int LoadStateHandler (QEMUFile *f,void *opaque,int version_id);
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH v4 11/29] typedefs: Separate incomplete types and function types
Quoted 14 lines · Markus Armbruster
While there, drop the obsolete file comment.
Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>--- include/qemu/typedefs.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)include/qemu/typedefs.h +0
-0
include/qemu/typedefs.h line 5
Quoted 9 lines
include/qemu/typedefs.h +2
-4@@ -1,10 +1,10 @@#ifndef QEMU_TYPEDEFS_H #define QEMU_TYPEDEFS_H -/* A load of opaque types so that device init declarations don't have to -pull in all the real definitions. */ - -/* Please keep this list in case-insensitive alphabetical order */ +/* +* Incomplete struct types
Maybe expand this a little...
"Incomplete struct types for modules that don't need the complete definitions but still pass around typed variables."?
Otherwise:
Quoted 6 lines
include/qemu/typedefs.h +2
-0+* Please keep this list in case-insensitive alphabetical order. +*/ typedef struct AdapterInfo AdapterInfo ;typedef struct AddressSpace AddressSpace ;typedef struct AioContext AioContext ;
include/qemu/typedefs.h typedef struct SHPCDevice SHPCDevice; · line 109
Quoted 9 lines
include/qemu/typedefs.h +4
-0@@ -101,6 +101,10 @@ typedef struct SHPCDevice SHPCDevice;typedef struct SSIBus SSIBus ;typedef struct VirtIODevice VirtIODevice ;typedef struct Visitor Visitor ; + +/* +* Function types +*/ typedef void SaveStateHandler (QEMUFile *f,void *opaque);typedef int LoadStateHandler (QEMUFile *f,void *opaque,int version_id);
--
Alex Bennée
Re: [Qemu-devel] [PATCH v4 11/29] typedefs: Separate incomplete types and function types
Quoted 28 lines · Alex Bennée
Quoted 14 lines · Markus Armbruster
While there, drop the obsolete file comment.
Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>--- include/qemu/typedefs.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)include/qemu/typedefs.h +0
-0include/qemu/typedefs.h line 5
Quoted 9 lines
include/qemu/typedefs.h +2
-4@@ -1,10 +1,10 @@#ifndef QEMU_TYPEDEFS_H #define QEMU_TYPEDEFS_H -/* A load of opaque types so that device init declarations don't have to -pull in all the real definitions. */ - -/* Please keep this list in case-insensitive alphabetical order */ +/* +* Incomplete struct types Maybe expand this a little...
Quoted 2 lines
"Incomplete struct types for modules that don't need the complete definitions but still pass around typed variables."?
If we explain proper use of qemu/typedefs.h in HACKING, as discussed in review of v1[*], we could point there.
Quoted 3 lines
Otherwise:
Reviewed-by Alex Bennée <[email protected]>
Thanks!
Quoted 19 lines
Quoted 6 lines
include/qemu/typedefs.h +2
-0+* Please keep this list in case-insensitive alphabetical order. +*/ typedef struct AdapterInfo AdapterInfo ;typedef struct AddressSpace AddressSpace ;typedef struct AioContext AioContext ;include/qemu/typedefs.h typedef struct SHPCDevice SHPCDevice; · line 109
Quoted 9 lines
include/qemu/typedefs.h +4
-0@@ -101,6 +101,10 @@ typedef struct SHPCDevice SHPCDevice;typedef struct SSIBus SSIBus ;typedef struct VirtIODevice VirtIODevice ;typedef struct Visitor Visitor ; + +/* +* Function types +*/ typedef void SaveStateHandler (QEMUFile *f,void *opaque);typedef int LoadStateHandler (QEMUFile *f,void *opaque,int version_id);--
Alex Bennée
Re: [Qemu-devel] [PATCH v4 11/29] typedefs: Separate incomplete types and function types
Quoted 30 lines · Markus Armbruster
Quoted 28 lines · Alex Bennée
Quoted 14 lines · Markus Armbruster
While there, drop the obsolete file comment.
Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>--- include/qemu/typedefs.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)include/qemu/typedefs.h +0
-0include/qemu/typedefs.h line 5
Quoted 9 lines
include/qemu/typedefs.h +2
-4@@ -1,10 +1,10 @@#ifndef QEMU_TYPEDEFS_H #define QEMU_TYPEDEFS_H -/* A load of opaque types so that device init declarations don't have to -pull in all the real definitions. */ - -/* Please keep this list in case-insensitive alphabetical order */ +/* +* Incomplete struct types Maybe expand this a little...
Quoted 5 lines
Quoted 2 lines
"Incomplete struct types for modules that don't need the complete definitions but still pass around typed variables."?
If we explain proper use of
qemu/typedefs.hin HACKING, as discussed in review of v1[*], we could point there.
Perhaps rewriting the obsolete file comment would be better. Something like this:
/*
* This header is for selectively avoiding #include just to get a
* typedef name.
*
* Declaring a typedef name in its "obvious" place can result in
* inclusion cycles, in particular for complete struct and union
* types that need more types for their members. It can also result
* in headers pulling in many more headers, slowing down builds. *
* You can break such cycles and unwanted dependencies by declaring
* the typedef name here.
*
* For struct types used in only a few headers, judicious use of the
* struct tag instead of the typedef name is commonly preferable. */
/*
* Incomplete struct types
* Please keep this list in case-insensitive alphabetical order. */
typedef struct AdapterInfo AdapterInfo;
[...]
/*
* Pointer types
* Such typedefs should be limited to cases where the typedef's users
* are oblivious of its "pointer-ness".
* Please keep this list in case-insensitive alphabetical order. */
typedef struct IRQState *qemu_irq;
/*
* Function types
*/
typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); typedef void (*qemu_irq_handler)(void *opaque, int n, int level);
What do you think?
[...]
Re: [Qemu-devel] [PATCH v4 11/29] typedefs: Separate incomplete types and function types
Quoted 72 lines · Markus Armbruster
Quoted 30 lines · Markus Armbruster
Quoted 28 lines · Alex Bennée
Quoted 14 lines · Markus Armbruster
While there, drop the obsolete file comment.
Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>--- include/qemu/typedefs.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)include/qemu/typedefs.h +0
-0include/qemu/typedefs.h line 5
Quoted 9 lines
include/qemu/typedefs.h +2
-4@@ -1,10 +1,10 @@#ifndef QEMU_TYPEDEFS_H #define QEMU_TYPEDEFS_H -/* A load of opaque types so that device init declarations don't have to -pull in all the real definitions. */ - -/* Please keep this list in case-insensitive alphabetical order */ +/* +* Incomplete struct types Maybe expand this a little...
Quoted 5 lines
Quoted 2 lines
"Incomplete struct types for modules that don't need the complete definitions but still pass around typed variables."?
If we explain proper use of
qemu/typedefs.hin HACKING, as discussed in review of v1[*], we could point there.Perhaps rewriting the obsolete file comment would be better. Something like this:
/*
* This header is for selectively avoiding #include just to get a
* typedef name.
*
* Declaring a typedef name in its "obvious" place can result in
* inclusion cycles, in particular for complete struct and union
* types that need more types for their members. It can also result
* in headers pulling in many more headers, slowing down builds. *
* You can break such cycles and unwanted dependencies by declaring
* the typedef name here.
*
* For struct types used in only a few headers, judicious use of the
* struct tag instead of the typedef name is commonly preferable. *//*
* Incomplete struct types
* Please keep this list in case-insensitive alphabetical order. */
typedef struct AdapterInfo AdapterInfo;
[...]/*
* Pointer types
* Such typedefs should be limited to cases where the typedef's users
* are oblivious of its "pointer-ness".
* Please keep this list in case-insensitive alphabetical order. */
typedef struct IRQState*qemu_irq;
Quoted 8 lines
/*
* Function types
*/
typedef voidSaveStateHandler(QEMUFile *f, void *opaque); typedef intLoadStateHandler(QEMUFile *f, void *opaque, int version_id); typedef void (*qemu_irq_handler)(void *opaque, int n, int level);What do you think?
A definite improvement on what is currently there ;-)
Quoted 2 lines
[...]
--
Alex Bennée
Re: [Qemu-devel] [PATCH v4 11/29] typedefs: Separate incomplete types and function types
Quoted 81 lines · Alex Bennée
Quoted 79 lines · Markus Armbruster
Quoted 30 lines · Markus Armbruster
Quoted 28 lines · Alex Bennée
Quoted 14 lines · Markus Armbruster
While there, drop the obsolete file comment.
Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>--- include/qemu/typedefs.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)include/qemu/typedefs.h +0
-0include/qemu/typedefs.h line 5
Quoted 9 lines
include/qemu/typedefs.h +2
-4@@ -1,10 +1,10 @@#ifndef QEMU_TYPEDEFS_H #define QEMU_TYPEDEFS_H -/* A load of opaque types so that device init declarations don't have to -pull in all the real definitions. */ - -/* Please keep this list in case-insensitive alphabetical order */ +/* +* Incomplete struct types Maybe expand this a little...
Quoted 5 lines
Quoted 2 lines
"Incomplete struct types for modules that don't need the complete definitions but still pass around typed variables."?
If we explain proper use of
qemu/typedefs.hin HACKING, as discussed in review of v1[*], we could point there.Perhaps rewriting the obsolete file comment would be better. Something like this:
/*
* This header is for selectively avoiding #include just to get a
* typedef name.
*
* Declaring a typedef name in its "obvious" place can result in
* inclusion cycles, in particular for complete struct and union
* types that need more types for their members. It can also result
* in headers pulling in many more headers, slowing down builds. *
* You can break such cycles and unwanted dependencies by declaring
* the typedef name here.
*
* For struct types used in only a few headers, judicious use of the
* struct tag instead of the typedef name is commonly preferable. *//*
* Incomplete struct types
* Please keep this list in case-insensitive alphabetical order. */
typedef struct AdapterInfo AdapterInfo;
[...]/*
* Pointer types
* Such typedefs should be limited to cases where the typedef's users
* are oblivious of its "pointer-ness".
* Please keep this list in case-insensitive alphabetical order. */
typedef struct IRQState*qemu_irq;/*
* Function types
*/
typedef voidSaveStateHandler(QEMUFile *f, void *opaque); typedef intLoadStateHandler(QEMUFile *f, void *opaque, int version_id); typedef void (*qemu_irq_handler)(void *opaque, int n, int level);
Quoted 3 lines
Quoted 1 line
What do you think?
A definite improvement on what is currently there ;-)
Amending my commit. Thanks!
PATCH v4 12/29 Include hw/irq.h a lot less
In reply to Markus ArmbrusterIn my "build everything" tree, changing hw/irq.h triggers a recompile of some 5400 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h).
hw/hw.h supposedly includes it for convenience. Several other headers include it just to get qemu_irq and.or qemu_irq_handler.
Move the qemu_irq and qemu_irq_handler typedefs from hw/irq.h to qemu/typedefs.h, and then include hw/irq.h only where it's still needed. Touching it now recompiles only some 500 objects.
--- hw/alpha/alpha_sys.h | 1 - hw/hppa/hppa_sys.h | 1 - include/hw/acpi/acpi.h | 1 - include/hw/arm/boot.h | 1 - include/hw/arm/omap.h | 1 - include/hw/arm/soc_dma.h | 1 - include/hw/block/fdc.h | 1 - include/hw/bt.h | 1 - include/hw/core/split-irq.h | 1 - include/hw/cris/etraxfs_dma.h | 1 - include/hw/display/blizzard.h | 1 - include/hw/display/tc6393xb.h | 1 - include/hw/hw.h | 1 - include/hw/ide/internal.h | 1 + include/hw/input/gamepad.h | 1 - include/hw/input/tsc2xxx.h | 1 - include/hw/irq.h | 4 ---- include/hw/isa/vt82c686.h | 1 - include/hw/mips/mips.h | 1 - include/hw/misc/cbus.h | 1 - include/hw/net/lan9118.h | 1 - include/hw/net/smc91c111.h | 1 - include/hw/or-irq.h | 1 - include/hw/ppc/spapr_irq.h | 1 - include/hw/qdev-core.h | 1 - include/hw/sh4/sh_intc.h | 1 - include/hw/timer/m48t59.h | 1 - include/hw/tricore/tricore.h | 1 - include/hw/vfio/vfio-platform.h | 1 - include/hw/xen/xen.h | 1 - include/hw/xtensa/mx_pic.h | 1 - include/qemu/typedefs.h | 9 +++++++++ include/sysemu/kvm.h | 1 - hw/acpi/core.c | 1 + hw/acpi/piix4.c | 1 + hw/alpha/typhoon.c | 1 + hw/arm/armsse.c | 1 + hw/arm/exynos4210.c | 1 + hw/arm/exynos4_boards.c | 1 + hw/arm/integratorcp.c | 1 + hw/arm/msf2-soc.c | 1 + hw/arm/musicpal.c | 1 + hw/arm/omap1.c | 1 + hw/arm/omap2.c | 1 + hw/arm/palm.c | 2 ++ hw/arm/pxa2xx.c | 1 + hw/arm/pxa2xx_gpio.c | 1 + hw/arm/realview.c | 1 + hw/arm/smmuv3.c | 1 + hw/arm/spitz.c | 1 + hw/arm/stellaris.c | 1 + hw/arm/strongarm.c | 1 + hw/arm/tosa.c | 1 + hw/arm/versatilepb.c | 1 + hw/arm/virt.c | 1 + hw/arm/z2.c | 1 + hw/audio/cs4231a.c | 1 + hw/audio/gus.c | 1 + hw/audio/marvell_88w8618.c | 1 + hw/audio/milkymist-ac97.c | 1 + hw/audio/pl041.c | 1 + hw/audio/sb16.c | 1 + hw/block/fdc.c | 1 + hw/char/bcm2835_aux.c | 1 + hw/char/cadence_uart.c | 1 + hw/char/cmsdk-apb-uart.c | 1 + hw/char/escc.c | 1 + hw/char/etraxfs_ser.c | 1 + hw/char/exynos4210_uart.c | 1 + hw/char/grlib_apbuart.c | 1 + hw/char/imx_serial.c | 1 + hw/char/ipoctal232.c | 1 + hw/char/lm32_uart.c | 1 + hw/char/mcf_uart.c | 1 + hw/char/milkymist-uart.c | 1 + hw/char/nrf51_uart.c | 1 + hw/char/parallel.c | 1 + hw/char/pl011.c | 1 + hw/char/serial-pci-multi.c | 1 + hw/char/serial-pci.c | 1 + hw/char/serial.c | 1 + hw/char/sh_serial.c | 2 ++ hw/char/spapr_vty.c | 1 + hw/char/stm32f2xx_usart.c | 1 + hw/char/xilinx_uartlite.c | 1 + hw/core/or-irq.c | 1 + hw/core/qdev.c | 1 + hw/core/split-irq.c | 1 + hw/cpu/a15mpcore.c | 1 + hw/cpu/a9mpcore.c | 1 + hw/cpu/arm11mpcore.c | 1 + hw/cpu/realview_mpcore.c | 1 + hw/display/ads7846.c | 1 + hw/display/bcm2835_fb.c | 1 + hw/display/cg3.c | 1 + hw/display/exynos4210_fimd.c | 1 + hw/display/g364fb.c | 1 + hw/display/milkymist-tmu2.c | 1 + hw/display/omap_dss.c | 2 ++ hw/display/omap_lcdc.c | 2 ++ hw/display/pl110.c | 1 + hw/display/pxa2xx_lcd.c | 1 + hw/display/tc6393xb.c | 2 ++ hw/display/xlnx_dp.c | 1 + hw/dma/bcm2835_dma.c | 1 + hw/dma/etraxfs_dma.c | 2 ++ hw/dma/pl080.c | 1 + hw/dma/pl330.c | 1 + hw/dma/pxa2xx_dma.c | 1 + hw/dma/rc4030.c | 1 + hw/dma/sparc32_dma.c | 1 + hw/dma/xilinx_axidma.c | 1 + hw/dma/xlnx-zdma.c | 1 + hw/dma/xlnx-zynq-devcfg.c | 1 + hw/dma/xlnx_dpdma.c | 1 + hw/gpio/bcm2835_gpio.c | 1 + hw/gpio/gpio_key.c | 1 + hw/gpio/imx_gpio.c | 1 + hw/gpio/max7310.c | 1 + hw/gpio/mpc8xxx.c | 1 + hw/gpio/nrf51_gpio.c | 1 + hw/gpio/omap_gpio.c | 1 + hw/gpio/pl061.c | 1 + hw/gpio/zaurus.c | 1 + hw/hppa/dino.c | 1 + hw/i2c/aspeed_i2c.c | 1 + hw/i2c/bitbang_i2c.c | 1 + hw/i2c/exynos4210_i2c.c | 1 + hw/i2c/imx_i2c.c | 1 + hw/i2c/mpc_i2c.c | 1 + hw/i2c/omap_i2c.c | 1 + hw/i2c/ppc4xx_i2c.c | 1 + hw/i386/kvm/i8259.c | 1 + hw/i386/kvm/ioapic.c | 1 + hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 1 + hw/i386/xen/xen-hvm.c | 1 + hw/input/lm832x.c | 1 + hw/input/milkymist-softusb.c | 1 + hw/input/pckbd.c | 1 + hw/input/pl050.c | 1 + hw/input/pxa2xx_keypad.c | 1 + hw/input/stellaris_input.c | 2 ++ hw/input/tsc2005.c | 1 + hw/input/tsc210x.c | 1 + hw/intc/allwinner-a10-pic.c | 1 + hw/intc/arm_gic.c | 1 + hw/intc/arm_gicv2m.c | 1 + hw/intc/arm_gicv3_cpuif.c | 1 + hw/intc/armv7m_nvic.c | 1 + hw/intc/aspeed_vic.c | 1 + hw/intc/bcm2835_ic.c | 1 + hw/intc/bcm2836_control.c | 1 + hw/intc/etraxfs_pic.c | 1 + hw/intc/exynos4210_combiner.c | 1 + hw/intc/heathrow_pic.c | 1 + hw/intc/i8259.c | 2 ++ hw/intc/imx_avic.c | 1 + hw/intc/lm32_pic.c | 1 + hw/intc/mips_gic.c | 1 + hw/intc/nios2_iic.c | 1 + hw/intc/omap_intc.c | 1 + hw/intc/ompic.c | 1 + hw/intc/openpic.c | 1 + hw/intc/pl190.c | 1 + hw/intc/puv3_intc.c | 1 + hw/intc/realview_gic.c | 1 + hw/intc/sh_intc.c | 1 + hw/intc/slavio_intctl.c | 1 + hw/intc/xics.c | 1 + hw/intc/xilinx_intc.c | 1 + hw/intc/xive.c | 1 + hw/intc/xlnx-pmu-iomod-intc.c | 1 + hw/intc/xlnx-zynqmp-ipi.c | 1 + hw/ipack/ipack.c | 1 + hw/ipack/tpci200.c | 1 + hw/ipmi/isa_ipmi_bt.c | 1 + hw/ipmi/isa_ipmi_kcs.c | 1 + hw/isa/i82378.c | 1 + hw/isa/lpc_ich9.c | 2 ++ hw/lm32/lm32_boards.c | 1 + hw/lm32/milkymist.c | 1 + hw/m68k/mcf5206.c | 2 ++ hw/m68k/mcf5208.c | 2 ++ hw/m68k/mcf_intc.c | 1 + hw/mips/gt64xxx_pci.c | 1 + hw/mips/mips_int.c | 1 + hw/mips/mips_malta.c | 1 + hw/misc/arm_sysctl.c | 1 + hw/misc/armsse-mhu.c | 1 + hw/misc/aspeed_xdma.c | 1 + hw/misc/bcm2835_mbox.c | 1 + hw/misc/bcm2835_property.c | 1 + hw/misc/eccmemctl.c | 1 + hw/misc/iotkit-secctl.c | 1 + hw/misc/macio/mac_dbdma.c | 1 + hw/misc/macio/pmu.c | 1 + hw/misc/max111x.c | 1 + hw/misc/milkymist-pfpu.c | 1 + hw/misc/mos6522.c | 1 + hw/misc/mst_fpga.c | 1 + hw/misc/nrf51_rng.c | 1 + hw/misc/omap_clk.c | 2 ++ hw/misc/omap_gpmc.c | 2 ++ hw/misc/pc-testdev.c | 1 + hw/misc/slavio_misc.c | 1 + hw/misc/tmp105.c | 1 + hw/misc/tz-mpc.c | 1 + hw/misc/tz-msc.c | 1 + hw/misc/tz-ppc.c | 1 + hw/misc/zynq-xadc.c | 1 + hw/net/allwinner_emac.c | 1 + hw/net/cadence_gem.c | 1 + hw/net/can/can_kvaser_pci.c | 1 + hw/net/can/can_mioe3680_pci.c | 1 + hw/net/can/can_pcm3680_pci.c | 1 + hw/net/can/can_sja1000.c | 2 ++ hw/net/dp8393x.c | 1 + hw/net/fsl_etsec/etsec.c | 1 + hw/net/ftgmac100.c | 1 + hw/net/imx_fec.c | 1 + hw/net/lan9118.c | 1 + hw/net/mcf_fec.c | 1 + hw/net/milkymist-minimac2.c | 1 + hw/net/mipsnet.c | 1 + hw/net/ne2000-pci.c | 2 ++ hw/net/ne2000.c | 1 + hw/net/opencores_eth.c | 1 + hw/net/pcnet-pci.c | 1 + hw/net/pcnet.c | 1 + hw/net/smc91c111.c | 1 + hw/net/spapr_llan.c | 1 + hw/net/stellaris_enet.c | 1 + hw/net/xgmac.c | 1 + hw/net/xilinx_axienet.c | 1 + hw/net/xilinx_ethlite.c | 1 + hw/nios2/cpu_pic.c | 1 + hw/openrisc/openrisc_sim.c | 1 + hw/openrisc/pic_cpu.c | 1 + hw/pci-host/bonito.c | 1 + hw/pci-host/designware.c | 1 + hw/pci-host/gpex.c | 1 + hw/pci-host/grackle.c | 1 + hw/pci-host/piix.c | 1 + hw/pci-host/ppce500.c | 1 + hw/pci-host/prep.c | 1 + hw/pci-host/sabre.c | 1 + hw/pci-host/uninorth.c | 1 + hw/pci-host/versatile.c | 1 + hw/pci-host/xilinx-pcie.c | 1 + hw/pci/pci.c | 1 + hw/pcmcia/pxa2xx.c | 1 + hw/ppc/e500.c | 1 + hw/ppc/pnv_lpc.c | 1 + hw/ppc/pnv_psi.c | 1 + hw/ppc/ppc.c | 2 ++ hw/ppc/ppc405_uc.c | 1 + hw/ppc/ppc440_pcix.c | 1 + hw/ppc/ppc440_uc.c | 1 + hw/ppc/ppc4xx_devs.c | 1 + hw/ppc/ppc4xx_pci.c | 1 + hw/ppc/prep.c | 1 + hw/ppc/prep_systemio.c | 1 + hw/ppc/spapr_events.c | 2 ++ hw/ppc/spapr_irq.c | 1 + hw/ppc/spapr_pci.c | 1 + hw/ppc/spapr_vio.c | 1 + hw/riscv/sifive_gpio.c | 1 + hw/riscv/sifive_uart.c | 1 + hw/scsi/esp-pci.c | 1 + hw/scsi/esp.c | 1 + hw/scsi/lsi53c895a.c | 1 + hw/sd/bcm2835_sdhost.c | 1 + hw/sd/omap_mmc.c | 2 ++ hw/sd/pl181.c | 1 + hw/sd/pxa2xx_mmci.c | 1 + hw/sd/sd.c | 1 + hw/sd/sdhci.c | 1 + hw/sh4/r2d.c | 1 + hw/sh4/sh7750.c | 2 ++ hw/sh4/sh_pci.c | 1 + hw/sparc/leon3.c | 1 + hw/sparc/sun4m.c | 1 + hw/sparc/sun4m_iommu.c | 1 + hw/ssi/aspeed_smc.c | 1 + hw/ssi/imx_spi.c | 1 + hw/ssi/mss-spi.c | 1 + hw/ssi/omap_spi.c | 2 ++ hw/ssi/pl022.c | 1 + hw/ssi/xilinx_spi.c | 1 + hw/ssi/xilinx_spips.c | 1 + hw/timer/a9gtimer.c | 1 + hw/timer/allwinner-a10-pit.c | 1 + hw/timer/altera_timer.c | 1 + hw/timer/arm_mptimer.c | 1 + hw/timer/arm_timer.c | 1 + hw/timer/armv7m_systick.c | 1 + hw/timer/aspeed_timer.c | 1 + hw/timer/cadence_ttc.c | 1 + hw/timer/cmsdk-apb-dualtimer.c | 1 + hw/timer/cmsdk-apb-timer.c | 1 + hw/timer/etraxfs_timer.c | 1 + hw/timer/exynos4210_mct.c | 1 + hw/timer/exynos4210_pwm.c | 1 + hw/timer/exynos4210_rtc.c | 1 + hw/timer/grlib_gptimer.c | 1 + hw/timer/hpet.c | 1 + hw/timer/i8254.c | 1 + hw/timer/imx_epit.c | 1 + hw/timer/imx_gpt.c | 1 + hw/timer/lm32_timer.c | 1 + hw/timer/m48t59.c | 1 + hw/timer/mc146818rtc.c | 1 + hw/timer/milkymist-sysctl.c | 1 + hw/timer/mss-timer.c | 1 + hw/timer/nrf51_timer.c | 1 + hw/timer/omap_gptimer.c | 2 ++ hw/timer/pl031.c | 1 + hw/timer/puv3_ost.c | 1 + hw/timer/pxa2xx_timer.c | 1 + hw/timer/sh_timer.c | 1 + hw/timer/slavio_timer.c | 1 + hw/timer/stm32f2xx_timer.c | 1 + hw/timer/twl92230.c | 1 + hw/timer/xilinx_timer.c | 1 + hw/timer/xlnx-zynqmp-rtc.c | 1 + hw/tpm/tpm_tis.c | 1 + hw/unicore32/puv3.c | 1 + hw/usb/hcd-ehci.c | 1 + hw/usb/hcd-ohci.c | 1 + hw/vfio/platform.c | 1 + hw/virtio/virtio-mmio.c | 1 + hw/watchdog/cmsdk-apb-watchdog.c | 1 + hw/xtensa/mx_pic.c | 1 + hw/xtensa/pic_cpu.c | 1 + target/arm/helper.c | 1 + target/arm/kvm.c | 1 + target/mips/cp0_timer.c | 1 + 338 files changed, 336 insertions(+), 34 deletions(-)
hw/alpha/alpha_sys.h +0 -1
@@ -8,7 +8,6 @@#include "hw/pci/pci_host.h" #include "hw/ide.h" #include "hw/i386/pc.h" -#include "hw/irq.h" PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *, AlphaCPU *[4],
hw/hppa/hppa_sys.h +0 -1
@@ -7,7 +7,6 @@#include "hw/pci/pci_host.h" #include "hw/ide.h" #include "hw/i386/pc.h" -#include "hw/irq.h" #include "hppa_hardware.h"
include/hw/acpi/acpi.h +0 -1
@@ -22,7 +22,6 @@#include "qemu/notify.h" #include "exec/memory.h" -#include "hw/irq.h" #include "hw/acpi/acpi_dev_interface.h" /*
include/hw/arm/boot.h +0 -1
@@ -13,7 +13,6 @@#include "exec/memory.h" #include "target/arm/cpu-qom.h" -#include "hw/irq.h" #include "qemu/notify.h" typedef enum {
include/hw/arm/omap.h +0 -1
@@ -21,7 +21,6 @@#define HW_ARM_OMAP_H #include "exec/memory.h" -#include "hw/irq.h" #include "hw/input/tsc2xxx.h" #include "target/arm/cpu-qom.h" #include "qemu/log.h"
include/hw/arm/soc_dma.h +0 -1
@@ -22,7 +22,6 @@#define HW_SOC_DMA_H #include "exec/memory.h" -#include "hw/irq.h" struct soc_dma_s ;struct soc_dma_ch_s ;
include/hw/block/fdc.h +0 -1
@@ -2,7 +2,6 @@#define HW_FDC_H #include "exec/hwaddr.h" -#include "hw/irq.h" #include "qapi/qapi-types-block.h" /* fdc.c */
include/hw/bt.h +0 -1
@@ -26,7 +26,6 @@ #ifndef HW_BT_H #define HW_BT_H -#include "hw/irq.h" /* BD Address */ typedef struct {
include/hw/core/split-irq.h +0 -1
@@ -35,7 +35,6 @@#ifndef HW_SPLIT_IRQ_H #define HW_SPLIT_IRQ_H -#include "hw/irq.h" #include "hw/sysbus.h" #include "qom/object.h"
include/hw/cris/etraxfs_dma.h +0 -1
@@ -2,7 +2,6 @@#define HW_ETRAXFS_DMA_H #include "exec/hwaddr.h" -#include "hw/irq.h" struct dma_context_metadata {/* data descriptor md */
include/hw/display/blizzard.h +0 -1
@@ -11,7 +11,6 @@#ifndef HW_DISPLAY_BLIZZARD_H #define HW_DISPLAY_BLIZZARD_H -#include "hw/irq.h" void *s1d13745_init (qemu_irq gpio_int);void s1d13745_write (void *opaque,int dc,uint16_t value);
include/hw/display/tc6393xb.h +0 -1
@@ -13,7 +13,6 @@#define HW_DISPLAY_TC6393XB_H #include "exec/memory.h" -#include "hw/irq.h" typedef struct TC6393xbState TC6393xbState ;
include/hw/hw.h +0 -1
@@ -9,7 +9,6 @@#include "exec/cpu-common.h" #include "qom/object.h" #include "exec/memory.h" -#include "hw/irq.h" #include "migration/vmstate.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
include/hw/ide/internal.h +1 -0
@@ -7,6 +7,7 @@* non-internal declarations are in hw/ide.h */ #include "hw/ide.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h"
include/hw/input/gamepad.h +0 -1
@@ -11,7 +11,6 @@#ifndef HW_INPUT_GAMEPAD_H #define HW_INPUT_GAMEPAD_H -#include "hw/irq.h" /* stellaris_input.c */ void stellaris_gamepad_init (int n,qemu_irq *irq,const int *keycode);
include/hw/input/tsc2xxx.h +0 -1
@@ -11,7 +11,6 @@ #ifndef HW_INPUT_TSC2XXX_H #define HW_INPUT_TSC2XXX_H -#include "hw/irq.h" #include "ui/console.h" typedef struct uWireSlave {
include/hw/irq.h +0 -4
@@ -5,10 +5,6 @@#define TYPE_IRQ "irq" -typedef struct IRQState *qemu_irq ; - -typedef void (*qemu_irq_handler )(void *opaque,int n,int level); -void qemu_set_irq (qemu_irq irq,int level);static inline void qemu_irq_raise (qemu_irq irq)
include/hw/isa/vt82c686.h +0 -1
@@ -1,7 +1,6 @@#ifndef HW_VT82C686_H #define HW_VT82C686_H -#include "hw/irq.h" #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio"
include/hw/mips/mips.h +0 -1
@@ -6,7 +6,6 @@#define INITRD_PAGE_MASK (~((1 << 16) - 1))#include "exec/memory.h" -#include "hw/irq.h" /* gt64xxx.c */ PCIBus *gt64120_register (qemu_irq *pic);
include/hw/misc/cbus.h +0 -1
@@ -13,7 +13,6 @@ #ifndef HW_MISC_CBUS_H #define HW_MISC_CBUS_H -#include "hw/irq.h" typedef struct { qemu_irq clk;
include/hw/net/lan9118.h +0 -1
@@ -11,7 +11,6 @@#ifndef HW_NET_LAN9118_H #define HW_NET_LAN9118_H -#include "hw/irq.h" #include "net/net.h" #define TYPE_LAN9118 "lan9118"
include/hw/net/smc91c111.h +0 -1
@@ -11,7 +11,6 @@#ifndef HW_NET_SMC91C111_H #define HW_NET_SMC91C111_H -#include "hw/irq.h" #include "net/net.h" void smc91c111_init (NICInfo *,uint32_t ,qemu_irq );
include/hw/or-irq.h +0 -1
@@ -25,7 +25,6 @@#ifndef HW_OR_IRQ_H #define HW_OR_IRQ_H -#include "hw/irq.h" #include "hw/sysbus.h" #include "qom/object.h"
include/hw/ppc/spapr_irq.h +0 -1
@@ -10,7 +10,6 @@#ifndef HW_SPAPR_IRQ_H #define HW_SPAPR_IRQ_H -#include "hw/irq.h" #include "target/ppc/cpu-qom.h" /*
include/hw/qdev-core.h +0 -1
@@ -4,7 +4,6 @@#include "qemu/queue.h" #include "qemu/bitmap.h" #include "qom/object.h" -#include "hw/irq.h" #include "hw/hotplug.h" #include "sysemu/sysemu.h"
include/hw/sh4/sh_intc.h +0 -1
@@ -2,7 +2,6 @@#define SH_INTC_H #include "exec/memory.h" -#include "hw/irq.h" typedef unsigned char intc_enum ;
include/hw/timer/m48t59.h +0 -1
@@ -2,7 +2,6 @@#define HW_M48T59_H #include "exec/hwaddr.h" -#include "hw/irq.h" #include "qom/object.h" #define TYPE_NVRAM "nvram"
include/hw/tricore/tricore.h +0 -1
@@ -2,7 +2,6 @@#define HW_TRICORE_H #include "exec/memory.h" -#include "hw/irq.h" struct tricore_boot_info {uint64_t ram_size;
include/hw/vfio/vfio-platform.h +0 -1
@@ -20,7 +20,6 @@#include "hw/vfio/vfio-common.h" #include "qemu/event_notifier.h" #include "qemu/queue.h" -#include "hw/irq.h" #define TYPE_VFIO_PLATFORM "vfio-platform"
include/hw/xen/xen.h +0 -1
@@ -9,7 +9,6 @@*/ #include "exec/cpu-common.h" -#include "hw/irq.h" /* xen-machine.c */ enum xen_mode {
include/hw/xtensa/mx_pic.h +0 -1
@@ -29,7 +29,6 @@#define XTENSA_MX_PIC_H #include "exec/memory.h" -#include "hw/irq.h" struct XtensaMxPic ;typedef struct XtensaMxPic XtensaMxPic ;
include/qemu/typedefs.h +9 -0
@@ -102,10 +102,19 @@ typedef struct SSIBus SSIBus;typedef struct VirtIODevice VirtIODevice ;typedef struct Visitor Visitor ; +/* +* Pointer types +* Such typedefs should be limited to cases where the typedef's users +* are oblivious of its "pointer-ness". +* Please keep this list in case-insensitive alphabetical order. +*/ +typedef struct IRQState *qemu_irq ; +/* * Function types */ typedef void SaveStateHandler (QEMUFile *f,void *opaque);typedef int LoadStateHandler (QEMUFile *f,void *opaque,int version_id); +typedef void (*qemu_irq_handler )(void *opaque,int n,int level);#endif /* QEMU_TYPEDEFS_H */
include/sysemu/kvm.h +0 -1
@@ -17,7 +17,6 @@#include "qemu/queue.h" #include "qom/cpu.h" #include "exec/memattrs.h" -#include "hw/irq.h" #ifdef NEED_CPU_H # ifdef CONFIG_KVM
hw/acpi/core.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "qemu/config-file.h"
hw/acpi/piix4.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h"
hw/alpha/typhoon.c +1 -0
@@ -12,6 +12,7 @@#include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "alpha_sys.h" #include "exec/address-spaces.h"
hw/arm/armsse.c +1 -0
@@ -19,6 +19,7 @@#include "hw/registerfields.h" #include "hw/arm/armsse.h" #include "hw/arm/boot.h" +#include "hw/irq.h" /* Format of the System Information block SYS_CONFIG register */ typedef enum SysConfigFormat {
hw/arm/exynos4210.c +1 -0
@@ -26,6 +26,7 @@#include "qemu/log.h" #include "cpu.h" #include "hw/cpu/a9mpcore.h" +#include "hw/irq.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h"
hw/arm/exynos4_boards.c +1 -0
@@ -34,6 +34,7 @@#include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" #include "hw/boards.h" +#include "hw/irq.h" #define SMDK_LAN9118_BASE_ADDR 0x05000000
hw/arm/integratorcp.c +1 -0
@@ -20,6 +20,7 @@#include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" +#include "hw/irq.h" #define TYPE_INTEGRATOR_CM "integrator_core"#define INTEGRATOR_CM (obj) \
hw/arm/msf2-soc.c +1 -0
@@ -27,6 +27,7 @@#include "qapi/error.h" #include "exec/address-spaces.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "hw/boards.h" #include "hw/arm/msf2-soc.h" #include "hw/misc/unimp.h"
hw/arm/musicpal.c +1 -0
@@ -23,6 +23,7 @@#include "hw/block/flash.h" #include "ui/console.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/audio/wm8750.h" #include "sysemu/block-backend.h" #include "exec/address-spaces.h"
hw/arm/omap1.c +1 -0
@@ -24,6 +24,7 @@#include "cpu.h" #include "hw/boards.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h"
hw/arm/omap2.c +1 -0
@@ -26,6 +26,7 @@#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h"
hw/arm/palm.c +2 -0
@@ -16,6 +16,7 @@* You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h"
@@ -27,6 +28,7 @@#include "hw/boards.h" #include "hw/arm/boot.h" #include "hw/input/tsc2xxx.h" +#include "hw/irq.h" #include "hw/loader.h" #include "exec/address-spaces.h" #include "cpu.h"
hw/arm/pxa2xx.c +1 -0
@@ -18,6 +18,7 @@#include "sysemu/sysemu.h" #include "hw/char/serial.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "chardev/char-fe.h" #include "sysemu/blockdev.h"
hw/arm/pxa2xx_gpio.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/arm/pxa.h" #include "qemu/log.h"
hw/arm/realview.c +1 -0
@@ -25,6 +25,7 @@#include "hw/char/pl011.h" #include "hw/cpu/a9mpcore.h" #include "hw/intc/realview_gic.h" +#include "hw/irq.h" #define SMP_BOOT_ADDR 0xe0000000#define SMP_BOOTREG_ADDR 0x10000030
hw/arm/smmuv3.c +1 -0
@@ -18,6 +18,7 @@#include "qemu/osdep.h" #include "hw/boards.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "hw/qdev-core.h"
hw/arm/spitz.c +1 -0
@@ -18,6 +18,7 @@#include "sysemu/sysemu.h" #include "hw/pcmcia.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "hw/block/flash.h" #include "qemu/timer.h"
hw/arm/stellaris.c +1 -0
@@ -22,6 +22,7 @@#include "hw/arm/armv7m.h" #include "hw/char/pl011.h" #include "hw/input/gamepad.h" +#include "hw/irq.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" #include "hw/misc/unimp.h" #include "cpu.h"
hw/arm/strongarm.c +1 -0
@@ -31,6 +31,7 @@#include "qemu-common.h" #include "cpu.h" #include "hw/boards.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "strongarm.h" #include "qemu/error-report.h"
hw/arm/tosa.c +1 -0
@@ -21,6 +21,7 @@#include "hw/boards.h" #include "hw/display/tc6393xb.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "hw/sysbus.h" #include "exec/address-spaces.h"
hw/arm/versatilepb.c +1 -0
@@ -17,6 +17,7 @@#include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/boards.h" #include "exec/address-spaces.h" #include "hw/block/flash.h"
hw/arm/virt.c +1 -0
@@ -57,6 +57,7 @@#include "hw/arm/fdt.h" #include "hw/intc/arm_gic.h" #include "hw/intc/arm_gicv3_common.h" +#include "hw/irq.h" #include "kvm_arm.h" #include "hw/firmware/smbios.h" #include "qapi/visitor.h"
hw/arm/z2.c +1 -0
@@ -16,6 +16,7 @@#include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "hw/boards.h" #include "sysemu/sysemu.h"
hw/audio/cs4231a.c +1 -0
@@ -26,6 +26,7 @@#include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/qdev.h" #include "qemu/module.h"
hw/audio/gus.c +1 -0
@@ -28,6 +28,7 @@#include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "gusemu.h" #include "gustate.h"
hw/audio/marvell_88w8618.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/audio/wm8750.h" #include "audio/audio.h" #include "qapi/error.h"
hw/audio/milkymist-ac97.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "audio/audio.h"
hw/audio/pl041.c +1 -0
@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h"
hw/audio/sb16.c +1 -0
@@ -26,6 +26,7 @@#include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/qdev.h" #include "qemu/timer.h"
hw/block/fdc.c +1 -0
@@ -33,6 +33,7 @@#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/block/block.h"
hw/char/bcm2835_aux.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/osdep.h" #include "hw/char/bcm2835_aux.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h"
hw/char/cadence_uart.c +1 -0
@@ -29,6 +29,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/char/cadence_uart.h" +#include "hw/irq.h" #ifdef CADENCE_UART_ERR_DEBUG #define DB_PRINT (...) do { \
hw/char/cmsdk-apb-uart.c +1 -0
@@ -25,6 +25,7 @@#include "chardev/char-fe.h" #include "chardev/char-serial.h" #include "hw/char/cmsdk-apb-uart.h" +#include "hw/irq.h" REG32(DATA, 0)REG32 (STATE ,4 )
hw/char/escc.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/char/escc.h"
hw/char/etraxfs_ser.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h"
hw/char/exynos4210_uart.c +1 -0
@@ -28,6 +28,7 @@#include "chardev/char-serial.h" #include "hw/arm/exynos4210.h" +#include "hw/irq.h" #undef DEBUG_UART#undef DEBUG_UART_EXTEND
hw/char/grlib_apbuart.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sparc/grlib.h" #include "hw/sysbus.h" #include "qemu/module.h"
hw/char/imx_serial.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/char/imx_serial.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h"
hw/char/ipoctal232.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "hw/ipack/ipack.h" +#include "hw/irq.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "chardev/char-fe.h"
hw/char/lm32_uart.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "chardev/char-fe.h"
hw/char/mcf_uart.c +1 -0
@@ -8,6 +8,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/m68k/mcf.h"
hw/char/milkymist-uart.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "chardev/char-fe.h"
hw/char/nrf51_uart.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/char/nrf51_uart.h" +#include "hw/irq.h" #include "trace.h" static void nrf51_uart_update_irq (NRF51UARTState *s)
hw/char/parallel.c +1 -0
@@ -29,6 +29,7 @@#include "hw/hw.h" #include "chardev/char-parallel.h" #include "chardev/char-fe.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/char/parallel.h" #include "sysemu/reset.h"
hw/char/pl011.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/char/pl011.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h"
hw/char/serial-pci-multi.c +1 -0
@@ -30,6 +30,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #define PCI_SERIAL_MAX_PORTS 4
hw/char/serial-pci.c +1 -0
@@ -29,6 +29,7 @@#include "qapi/error.h" #include "qemu/module.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "hw/pci/pci.h" typedef struct PCISerialState {
hw/char/serial.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "chardev/char-serial.h" #include "qapi/error.h" #include "qemu/timer.h"
hw/char/sh_serial.c +2 -0
@@ -24,8 +24,10 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h" #include "qapi/error.h"
hw/char/spapr_vty.c +1 -0
@@ -5,6 +5,7 @@#include "cpu.h" #include "hw/qdev.h" #include "chardev/char-fe.h" +#include "hw/irq.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h"
hw/char/stm32f2xx_usart.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "hw/char/stm32f2xx_usart.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h"
hw/char/xilinx_uartlite.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "chardev/char-fe.h"
hw/core/or-irq.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/or-irq.h" #include "qemu/module.h"
hw/core/qdev.c +1 -0
@@ -35,6 +35,7 @@#include "qemu/error-report.h" #include "qemu/option.h" #include "hw/hotplug.h" +#include "hw/irq.h" #include "hw/boards.h" #include "hw/sysbus.h"
hw/core/split-irq.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "hw/core/split-irq.h" +#include "hw/irq.h" #include "qapi/error.h" #include "qemu/module.h"
hw/cpu/a15mpcore.c +1 -0
@@ -22,6 +22,7 @@#include "qapi/error.h" #include "qemu/module.h" #include "hw/cpu/a15mpcore.h" +#include "hw/irq.h" #include "sysemu/kvm.h" #include "kvm_arm.h"
hw/cpu/a9mpcore.c +1 -0
@@ -12,6 +12,7 @@#include "qapi/error.h" #include "qemu/module.h" #include "hw/cpu/a9mpcore.h" +#include "hw/irq.h" #include "qom/cpu.h" static void a9mp_priv_set_irq (void *opaque,int irq,int level)
hw/cpu/arm11mpcore.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/module.h" #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" +#include "hw/irq.h" static void mpcore_priv_set_irq (void *opaque,int irq,int level)
hw/cpu/realview_mpcore.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/module.h" #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" +#include "hw/irq.h" #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore"#define REALVIEW_MPCORE_RIRQ (obj) \
hw/display/ads7846.c +1 -0
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "qemu/module.h" #include "ui/console.h"
hw/display/bcm2835_fb.c +1 -0
@@ -26,6 +26,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/display/bcm2835_fb.h" +#include "hw/irq.h" #include "framebuffer.h" #include "ui/pixel_ops.h" #include "hw/misc/bcm2835_mbox_defs.h"
hw/display/cg3.c +1 -0
@@ -29,6 +29,7 @@#include "qemu/error-report.h" #include "ui/console.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/loader.h" #include "qemu/log.h" #include "qemu/module.h"
hw/display/exynos4210_fimd.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "ui/console.h" #include "ui/pixel_ops.h"
hw/display/g364fb.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "qemu/units.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "ui/console.h"
hw/display/milkymist-tmu2.c +1 -0
@@ -26,6 +26,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "qapi/error.h"
hw/display/omap_dss.c +2 -0
@@ -17,8 +17,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/>. */ +#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "ui/console.h" #include "hw/arm/omap.h"
hw/display/omap_lcdc.c +2 -0
@@ -16,8 +16,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/>. */ +#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "ui/console.h" #include "hw/arm/omap.h" #include "framebuffer.h"
hw/display/pl110.c +1 -0
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "ui/console.h" #include "framebuffer.h"
hw/display/pxa2xx_lcd.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "ui/console.h" #include "hw/arm/pxa.h" #include "ui/pixel_ops.h"
hw/display/tc6393xb.c +2 -0
@@ -10,10 +10,12 @@* Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/host-utils.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/display/tc6393xb.h" #include "hw/block/flash.h" #include "ui/console.h"
hw/display/xlnx_dp.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/display/xlnx_dp.h" +#include "hw/irq.h" #ifndef DEBUG_DP #define DEBUG_DP 0
hw/dma/bcm2835_dma.c +1 -0
@@ -6,6 +6,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/dma/bcm2835_dma.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h"
hw/dma/etraxfs_dma.c +2 -0
@@ -21,8 +21,10 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h"
hw/dma/pl080.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/dma/pl080.h" +#include "hw/irq.h" #include "qapi/error.h" #define PL080_CONF_E 0x1
hw/dma/pl330.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/osdep.h" #include "qemu-common.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h"
hw/dma/pxa2xx_dma.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" #include "qapi/error.h"
hw/dma/rc4030.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "qemu/units.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/mips/mips.h" #include "hw/sysbus.h" #include "qemu/timer.h"
hw/dma/sparc32_dma.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h"
hw/dma/xilinx_axidma.c +1 -0
@@ -26,6 +26,7 @@#include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/main-loop.h"
hw/dma/xlnx-zdma.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "hw/dma/xlnx-zdma.h" +#include "hw/irq.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h"
hw/dma/xlnx-zynq-devcfg.c +1 -0
@@ -26,6 +26,7 @@#include "qemu/osdep.h" #include "hw/dma/xlnx-zynq-devcfg.h" +#include "hw/irq.h" #include "qemu/bitops.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h"
hw/dma/xlnx_dpdma.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/dma/xlnx_dpdma.h" +#include "hw/irq.h" #ifndef DEBUG_DPDMA #define DEBUG_DPDMA 0
hw/gpio/bcm2835_gpio.c +1 -0
@@ -19,6 +19,7 @@#include "hw/sysbus.h" #include "hw/sd/sd.h" #include "hw/gpio/bcm2835_gpio.h" +#include "hw/irq.h" #define GPFSEL0 0x00#define GPFSEL1 0x04
hw/gpio/gpio_key.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "qemu/timer.h"
hw/gpio/imx_gpio.c +1 -0
@@ -19,6 +19,7 @@#include "qemu/osdep.h" #include "hw/gpio/imx_gpio.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h"
hw/gpio/max7310.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "qemu/module.h" #define TYPE_MAX7310 "max7310"
hw/gpio/mpc8xxx.c +1 -0
@@ -20,6 +20,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h"
hw/gpio/nrf51_gpio.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/gpio/nrf51_gpio.h" +#include "hw/irq.h" #include "trace.h" /*
hw/gpio/omap_gpio.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h"
hw/gpio/pl061.c +1 -0
@@ -9,6 +9,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h"
hw/gpio/zaurus.c +1 -0
@@ -18,6 +18,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/sharpsl.h" #include "hw/sysbus.h" #include "qemu/module.h"
hw/hppa/dino.c +1 -0
@@ -16,6 +16,7 @@#include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h"
hw/i2c/aspeed_i2c.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/aspeed_i2c.h" +#include "hw/irq.h" /* I2C Global Register */
hw/i2c/bitbang_i2c.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/i2c/bitbang_i2c.h" #include "hw/sysbus.h" #include "qemu/module.h"
hw/i2c/exynos4210_i2c.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/timer.h" #include "hw/sysbus.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #ifndef EXYNOS4_I2C_DEBUG #define EXYNOS4_I2C_DEBUG 0
hw/i2c/imx_i2c.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/i2c/imx_i2c.h" +#include "hw/irq.h" #include "hw/i2c/i2c.h" #include "qemu/log.h" #include "qemu/module.h"
hw/i2c/mpc_i2c.c +1 -0
@@ -19,6 +19,7 @@#include "qemu/osdep.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/sysbus.h"
hw/i2c/omap_i2c.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/module.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h"
hw/i2c/ppc4xx_i2c.c +1 -0
@@ -30,6 +30,7 @@#include "cpu.h" #include "hw/hw.h" #include "hw/i2c/ppc4xx_i2c.h" +#include "hw/irq.h" #define PPC4xx_I2C_MEM_SIZE 18
hw/i386/kvm/i8259.c +1 -0
@@ -14,6 +14,7 @@#include "hw/isa/i8259_internal.h" #include "qemu/module.h" #include "hw/i386/apic_internal.h" +#include "hw/irq.h" #include "sysemu/kvm.h" #define TYPE_KVM_I8259 "kvm-i8259"
hw/i386/kvm/ioapic.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "monitor/monitor.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/i386/ioapic_internal.h" #include "hw/i386/apic_internal.h" #include "sysemu/kvm.h"
hw/i386/pc.c +1 -0
@@ -46,6 +46,7 @@#include "hw/dma/i8257.h" #include "hw/timer/i8254.h" #include "hw/input/i8042.h" +#include "hw/irq.h" #include "hw/audio/pcspk.h" #include "hw/pci/msi.h" #include "hw/sysbus.h"
hw/i386/pc_piix.c +1 -0
@@ -38,6 +38,7 @@#include "net/net.h" #include "hw/boards.h" #include "hw/ide.h" +#include "hw/irq.h" #include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "sysemu/sysemu.h"
hw/i386/xen/xen-hvm.c +1 -0
@@ -14,6 +14,7 @@#include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/i386/apic-msidef.h" #include "hw/xen/xen_common.h" #include "hw/xen/xen-legacy-backend.h"
hw/input/lm832x.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/reset.h"
hw/input/milkymist-softusb.c +1 -0
@@ -28,6 +28,7 @@#include "trace.h" #include "ui/console.h" #include "hw/input/hid.h" +#include "hw/irq.h" #include "qemu/error-report.h" #include "qemu/module.h"
hw/input/pckbd.c +1 -0
@@ -28,6 +28,7 @@#include "hw/isa/isa.h" #include "hw/i386/pc.h" #include "hw/input/ps2.h" +#include "hw/irq.h" #include "hw/input/i8042.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h"
hw/input/pl050.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/input/ps2.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h"
hw/input/pxa2xx_keypad.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/pxa.h" #include "ui/console.h"
hw/input/stellaris_input.c +2 -0
@@ -6,9 +6,11 @@* * This code is licensed under the GPL. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/input/gamepad.h" +#include "hw/irq.h" #include "ui/console.h" typedef struct {
hw/input/tsc2005.c +1 -0
@@ -25,6 +25,7 @@#include "sysemu/reset.h" #include "ui/console.h" #include "hw/input/tsc2xxx.h" +#include "hw/irq.h" #include "trace.h" #define TSC_CUT_RESOLUTION (value, p) ((value) >> (16 - (p ? 12 : 10)))
hw/input/tsc210x.c +1 -0
@@ -27,6 +27,7 @@#include "ui/console.h" #include "hw/arm/omap.h" /* For I2SCodec */ #include "hw/input/tsc2xxx.h" +#include "hw/irq.h" #define TSC_DATA_REGISTERS_PAGE 0x0#define TSC_CONTROL_REGISTERS_PAGE 0x1
hw/intc/allwinner-a10-pic.c +1 -0
@@ -19,6 +19,7 @@#include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "hw/intc/allwinner-a10-pic.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h"
hw/intc/arm_gic.c +1 -0
@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "gic_internal.h" #include "qapi/error.h"
hw/intc/arm_gicv2m.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/pci/msi.h" #include "sysemu/kvm.h" #include "qemu/log.h"
hw/intc/arm_gicv3_cpuif.c +1 -0
@@ -17,6 +17,7 @@#include "qemu/main-loop.h" #include "trace.h" #include "gicv3_internal.h" +#include "hw/irq.h" #include "cpu.h" void gicv3_set_gicv3state (CPUState *cpu,GICv3CPUState *s)
hw/intc/armv7m_nvic.c +1 -0
@@ -16,6 +16,7 @@#include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" +#include "hw/irq.h" #include "target/arm/cpu.h" #include "exec/exec-all.h" #include "qemu/log.h"
hw/intc/aspeed_vic.c +1 -0
@@ -29,6 +29,7 @@#include "qemu/osdep.h" #include "hw/intc/aspeed_vic.h" +#include "hw/irq.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h"
hw/intc/bcm2835_ic.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/osdep.h" #include "hw/intc/bcm2835_ic.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h"
hw/intc/bcm2836_control.c +1 -0
@@ -17,6 +17,7 @@#include "qemu/osdep.h" #include "hw/intc/bcm2836_control.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h"
hw/intc/etraxfs_pic.c +1 -0
@@ -26,6 +26,7 @@#include "hw/sysbus.h" #include "qemu/module.h" #include "hw/hw.h" +#include "hw/irq.h" //#include "pc.h" //#include "etraxfs.h"
hw/intc/exynos4210_combiner.c +1 -0
@@ -32,6 +32,7 @@#include "qemu/module.h" #include "hw/arm/exynos4210.h" +#include "hw/irq.h" //#define DEBUG_COMBINER
hw/intc/heathrow_pic.c +1 -0
@@ -28,6 +28,7 @@#include "hw/ppc/mac.h" #include "qemu/module.h" #include "hw/intc/heathrow_pic.h" +#include "hw/irq.h" #include "trace.h" static inline int heathrow_check_irq (HeathrowPICState *pic)
hw/intc/i8259.c +2 -0
@@ -21,9 +21,11 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "qemu/timer.h" #include "qemu/log.h"
hw/intc/imx_avic.c +1 -0
@@ -17,6 +17,7 @@#include "qemu/osdep.h" #include "hw/intc/imx_avic.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h"
hw/intc/lm32_pic.c +1 -0
@@ -26,6 +26,7 @@#include "trace.h" #include "hw/lm32/lm32_pic.h" #include "hw/intc/intc.h" +#include "hw/irq.h" #define TYPE_LM32_PIC "lm32-pic"#define LM32_PIC (obj) OBJECT_CHECK(LM32PicState, (obj), TYPE_LM32_PIC)
hw/intc/mips_gic.c +1 -0
@@ -21,6 +21,7 @@#include "sysemu/reset.h" #include "kvm_mips.h" #include "hw/intc/mips_gic.h" +#include "hw/irq.h" static void mips_gic_set_vp_irq (MIPSGICState *gic,int vp,int pin) {
hw/intc/nios2_iic.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/module.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "cpu.h"
hw/intc/omap_intc.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h"
hw/intc/ompic.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/module.h" #include "qapi/error.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "exec/memory.h"
hw/intc/openpic.c +1 -0
@@ -36,6 +36,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" #include "hw/ppc/openpic.h"
hw/intc/pl190.c +1 -0
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h"
hw/intc/puv3_intc.c +1 -0
@@ -10,6 +10,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #undef DEBUG_PUV3
hw/intc/realview_gic.c +1 -0
@@ -11,6 +11,7 @@#include "qapi/error.h" #include "qemu/module.h" #include "hw/intc/realview_gic.h" +#include "hw/irq.h" static void realview_gic_set_irq (void *opaque,int irq,int level) {
hw/intc/sh_intc.c +1 -0
@@ -12,6 +12,7 @@#include "cpu.h" #include "hw/sh4/sh_intc.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sh4/sh.h" //#define DEBUG_INTC
hw/intc/slavio_intctl.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/module.h" #include "hw/sysbus.h" #include "hw/intc/intc.h" +#include "hw/irq.h" #include "trace.h" //#define DEBUG_IRQ_COUNT
hw/intc/xics.c +1 -0
@@ -37,6 +37,7 @@#include "qapi/visitor.h" #include "monitor/monitor.h" #include "hw/intc/intc.h" +#include "hw/irq.h" #include "sysemu/kvm.h" #include "sysemu/reset.h"
hw/intc/xilinx_intc.c +1 -0
@@ -26,6 +26,7 @@#include "hw/sysbus.h" #include "qemu/module.h" #include "hw/hw.h" +#include "hw/irq.h" #define D (x)
hw/intc/xive.c +1 -0
@@ -17,6 +17,7 @@#include "sysemu/reset.h" #include "hw/qdev-properties.h" #include "monitor/monitor.h" +#include "hw/irq.h" #include "hw/ppc/xive.h" #include "hw/ppc/xive_regs.h"
hw/intc/xlnx-pmu-iomod-intc.c +1 -0
@@ -31,6 +31,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" +#include "hw/irq.h" #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG #define XLNX_PMU_IO_INTC_ERR_DEBUG 0
hw/intc/xlnx-zynqmp-ipi.c +1 -0
@@ -32,6 +32,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/intc/xlnx-zynqmp-ipi.h" +#include "hw/irq.h" #ifndef XLNX_ZYNQMP_IPI_ERR_DEBUG #define XLNX_ZYNQMP_IPI_ERR_DEBUG 0
hw/ipack/ipack.c +1 -0
@@ -12,6 +12,7 @@#include "qapi/error.h" #include "qemu/module.h" #include "hw/ipack/ipack.h" +#include "hw/irq.h" IPackDevice *ipack_device_find (IPackBus *bus,int32_t slot) {
hw/ipack/tpci200.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "qemu/units.h" #include "hw/ipack/ipack.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "qemu/bitops.h" #include "qemu/module.h"
hw/ipmi/isa_ipmi_bt.c +1 -0
@@ -28,6 +28,7 @@#include "qapi/error.h" #include "hw/hw.h" #include "hw/ipmi/ipmi.h" +#include "hw/irq.h" #include "hw/isa/isa.h" /* Control register */
hw/ipmi/isa_ipmi_kcs.c +1 -0
@@ -28,6 +28,7 @@#include "qapi/error.h" #include "hw/hw.h" #include "hw/ipmi/ipmi.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #define IPMI_KCS_OBF_BIT 0
hw/isa/i82378.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/pci/pci.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/timer/i8254.h" #include "hw/audio/pcspk.h"
hw/isa/lpc_ich9.c +2 -0
@@ -27,6 +27,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h"
@@ -35,6 +36,7 @@#include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/isa/apm.h" #include "hw/i386/ioapic.h" #include "hw/pci/pci.h"
hw/lm32/lm32_boards.c +1 -0
@@ -23,6 +23,7 @@#include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/block/flash.h" #include "hw/boards.h" #include "hw/loader.h"
hw/lm32/milkymist.c +1 -0
@@ -24,6 +24,7 @@#include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h"
hw/m68k/mcf5206.c +2 -0
@@ -5,10 +5,12 @@* * This code is licensed under the GPL */ +#include "qemu/osdep.h" #include "qemu/error-report.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/m68k/mcf.h" #include "qemu/timer.h" #include "hw/ptimer.h"
hw/m68k/mcf5208.c +2 -0
@@ -5,6 +5,7 @@* * This code is licensed under the GPL */ +#include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h"
@@ -12,6 +13,7 @@#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/m68k/mcf.h" #include "hw/m68k/mcf_fec.h" #include "qemu/timer.h"
hw/m68k/mcf_intc.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/m68k/mcf.h"
hw/mips/gt64xxx_pci.c +1 -0
@@ -30,6 +30,7 @@#include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "exec/address-spaces.h" #include "trace.h"
hw/mips/mips_int.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/osdep.h" #include "qemu/main-loop.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/mips/cpudevs.h" #include "cpu.h" #include "sysemu/kvm.h"
hw/mips/mips_malta.c +1 -0
@@ -43,6 +43,7 @@#include "qemu/log.h" #include "hw/mips/bios.h" #include "hw/ide.h" +#include "hw/irq.h" #include "hw/loader.h" #include "elf.h" #include "hw/timer/mc146818rtc.h"
hw/misc/arm_sysctl.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "qemu/bitops.h" #include "hw/sysbus.h"
hw/misc/armsse-mhu.c +1 -0
@@ -23,6 +23,7 @@#include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/armsse-mhu.h" REG32 (CPU0INTR_STAT ,0x0 )
hw/misc/aspeed_xdma.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/error-report.h" +#include "hw/irq.h" #include "hw/misc/aspeed_xdma.h" #include "qapi/error.h"
hw/misc/bcm2835_mbox.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/misc/bcm2835_mbox.h" #include "qemu/log.h" #include "qemu/module.h"
hw/misc/bcm2835_property.c +1 -0
@@ -6,6 +6,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/misc/bcm2835_property.h" +#include "hw/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" #include "sysemu/dma.h" #include "qemu/log.h"
hw/misc/eccmemctl.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "trace.h"
hw/misc/iotkit-secctl.c +1 -0
@@ -16,6 +16,7 @@#include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/iotkit-secctl.h" /* Registers in the secure privilege control block */
hw/misc/macio/mac_dbdma.c +1 -0
@@ -39,6 +39,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/mac_dbdma.h" #include "qemu/main-loop.h" #include "qemu/module.h"
hw/misc/macio/pmu.c +1 -0
@@ -33,6 +33,7 @@#include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/input/adb.h" +#include "hw/irq.h" #include "hw/misc/mos6522.h" #include "hw/misc/macio/gpio.h" #include "hw/misc/macio/pmu.h"
hw/misc/max111x.c +1 -0
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "qemu/module.h"
hw/misc/milkymist-pfpu.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "qemu/log.h"
hw/misc/mos6522.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/input/adb.h" +#include "hw/irq.h" #include "hw/misc/mos6522.h" #include "qemu/timer.h" #include "sysemu/sysemu.h"
hw/misc/mst_fpga.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h"
hw/misc/nrf51_rng.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/module.h" #include "qapi/error.h" #include "hw/arm/nrf51.h" +#include "hw/irq.h" #include "hw/misc/nrf51_rng.h" #include "qemu/guest-random.h"
hw/misc/omap_clk.c +2 -0
@@ -18,8 +18,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/>. */ +#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" struct clk {
hw/misc/omap_gpmc.c +2 -0
@@ -18,8 +18,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/>. */ +#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/block/flash.h" #include "hw/arm/omap.h" #include "exec/memory.h"
hw/misc/pc-testdev.c +1 -0
@@ -39,6 +39,7 @@#include "hw/hw.h" #include "hw/qdev.h" #include "qemu/module.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #define IOMEM_LEN 0x10000
hw/misc/slavio_misc.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "trace.h"
hw/misc/tmp105.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "tmp105.h" #include "qapi/error.h" #include "qapi/visitor.h"
hw/misc/tz-mpc.c +1 -0
@@ -16,6 +16,7 @@#include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/tz-mpc.h" /* Our IOMMU has two IOMMU indexes, one for secure transactions and one for
hw/misc/tz-msc.c +1 -0
@@ -16,6 +16,7 @@#include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/tz-msc.h" static void tz_msc_update_irq (TZMSC *s)
hw/misc/tz-ppc.c +1 -0
@@ -16,6 +16,7 @@#include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/tz-ppc.h" static void tz_ppc_update_irq (TZPPC *s)
hw/misc/zynq-xadc.c +1 -0
@@ -15,6 +15,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/misc/zynq-xadc.h" #include "qemu/timer.h" #include "sysemu/sysemu.h"
hw/net/allwinner_emac.c +1 -0
@@ -21,6 +21,7 @@#include "hw/sysbus.h" #include "net/net.h" #include "qemu/fifo8.h" +#include "hw/irq.h" #include "hw/net/allwinner_emac.h" #include "qemu/log.h" #include "qemu/module.h"
hw/net/cadence_gem.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include <zlib.h> /* For crc32 */ +#include "hw/irq.h" #include "hw/net/cadence_gem.h" #include "qapi/error.h" #include "qemu/log.h"
hw/net/can/can_kvaser_pci.c +1 -0
@@ -37,6 +37,7 @@#include "qapi/error.h" #include "chardev/char.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "net/can_emu.h"
hw/net/can/can_mioe3680_pci.c +1 -0
@@ -33,6 +33,7 @@#include "qapi/error.h" #include "chardev/char.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "net/can_emu.h"
hw/net/can/can_pcm3680_pci.c +1 -0
@@ -33,6 +33,7 @@#include "qapi/error.h" #include "chardev/char.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "net/can_emu.h"
hw/net/can/can_sja1000.c +2 -0
@@ -24,10 +24,12 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/log.h" #include "chardev/char.h" #include "hw/hw.h" +#include "hw/irq.h" #include "net/can_emu.h" #include "can_sja1000.h"
hw/net/dp8393x.c +1 -0
@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "net/net.h" #include "qapi/error.h"
hw/net/fsl_etsec/etsec.c +1 -0
@@ -29,6 +29,7 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "etsec.h" #include "registers.h"
hw/net/ftgmac100.c +1 -0
@@ -12,6 +12,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/net/ftgmac100.h" #include "sysemu/dma.h" #include "qemu/log.h"
hw/net/imx_fec.c +1 -0
@@ -22,6 +22,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/net/imx_fec.h" #include "sysemu/dma.h" #include "qemu/log.h"
hw/net/lan9118.c +1 -0
@@ -14,6 +14,7 @@#include "hw/sysbus.h" #include "net/net.h" #include "net/eth.h" +#include "hw/irq.h" #include "hw/net/lan9118.h" #include "sysemu/sysemu.h" #include "hw/ptimer.h"
hw/net/mcf_fec.c +1 -0
@@ -8,6 +8,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "net/net.h" #include "qemu/module.h" #include "hw/m68k/mcf.h"
hw/net/milkymist-minimac2.c +1 -0
@@ -26,6 +26,7 @@#include "qapi/error.h" #include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */ #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "net/net.h"
hw/net/mipsnet.c +1 -0
@@ -1,5 +1,6 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "net/net.h" #include "qemu/module.h" #include "trace.h"
hw/net/ne2000-pci.c +2 -0
@@ -21,7 +21,9 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "ne2000.h" #include "sysemu/sysemu.h"
hw/net/ne2000.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "net/eth.h" #include "qemu/module.h" +#include "hw/irq.h" #include "ne2000.h" #include "sysemu/sysemu.h" #include "trace.h"
hw/net/opencores_eth.c +1 -0
@@ -33,6 +33,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/net/mii.h" #include "hw/sysbus.h" #include "net/net.h"
hw/net/pcnet-pci.c +1 -0
@@ -28,6 +28,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "net/net.h" #include "qemu/module.h"
hw/net/pcnet.c +1 -0
@@ -37,6 +37,7 @@#include "qemu/osdep.h" #include "qemu/log.h" +#include "hw/irq.h" #include "hw/qdev.h" #include "net/net.h" #include "net/eth.h"
hw/net/smc91c111.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "net/net.h" +#include "hw/irq.h" #include "hw/net/smc91c111.h" #include "qemu/log.h" #include "qemu/module.h"
hw/net/spapr_llan.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" #include "net/net.h"
hw/net/stellaris_enet.c +1 -0
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "net/net.h" #include "qemu/log.h"
hw/net/xgmac.c +1 -0
@@ -25,6 +25,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h"
hw/net/xilinx_axienet.c +1 -0
@@ -30,6 +30,7 @@#include "net/net.h" #include "net/checksum.h" +#include "hw/irq.h" #include "hw/stream.h" #define DPHY (x)
hw/net/xilinx_ethlite.c +1 -0
@@ -27,6 +27,7 @@#include "cpu.h" /* FIXME should not use tswap* */ #include "hw/sysbus.h" #include "hw/hw.h" +#include "hw/irq.h" #include "net/net.h" #define D (x)
hw/nios2/cpu_pic.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "cpu.h" +#include "hw/irq.h" #include "qemu/config-file.h"
hw/openrisc/openrisc_sim.c +1 -0
@@ -23,6 +23,7 @@#include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/boards.h" #include "elf.h" #include "hw/char/serial.h"
hw/openrisc/pic_cpu.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "cpu.h" /* OpenRISC pic handler */
hw/pci-host/bonito.c +1 -0
@@ -42,6 +42,7 @@#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/mips/mips.h" #include "hw/pci/pci_host.h" #include "sysemu/reset.h"
hw/pci-host/designware.c +1 -0
@@ -25,6 +25,7 @@#include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" +#include "hw/irq.h" #include "hw/pci-host/designware.h" #define DESIGNWARE_PCIE_PORT_LINK_CONTROL 0x710
hw/pci-host/gpex.c +1 -0
@@ -32,6 +32,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci-host/gpex.h" #include "qemu/module.h"
hw/pci-host/grackle.c +1 -0
@@ -28,6 +28,7 @@#include "hw/ppc/mac.h" #include "hw/pci/pci.h" #include "hw/intc/heathrow_pic.h" +#include "hw/irq.h" #include "qapi/error.h" #include "qemu/module.h" #include "trace.h"
hw/pci-host/piix.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/isa/isa.h"
hw/pci-host/ppce500.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/e500-ccsr.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h"
hw/pci-host/prep.c +1 -0
@@ -32,6 +32,7 @@#include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/loader.h" #include "hw/or-irq.h" #include "exec/address-spaces.h"
hw/pci-host/sabre.c +1 -0
@@ -30,6 +30,7 @@#include "hw/pci/pci_host.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" +#include "hw/irq.h" #include "hw/pci-bridge/simba.h" #include "hw/pci-host/sabre.h" #include "sysemu/sysemu.h"
hw/pci-host/uninorth.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/mac.h" #include "qemu/module.h" #include "hw/pci/pci.h"
hw/pci-host/versatile.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h"
hw/pci-host/xilinx-pcie.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/units.h" #include "qapi/error.h" #include "hw/pci/pci_bridge.h" +#include "hw/irq.h" #include "hw/pci-host/xilinx-pcie.h" enum root_cfg_reg {
hw/pci/pci.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h"
hw/pcmcia/pxa2xx.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/pcmcia.h"
hw/ppc/e500.c +1 -0
@@ -45,6 +45,7 @@#include "hw/platform-bus.h" #include "hw/net/fsl_etsec/etsec.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #define EPAPR_MAGIC (0x45504150)#define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb"
hw/ppc/pnv_lpc.c +1 -0
@@ -23,6 +23,7 @@#include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/ppc/pnv.h"
hw/ppc/pnv_psi.c +1 -0
@@ -19,6 +19,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "target/ppc/cpu.h" #include "qemu/log.h" #include "qemu/module.h"
hw/ppc/ppc.c +2 -0
@@ -21,9 +21,11 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc_e500.h" #include "qemu/timer.h"
hw/ppc/ppc405_uc.c +1 -0
@@ -30,6 +30,7 @@#include "hw/ppc/ppc.h" #include "hw/boards.h" #include "hw/i2c/ppc4xx_i2c.h" +#include "hw/irq.h" #include "ppc405.h" #include "hw/char/serial.h" #include "qemu/timer.h"
hw/ppc/ppc440_pcix.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "hw/pci/pci.h"
hw/ppc/ppc440_uc.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "exec/address-spaces.h" #include "exec/memory.h" #include "hw/ppc/ppc.h"
hw/ppc/ppc4xx_devs.c +1 -0
@@ -27,6 +27,7 @@#include "sysemu/reset.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "hw/boards.h"
hw/ppc/ppc4xx_pci.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "qemu/module.h"
hw/ppc/prep.c +1 -0
@@ -39,6 +39,7 @@#include "qemu/error-report.h" #include "qemu/log.h" #include "hw/ide.h" +#include "hw/irq.h" #include "hw/loader.h" #include "hw/timer/mc146818rtc.h" #include "hw/isa/pc87312.h"
hw/ppc/prep_systemio.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" /* for error_report() */
hw/ppc/spapr_events.c +2 -0
@@ -24,6 +24,7 @@* THE SOFTWARE. * */ +#include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h"
@@ -35,6 +36,7 @@#include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" #include "hw/pci/pci.h" +#include "hw/irq.h" #include "hw/pci-host/spapr.h" #include "hw/ppc/spapr_drc.h" #include "qemu/help_option.h"
hw/ppc/spapr_irq.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/log.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/spapr_xive.h"
hw/ppc/spapr_pci.c +1 -0
@@ -27,6 +27,7 @@#include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h"
hw/ppc/spapr_vio.c +1 -0
@@ -24,6 +24,7 @@#include "qapi/error.h" #include "qapi/visitor.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/log.h" #include "sysemu/sysemu.h" #include "hw/boards.h"
hw/riscv/sifive_gpio.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "qemu/log.h" +#include "hw/irq.h" #include "hw/riscv/sifive_gpio.h" #include "trace.h"
hw/riscv/sifive_uart.c +1 -0
@@ -22,6 +22,7 @@#include "chardev/char.h" #include "chardev/char-fe.h" #include "target/riscv/cpu.h" +#include "hw/irq.h" #include "hw/riscv/sifive_uart.h" /*
hw/scsi/esp-pci.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/irq.h" #include "hw/nvram/eeprom93xx.h" #include "hw/scsi/esp.h" #include "trace.h"
hw/scsi/esp.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/scsi/esp.h" #include "trace.h" #include "qemu/log.h"
hw/scsi/lsi53c895a.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" #include "sysemu/dma.h"
hw/sd/bcm2835_sdhost.c +1 -0
@@ -15,6 +15,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "sysemu/blockdev.h" +#include "hw/irq.h" #include "hw/sd/bcm2835_sdhost.h" #include "trace.h"
hw/sd/omap_mmc.c +2 -0
@@ -18,9 +18,11 @@* You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu/log.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sd/sd.h"
hw/sd/pl181.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "sysemu/blockdev.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/sd/sd.h" #include "qemu/log.h" #include "qemu/module.h"
hw/sd/pxa2xx_mmci.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/arm/pxa.h" #include "hw/sd/sd.h"
hw/sd/sd.c +1 -0
@@ -34,6 +34,7 @@#include "qemu/units.h" #include "hw/qdev.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/registerfields.h" #include "sysemu/block-backend.h" #include "hw/sd/sd.h"
hw/sd/sdhci.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" +#include "hw/irq.h" #include "sysemu/dma.h" #include "qemu/timer.h" #include "qemu/bitops.h"
hw/sh4/r2d.c +1 -0
@@ -37,6 +37,7 @@#include "net/net.h" #include "sh7750_regs.h" #include "hw/ide.h" +#include "hw/irq.h" #include "hw/loader.h" #include "hw/usb.h" #include "hw/block/flash.h"
hw/sh4/sh7750.c +2 -0
@@ -22,8 +22,10 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sh4/sh.h" #include "sysemu/sysemu.h" #include "sh7750_regs.h"
hw/sh4/sh_pci.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/sh4/sh.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "qemu/bswap.h"
hw/sparc/leon3.c +1 -0
@@ -29,6 +29,7 @@#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "sysemu/sysemu.h"
hw/sparc/sun4m.c +1 -0
@@ -44,6 +44,7 @@#include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" #include "hw/empty_slot.h" +#include "hw/irq.h" #include "hw/loader.h" #include "elf.h" #include "trace.h"
hw/sparc/sun4m_iommu.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" #include "qemu/module.h"
hw/ssi/aspeed_smc.c +1 -0
@@ -29,6 +29,7 @@#include "qemu/module.h" #include "qemu/error-report.h" +#include "hw/irq.h" #include "hw/ssi/aspeed_smc.h" /* CE Type Setting Register */
hw/ssi/imx_spi.c +1 -0
@@ -9,6 +9,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ssi/imx_spi.h" #include "sysemu/sysemu.h" #include "qemu/log.h"
hw/ssi/mss-spi.c +1 -0
@@ -24,6 +24,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ssi/mss-spi.h" #include "qemu/log.h" #include "qemu/module.h"
hw/ssi/omap_spi.c +2 -0
@@ -19,9 +19,11 @@* with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "qemu/osdep.h" #include "qemu/log.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" /* Multichannel SPI */
hw/ssi/pl022.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/ssi/pl022.h" #include "hw/ssi/ssi.h" #include "qemu/log.h"
hw/ssi/xilinx_spi.c +1 -0
@@ -31,6 +31,7 @@#include "qemu/module.h" #include "qemu/fifo8.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #ifdef XILINX_SPI_ERR_DEBUG
hw/ssi/xilinx_spips.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/module.h"
hw/timer/a9gtimer.c +1 -0
@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/timer/a9gtimer.h" #include "qapi/error.h" #include "qemu/timer.h"
hw/timer/allwinner-a10-pit.c +1 -0
@@ -16,6 +16,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "hw/timer/allwinner-a10-pit.h"
hw/timer/altera_timer.c +1 -0
@@ -24,6 +24,7 @@#include "hw/sysbus.h" #include "sysemu/sysemu.h" +#include "hw/irq.h" #include "hw/ptimer.h" #define R_STATUS 0
hw/timer/arm_mptimer.c +1 -0
@@ -20,6 +20,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "hw/timer/arm_mptimer.h" #include "qapi/error.h"
hw/timer/arm_timer.c +1 -0
@@ -11,6 +11,7 @@#include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/qdev.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" #include "qemu/module.h"
hw/timer/armv7m_systick.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "hw/timer/armv7m_systick.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "qemu/log.h"
hw/timer/aspeed_timer.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/timer/aspeed_timer.h" #include "qemu/bitops.h"
hw/timer/cadence_ttc.c +1 -0
@@ -17,6 +17,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "qemu/timer.h"
hw/timer/cmsdk-apb-dualtimer.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/registerfields.h" #include "hw/timer/cmsdk-apb-dualtimer.h"
hw/timer/cmsdk-apb-timer.c +1 -0
@@ -34,6 +34,7 @@#include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/registerfields.h" #include "hw/timer/cmsdk-apb-timer.h"
hw/timer/etraxfs_timer.c +1 -0
@@ -28,6 +28,7 @@#include "sysemu/sysemu.h" #include "qemu/module.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/ptimer.h" #define D (x)
hw/timer/exynos4210_mct.c +1 -0
@@ -61,6 +61,7 @@#include "hw/ptimer.h" #include "hw/arm/exynos4210.h" +#include "hw/irq.h" //#define DEBUG_MCT
hw/timer/exynos4210_pwm.c +1 -0
@@ -29,6 +29,7 @@#include "hw/ptimer.h" #include "hw/arm/exynos4210.h" +#include "hw/irq.h" //#define DEBUG_PWM
hw/timer/exynos4210_rtc.c +1 -0
@@ -35,6 +35,7 @@#include "hw/ptimer.h" #include "hw/hw.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "hw/arm/exynos4210.h"
hw/timer/grlib_gptimer.c +1 -0
@@ -26,6 +26,7 @@#include "hw/sparc/grlib.h" #include "hw/sysbus.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" #include "qemu/module.h"
hw/timer/hpet.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "ui/console.h" #include "qapi/error.h" #include "qemu/error-report.h"
hw/timer/i8254.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/module.h" #include "qemu/timer.h" #include "hw/timer/i8254.h"
hw/timer/imx_epit.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/osdep.h" #include "hw/timer/imx_epit.h" +#include "hw/irq.h" #include "hw/misc/imx_ccm.h" #include "qemu/main-loop.h" #include "qemu/module.h"
hw/timer/imx_gpt.c +1 -0
@@ -13,6 +13,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/timer/imx_gpt.h" #include "qemu/main-loop.h" #include "qemu/module.h"
hw/timer/lm32_timer.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "qemu/timer.h"
hw/timer/m48t59.c +1 -0
@@ -26,6 +26,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/timer/m48t59.h" #include "qemu/timer.h" #include "sysemu/sysemu.h"
hw/timer/mc146818rtc.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/module.h" #include "qemu/bcd.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/replay.h"
hw/timer/milkymist-sysctl.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "trace.h"
hw/timer/mss-timer.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/log.h" +#include "hw/irq.h" #include "hw/timer/mss-timer.h" #ifndef MSS_TIMER_ERR_DEBUG
hw/timer/nrf51_timer.c +1 -0
@@ -15,6 +15,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "hw/arm/nrf51.h" +#include "hw/irq.h" #include "hw/timer/nrf51_timer.h" #include "trace.h"
hw/timer/omap_gptimer.c +2 -0
@@ -17,8 +17,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/>. */ +#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "hw/arm/omap.h"
hw/timer/pl031.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/timer/pl031.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "sysemu/sysemu.h"
hw/timer/puv3_ost.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" #include "qemu/module.h"
hw/timer/pxa2xx_timer.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/arm/pxa.h"
hw/timer/sh_timer.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sh4/sh.h" #include "qemu/timer.h" #include "qemu/main-loop.h"
hw/timer/slavio_timer.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "hw/sysbus.h" #include "trace.h"
hw/timer/stm32f2xx_timer.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/timer/stm32f2xx_timer.h" #include "qemu/log.h" #include "qemu/module.h"
hw/timer/twl92230.c +1 -0
@@ -24,6 +24,7 @@#include "hw/hw.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "migration/qemu-file-types.h" #include "sysemu/sysemu.h" #include "ui/console.h"
hw/timer/xilinx_timer.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/main-loop.h"
hw/timer/xlnx-zynqmp-rtc.c +1 -0
@@ -31,6 +31,7 @@#include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/cutils.h" #include "sysemu/sysemu.h"
hw/tpm/tpm_tis.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "qapi/error.h" #include "qemu/module.h"
hw/unicore32/puv3.c +1 -0
@@ -20,6 +20,7 @@#undef DEBUG_PUV3#include "hw/unicore32/puv3.h" #include "hw/input/i8042.h" +#include "hw/irq.h" #define KERNEL_LOAD_ADDR 0x03000000#define KERNEL_MAX_SIZE 0x00800000/* Just a guess */
hw/usb/hcd-ehci.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/usb/ehci-regs.h" #include "hw/usb/hcd-ehci.h" #include "trace.h"
hw/usb/hcd-ohci.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h"
hw/vfio/platform.c +1 -0
@@ -29,6 +29,7 @@#include "qemu/queue.h" #include "hw/sysbus.h" #include "trace.h" +#include "hw/irq.h" #include "hw/platform-bus.h" #include "sysemu/kvm.h"
hw/virtio/virtio-mmio.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "standard-headers/linux/virtio_mmio.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h"
hw/watchdog/cmsdk-apb-watchdog.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/module.h" #include "sysemu/watchdog.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/registerfields.h" #include "hw/watchdog/cmsdk-apb-watchdog.h"
hw/xtensa/mx_pic.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/xtensa/mx_pic.h" #include "qemu/log.h"
hw/xtensa/pic_cpu.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/timer.h"
target/arm/helper.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/qemu-print.h" #include "exec/exec-all.h" #include <zlib.h> /* For crc32 */ +#include "hw/irq.h" #include "hw/semihosting/semihost.h" #include "sysemu/cpus.h" #include "sysemu/kvm.h"
target/arm/kvm.c +1 -0
@@ -27,6 +27,7 @@#include "exec/memattrs.h" #include "exec/address-spaces.h" #include "hw/boards.h" +#include "hw/irq.h" #include "qemu/log.h" const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
target/mips/cp0_timer.c +1 -0
@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/mips/cpudevs.h" #include "qemu/timer.h" #include "sysemu/kvm.h"
Signature · 1 line
2.21.0
PATCH v4 13/29 Clean up inclusion of exec/cpu-common.h
In reply to Markus Armbrustermigration/qemu-file.h neglects to include it even though it needs ram_addr_t. Fix that. Drop a few superfluous inclusions elsewhere.
--- include/hw/hw.h | 1 - include/hw/ppc/ppc4xx.h | 1 - include/migration/misc.h | 1 - include/sysemu/kvm_int.h | 1 - include/sysemu/memory_mapping.h | 1 - migration/migration.h | 1 - migration/qemu-file.h | 1 + accel/stubs/tcg-stub.c | 1 - balloon.c | 1 - hw/smbios/smbios.c | 1 - migration/qemu-file-channel.c | 1 - migration/vmstate-types.c | 1 - qom/cpu.c | 1 - tcg/optimize.c | 1 - tcg/tcg-common.c | 1 - tcg/tcg.c | 1 - 16 files changed, 1 insertion(+), 15 deletions(-)
include/hw/hw.h +0 -1
@@ -6,7 +6,6 @@#error Cannot include hw/hw.h from user emulation#endif -#include "exec/cpu-common.h" #include "qom/object.h" #include "exec/memory.h" #include "migration/vmstate.h"
include/hw/ppc/ppc4xx.h +0 -1
@@ -26,7 +26,6 @@#define PPC4XX_H #include "hw/ppc/ppc.h" -#include "exec/cpu-common.h" #include "exec/memory.h" /* PowerPC 4xx core initialization */
include/migration/misc.h +0 -1
@@ -14,7 +14,6 @@#ifndef MIGRATION_MISC_H #define MIGRATION_MISC_H -#include "exec/cpu-common.h" #include "qemu/notify.h" #include "qapi/qapi-types-net.h"
include/sysemu/kvm_int.h +0 -1
@@ -9,7 +9,6 @@#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/memory_mapping.h +0 -1
@@ -15,7 +15,6 @@#define MEMORY_MAPPING_H #include "qemu/queue.h" -#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/memory.h"
migration/migration.h +0 -1
@@ -16,7 +16,6 @@#include "qapi/qapi-types-migration.h" #include "qemu/thread.h" -#include "exec/cpu-common.h" #include "qemu/coroutine_int.h" #include "hw/qdev.h" #include "io/channel.h"
migration/qemu-file.h +1 -0
@@ -26,6 +26,7 @@#define MIGRATION_QEMU_FILE_H #include <zlib.h> +#include "exec/cpu-common.h" /* Read a chunk of data from a file at the given position. The pos argument * can be ignored if the file is only be used for streaming. The number of
accel/stubs/tcg-stub.c +0 -1
@@ -14,7 +14,6 @@#include "qemu-common.h" #include "cpu.h" #include "tcg/tcg.h" -#include "exec/cpu-common.h" #include "exec/exec-all.h" void tb_flush (CPUState *cpu)
balloon.c +0 -1
@@ -26,7 +26,6 @@#include "qemu/osdep.h" #include "qemu/atomic.h" -#include "exec/cpu-common.h" #include "sysemu/kvm.h" #include "sysemu/balloon.h" #include "trace-root.h"
hw/smbios/smbios.c +0 -1
@@ -28,7 +28,6 @@#include "hw/firmware/smbios.h" #include "hw/loader.h" #include "hw/boards.h" -#include "exec/cpu-common.h" #include "smbios_build.h" /* legacy structures and constants for <= 2.0 machines */
migration/qemu-file-channel.c +0 -1
@@ -24,7 +24,6 @@#include "qemu/osdep.h" #include "qemu-file-channel.h" -#include "exec/cpu-common.h" #include "qemu-file.h" #include "io/channel-socket.h" #include "qemu/iov.h"
migration/vmstate-types.c +0 -1
@@ -11,7 +11,6 @@*/ #include "qemu/osdep.h" -#include "exec/cpu-common.h" #include "qemu-file.h" #include "migration.h" #include "migration/vmstate.h"
qom/cpu.c +0 -1
@@ -25,7 +25,6 @@#include "qemu/notify.h" #include "qemu/log.h" #include "exec/log.h" -#include "exec/cpu-common.h" #include "qemu/error-report.h" #include "qemu/qemu-print.h" #include "sysemu/sysemu.h"
tcg/optimize.c +0 -1
@@ -24,7 +24,6 @@*/ #include "qemu/osdep.h" -#include "exec/cpu-common.h" #include "tcg-op.h" #define CASE_OP_32_64 (x) \
tcg/tcg-common.c +0 -1
@@ -23,7 +23,6 @@*/ #include "qemu/osdep.h" -#include "exec/cpu-common.h" #include "tcg/tcg.h" #if defined(CONFIG_TCG_INTERPRETER )
tcg/tcg.c +0 -1
@@ -42,7 +42,6 @@#define NO_CPU_IO_DEFS #include "cpu.h" -#include "exec/cpu-common.h" #include "exec/exec-all.h" #if !defined(CONFIG_USER_ONLY )
Signature · 1 line
2.21.0
PATCH v4 14/29 migration: Move the VMStateDescription typedef to typedefs.h
In reply to Markus ArmbrusterWe declare incomplete struct VMStateDescription in a couple of places so we don't have to include migration/vmstate.h for the typedef. That's fine with me. However, the next commit will drop migration/vmstate.h from a massive number of compiles. Move the typedef to qemu/typedefs.h now, so I don't have to insert struct in front of VMStateDescription all over the place then.
--- include/hw/qdev-core.h | 6 ++---- include/migration/vmstate.h | 1 - include/qemu/typedefs.h | 1 + include/qom/cpu.h | 4 ++-- target/alpha/cpu.h | 2 +- target/arm/cpu.h | 2 +- target/cris/cpu.h | 2 +- target/hppa/cpu.h | 2 +- target/i386/cpu.h | 2 +- target/lm32/cpu.h | 2 +- target/mips/internal.h | 2 +- target/openrisc/cpu.h | 2 +- target/ppc/cpu-qom.h | 2 +- target/ppc/cpu.h | 2 +- target/s390x/cpu.h | 2 +- target/sparc/cpu.h | 2 +- 16 files changed, 17 insertions(+), 19 deletions(-)
include/hw/qdev-core.h +2 -4
@@ -35,8 +35,6 @@ typedef void (*DeviceReset)(DeviceState *dev);typedef void (*BusRealize )(BusState *bus,Error **errp);typedef void (*BusUnrealize )(BusState *bus,Error **errp); -struct VMStateDescription ; -/** * DeviceClass: * @props: Properties accessing state fields.
@@ -112,7 +110,7 @@ typedef struct DeviceClass {DeviceUnrealize unrealize;/* device state */ -const struct VMStateDescription *vmsd; +const VMStateDescription *vmsd;/* Private to qdev / bus. */ const char *bus_type;
@@ -425,7 +423,7 @@ void device_class_set_parent_unrealize(DeviceClass *dc,DeviceUnrealize dev_unrealize, DeviceUnrealize *parent_unrealize); -const struct VMStateDescription *qdev_get_vmsd (DeviceState *dev); +const VMStateDescription *qdev_get_vmsd (DeviceState *dev);const char *qdev_fw_name (DeviceState *dev);
include/migration/vmstate.h +0 -1
@@ -28,7 +28,6 @@#define QEMU_VMSTATE_H typedef struct VMStateInfo VMStateInfo ; -typedef struct VMStateDescription VMStateDescription ;typedef struct VMStateField VMStateField ;/* VMStateInfo allows customized migration of objects that don't fit in
include/qemu/typedefs.h +1 -0
@@ -101,6 +101,7 @@ typedef struct SHPCDevice SHPCDevice;typedef struct SSIBus SSIBus ;typedef struct VirtIODevice VirtIODevice ;typedef struct Visitor Visitor ; +typedef struct VMStateDescription VMStateDescription ;/* * Pointer types
include/qom/cpu.h +2 -2
@@ -215,7 +215,7 @@ typedef struct CPUClass {int (*write_elf32_qemunote)(WriteCoreDumpFunction f,CPUState *cpu,void *opaque); -const struct VMStateDescription *vmsd; +const VMStateDescription *vmsd;const char *gdb_core_xml_file; gchar * (*gdb_arch_name)(CPUState *cpu);const char * (*gdb_get_dynamic_xml)(CPUState *cpu,const char *xmlname);
@@ -1108,7 +1108,7 @@ bool target_words_bigendian(void);#ifdef NEED_CPU_H #ifdef CONFIG_SOFTMMU -extern const struct VMStateDescription vmstate_cpu_common; +extern const VMStateDescription vmstate_cpu_common;#else #define vmstate_cpu_common vmstate_dummy#endif
target/alpha/cpu.h +1 -1
@@ -277,7 +277,7 @@ struct AlphaCPU {#ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_alpha_cpu; +extern const VMStateDescription vmstate_alpha_cpu;#endif void alpha_cpu_do_interrupt (CPUState *cpu);
target/arm/cpu.h +1 -1
@@ -922,7 +922,7 @@ void arm_cpu_post_init(Object *obj);uint64_t arm_cpu_mp_affinity (int idx,uint8_t clustersz);#ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_arm_cpu; +extern const VMStateDescription vmstate_arm_cpu;#endif void arm_cpu_do_interrupt (CPUState *cpu);
target/cris/cpu.h +1 -1
@@ -183,7 +183,7 @@ struct CRISCPU {#ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_cris_cpu; +extern const VMStateDescription vmstate_cris_cpu;#endif void cris_cpu_do_interrupt (CPUState *cpu);
target/hppa/cpu.h +1 -1
@@ -334,7 +334,7 @@ bool hppa_cpu_tlb_fill(CPUState *cs, vaddr address, int size,int hppa_get_physical_address (CPUHPPAState *env,vaddr addr,int mmu_idx,int type,hwaddr *pphys,int *pprot);extern const MemoryRegionOps hppa_io_eir_ops; -extern const struct VMStateDescription vmstate_hppa_cpu; +extern const VMStateDescription vmstate_hppa_cpu;void hppa_cpu_alarm_timer (void *);int hppa_artype_for_page (CPUHPPAState *env,target_ulong vaddr);#endif
target/i386/cpu.h +1 -1
@@ -1516,7 +1516,7 @@ struct X86CPU {#ifndef CONFIG_USER_ONLY -extern struct VMStateDescription vmstate_x86_cpu; +extern VMStateDescription vmstate_x86_cpu;#endif /**
target/lm32/cpu.h +1 -1
@@ -195,7 +195,7 @@ struct LM32CPU {#ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_lm32_cpu; +extern const VMStateDescription vmstate_lm32_cpu;#endif void lm32_cpu_do_interrupt (CPUState *cpu);
target/mips/internal.h +1 -1
@@ -148,7 +148,7 @@ hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address,#define cpu_signal_handler cpu_mips_signal_handler#ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_mips_cpu; +extern const VMStateDescription vmstate_mips_cpu;#endif static inline bool cpu_mips_hw_interrupts_enabled (CPUMIPSState *env)
target/openrisc/cpu.h +1 -1
@@ -333,7 +333,7 @@ int print_insn_or1k(bfd_vma addr, disassemble_info *info);#define cpu_signal_handler cpu_openrisc_signal_handler#ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_openrisc_cpu; +extern const VMStateDescription vmstate_openrisc_cpu;/* hw/openrisc_pic.c */ void cpu_openrisc_pic_init (OpenRISCCPU *cpu);
target/ppc/cpu-qom.h +1 -1
@@ -203,7 +203,7 @@ typedef struct PPCTimebase {int64_t time_of_the_day_ns; } PPCTimebase; -extern const struct VMStateDescription vmstate_ppc_timebase; +extern const VMStateDescription vmstate_ppc_timebase;#define VMSTATE_PPC_TIMEBASE_V (_field, _state, _version) { \ .name = (stringify(_field)), \
target/ppc/cpu.h +1 -1
@@ -1255,7 +1255,7 @@ int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, void *opaque);#ifndef CONFIG_USER_ONLY void ppc_cpu_do_system_reset (CPUState *cs); -extern const struct VMStateDescription vmstate_ppc_cpu; +extern const VMStateDescription vmstate_ppc_cpu;#endif /*****************************************************************************/
target/s390x/cpu.h +1 -1
@@ -163,7 +163,7 @@ struct S390CPU {#ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_s390_cpu; +extern const VMStateDescription vmstate_s390_cpu;#endif /* distinguish between 24 bit and 31 bit addressing */
target/sparc/cpu.h +1 -1
@@ -532,7 +532,7 @@ struct SPARCCPU {#ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_sparc_cpu; +extern const VMStateDescription vmstate_sparc_cpu;#endif void sparc_cpu_do_interrupt (CPUState *cpu);
Signature · 1 line
2.21.0