| Message ID | 1463659953-56256-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 19 May 2016 at 13:12, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit 8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3: > > Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging (2016-05-19 09:27:28 +0100) > > are available in the git repository at: > > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 944d7770b4f4c1807c154b0a4f00ea19932c1a27: > > hw: clean up hw/hw.h includes (2016-05-19 14:10:46 +0200) > > ---------------------------------------------------------------- > NEED_CPU_H cleanups, big enough to deserve their own pull request. Fails to build with clang, which doesn't like multiple identical typedef definitions: In file included from /home/petmay01/linaro/qemu-for-merges/cpu-exec.c:23: In file included from /home/petmay01/linaro/qemu-for-merges/include/exec/exec-all.h:24: /home/petmay01/linaro/qemu-for-merges/include/exec/tb-context.h:31:26: error: redefinition of typedef 'TBContext' is a C11 feature [-Werror,-Wtypedef-redefinition] typedef struct TBContext TBContext; ^ /home/petmay01/linaro/qemu-for-merges/include/exec/tb-context.h:29:26: note: previous definition is here typedef struct TBContext TBContext; ^ 1 error generated. thanks -- PMM
The following changes since commit 8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3: Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging (2016-05-19 09:27:28 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 944d7770b4f4c1807c154b0a4f00ea19932c1a27: hw: clean up hw/hw.h includes (2016-05-19 14:10:46 +0200) ---------------------------------------------------------------- NEED_CPU_H cleanups, big enough to deserve their own pull request. ---------------------------------------------------------------- Paolo Bonzini (52): scripts: add script to build QEMU and analyze inclusions s390x: move .needed functions for subsections to machine.c include: move CPU-related definitions out of qemu-common.h log: do not use CONFIG_USER_ONLY cpu: make cpu-qom.h only include-able from cpu.h target-alpha: make cpu-qom.h not target specific target-arm: make cpu-qom.h not target specific target-cris: make cpu-qom.h not target specific target-i386: make cpu-qom.h not target specific target-lm32: make cpu-qom.h not target specific target-m68k: make cpu-qom.h not target specific target-microblaze: make cpu-qom.h not target specific target-mips: make cpu-qom.h not target specific target-ppc: do not use target_ulong in cpu-qom.h target-ppc: do not make PowerPCCPUClass depend on target-specific symbols target-ppc: make cpu-qom.h not target specific target-s390x: make cpu-qom.h not target specific target-sh4: make cpu-qom.h not target specific target-sparc: make cpu-qom.h not target specific target-tricore: make cpu-qom.h not target specific target-unicore32: make cpu-qom.h not target specific target-xtensa: make cpu-qom.h not target specific arm: include cpu-qom.h in files that require ARMCPU m68k: include cpu-qom.h in files that require M68KCPU sh4: include cpu-qom.h in files that require SuperHCPU alpha: include cpu-qom.h in files that require AlphaCPU mips: use MIPSCPU instead of CPUMIPSState ppc: use PowerPCCPU instead of CPUPPCState arm: remove useless cpu.h inclusion explicitly include qom/cpu.h explicitly include hw/qdev-core.h explicitly include linux/kvm.h apic: move target-dependent definitions to cpu.h include: poison symbols in osdep.h hw: do not use VMSTATE_*TL hw: move CPU state serialization to migration/cpu.h hw: cannot include hw/hw.h from user emulation cpu: move endian-dependent load/store functions to cpu-all.h qemu-common: stop including qemu/bswap.h from qemu-common.h qemu-common: stop including qemu/host-utils.h from qemu-common.h gdbstub: remove unnecessary includes from gdbstub-xml.c dma: do not depend on kvm_enabled() s390x: reorganize CSS bits between cpu.h and other headers acpi: do not use TARGET_PAGE_SIZE qemu-common: push cpu.h inclusion out of qemu-common.h arm: move arm_log_exception into .c file mips: move CP0 functions out of cpu.h hw: explicitly include qemu/log.h exec: extract exec/tb-context.h cpu: move exec-all.h inclusion out of cpu.h hw: remove pio_addr_t hw: clean up hw/hw.h includes arch_init.c | 2 + audio/mixeng.c | 1 + audio/noaudio.c | 1 + audio/spiceaudio.c | 1 + audio/wavaudio.c | 2 +- block/bochs.c | 1 + block/cloop.c | 1 + block/parallels.c | 1 + block/qcow.c | 1 + block/qcow2-cluster.c | 1 + block/qcow2-refcount.c | 1 + block/qcow2-snapshot.c | 1 + block/qcow2.c | 1 + block/qed-table.c | 1 + block/qed.c | 1 + block/vdi.c | 1 + block/vhdx-endian.c | 1 + block/vhdx-log.c | 1 + block/vhdx.c | 1 + block/vmdk.c | 1 + block/vpc.c | 1 + block/vvfat.c | 1 + bootdevice.c | 1 + bsd-user/main.c | 2 + bsd-user/qemu.h | 1 + contrib/ivshmem-server/ivshmem-server.c | 1 + cpu-exec-common.c | 1 + cpu-exec.c | 1 + cpus.c | 4 +- cputlb.c | 1 + crypto/afsplit.c | 1 + crypto/block-luks.c | 1 + device_tree.c | 1 + disas/tci.c | 1 + exec.c | 25 ++-- gdbstub.c | 3 +- hw/acpi/core.c | 6 + hw/acpi/nvdimm.c | 22 ++-- hw/acpi/piix4.c | 1 + hw/alpha/alpha_sys.h | 1 + hw/alpha/pci.c | 1 - hw/arm/ast2400.c | 1 + hw/arm/collie.c | 1 + hw/arm/nseries.c | 3 + hw/arm/palmetto-bmc.c | 1 + hw/arm/pxa2xx_gpio.c | 2 + hw/arm/stellaris.c | 1 + hw/arm/stm32f205_soc.c | 1 - hw/arm/strongarm.c | 1 + hw/arm/strongarm.h | 1 + hw/arm/xlnx-ep108.c | 1 + hw/audio/pl041.c | 1 + hw/block/hd-geometry.c | 1 + hw/block/m25p80.c | 1 + hw/block/pflash_cfi01.c | 1 + hw/bt/hci-csr.c | 1 + hw/bt/l2cap.c | 1 + hw/bt/sdp.c | 1 + hw/char/bcm2835_aux.c | 1 + hw/char/cadence_uart.c | 4 + hw/char/digic-uart.c | 1 + hw/char/imx_serial.c | 1 + hw/char/pl011.c | 1 + hw/char/stm32f2xx_usart.c | 1 + hw/core/Makefile.objs | 2 +- hw/core/nmi.c | 5 + hw/core/sysbus.c | 4 +- hw/cpu/a9mpcore.c | 1 + hw/display/bcm2835_fb.c | 1 + hw/display/cg3.c | 2 + hw/display/pl110.c | 1 + hw/display/tc6393xb.c | 1 + hw/display/virtio-gpu.c | 1 + hw/dma/bcm2835_dma.c | 1 + hw/dma/pl080.c | 1 + hw/dma/pl330.c | 1 + hw/dma/rc4030.c | 1 + hw/gpio/gpio_key.c | 1 + hw/gpio/imx_gpio.c | 1 + hw/gpio/pl061.c | 1 + hw/i2c/imx_i2c.c | 1 + hw/i2c/versatile_i2c.c | 1 + hw/i386/kvm/apic.c | 2 + hw/i386/kvm/clock.c | 1 + hw/i386/kvm/i8254.c | 1 + hw/i386/kvm/pci-assign.c | 1 + hw/i386/kvmvapic.c | 3 + hw/input/pl050.c | 1 + hw/intc/allwinner-a10-pic.c | 1 + hw/intc/apic.c | 2 + hw/intc/apic_common.c | 2 + hw/intc/arm_gic.c | 1 + hw/intc/arm_gic_kvm.c | 2 + hw/intc/arm_gicv2m.c | 2 + hw/intc/armv7m_nvic.c | 2 + hw/intc/bcm2835_ic.c | 1 + hw/intc/bcm2836_control.c | 1 + hw/intc/i8259.c | 1 + hw/intc/imx_avic.c | 1 + hw/intc/ioapic.c | 1 + hw/intc/openpic.c | 1 + hw/intc/openpic_kvm.c | 2 + hw/intc/pl190.c | 1 + hw/intc/s390_flic_kvm.c | 2 + hw/intc/xics_kvm.c | 1 + hw/isa/lpc_ich9.c | 1 + hw/mips/cps.c | 7 +- hw/mips/cputimer.c | 4 +- hw/mips/mips_fulong2e.c | 4 +- hw/mips/mips_int.c | 3 +- hw/mips/mips_jazz.c | 4 +- hw/mips/mips_malta.c | 5 +- hw/mips/mips_mipssim.c | 4 +- hw/mips/mips_r4k.c | 4 +- hw/misc/arm11scu.c | 1 + hw/misc/arm_integrator_debug.c | 1 + hw/misc/arm_l2x0.c | 1 + hw/misc/arm_sysctl.c | 1 + hw/misc/bcm2835_mbox.c | 1 + hw/misc/bcm2835_property.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 | 1 + hw/misc/imx_ccm.c | 1 + hw/misc/macio/cuda.c | 1 + hw/misc/macio/mac_dbdma.c | 1 + hw/misc/mips_cmgcr.c | 1 + hw/misc/mips_cpc.c | 2 + hw/misc/mips_itu.c | 3 + hw/misc/pci-testdev.c | 1 + hw/misc/stm32f2xx_syscfg.c | 1 + hw/misc/zynq-xadc.c | 1 + hw/misc/zynq_slcr.c | 1 + hw/net/allwinner_emac.c | 1 + hw/net/fsl_etsec/etsec.c | 1 + hw/net/fsl_etsec/rings.c | 2 +- hw/net/imx_fec.c | 1 + hw/net/lan9118.c | 1 + hw/net/spapr_llan.c | 9 +- hw/pci-host/apb.c | 1 + hw/pci-host/versatile.c | 1 + hw/ppc/e500plat.c | 1 + hw/ppc/ppc.c | 20 +-- hw/ppc/ppc4xx_devs.c | 1 + hw/ppc/prep.c | 1 + hw/ppc/spapr.c | 1 + hw/ppc/spapr_hcall.c | 3 + hw/ppc/spapr_iommu.c | 1 + hw/ppc/spapr_pci.c | 1 + hw/ppc/spapr_rtas.c | 2 + hw/ppc/spapr_vio.c | 3 +- hw/ppc/virtex_ml507.c | 1 + hw/s390x/css.c | 4 +- hw/s390x/s390-skeys.c | 1 + hw/s390x/s390-virtio-ccw.c | 4 +- hw/s390x/virtio-ccw.c | 5 +- hw/s390x/virtio-ccw.h | 3 +- hw/sd/pl181.c | 1 + hw/sd/sd.c | 1 + hw/sd/sdhci.c | 1 + hw/sh4/sh7750.c | 1 + hw/ssi/imx_spi.c | 1 + hw/ssi/pl022.c | 1 + hw/timer/allwinner-a10-pit.c | 1 + hw/timer/arm_timer.c | 1 + hw/timer/digic-timer.c | 1 + hw/timer/imx_epit.c | 1 + hw/timer/imx_gpt.c | 1 + hw/timer/pl031.c | 1 + hw/timer/stm32f2xx_timer.c | 1 + hw/vfio/common.c | 3 + hw/watchdog/wdt_diag288.c | 1 + hw/xtensa/pic_cpu.c | 1 + include/disas/disas.h | 2 + include/exec/cpu-all.h | 25 ++++ include/exec/cpu-common.h | 14 --- include/exec/cpu-defs.h | 1 + include/exec/exec-all.h | 54 +------- include/exec/gdbstub.h | 2 + include/exec/helper-head.h | 23 ++-- include/exec/hwaddr.h | 2 + include/exec/ioport.h | 19 +-- include/exec/memory.h | 17 --- include/exec/poison.h | 8 -- include/exec/tb-context.h | 46 +++++++ include/hw/acpi/acpi.h | 7 -- include/hw/arm/arm.h | 2 +- include/hw/arm/digic.h | 1 - include/hw/arm/exynos4210.h | 1 + include/hw/arm/fsl-imx6.h | 1 + include/hw/arm/omap.h | 1 + include/hw/arm/pxa.h | 1 + include/hw/arm/virt-acpi-build.h | 1 + include/hw/arm/virt.h | 1 + include/hw/hw.h | 60 +-------- include/hw/i386/apic.h | 5 - include/hw/isa/isa.h | 2 +- include/hw/m68k/mcf.h | 2 + include/hw/mips/cpudevs.h | 7 +- include/hw/ppc/openpic.h | 3 +- include/hw/ppc/ppc.h | 24 ++-- include/hw/ppc/spapr_vio.h | 2 +- {hw => include/hw}/s390x/css.h | 31 ++++- {target-s390x => include/hw/s390x}/ioinst.h | 16 +-- include/hw/sd/sd.h | 2 + include/hw/sh4/sh.h | 1 + include/hw/sysbus.h | 4 +- include/hw/xen/xen.h | 7 +- include/migration/cpu.h | 48 +++++++ include/qemu-common.h | 32 ----- include/qemu/log.h | 17 +-- include/qemu/osdep.h | 2 + include/qemu/timer.h | 1 + include/qom/cpu.h | 19 +++ include/sysemu/cpus.h | 13 ++ include/sysemu/dma.h | 5 +- include/sysemu/kvm.h | 1 + io/channel-websock.c | 1 + ioport.c | 14 ++- kvm-stub.c | 1 - linux-user/main.c | 2 + linux-user/qemu.h | 1 + memory.c | 2 + migration/ram.c | 2 + migration/savevm.c | 1 + monitor.c | 4 + nbd/nbd-internal.h | 1 + page_cache.c | 1 + qemu-nbd.c | 1 + qtest.c | 2 + scripts/analyze-inclusions | 102 +++++++++++++++ scripts/create_config | 2 +- scripts/feature_to_c.sh | 2 - scripts/tracetool/format/tcg_helper_c.py | 1 + slirp/slirp.h | 1 + stubs/cpu-get-icount.c | 1 + stubs/slirp.c | 1 + target-alpha/cpu-qom.h | 41 +----- target-alpha/cpu.c | 1 + target-alpha/cpu.h | 44 ++++++- target-alpha/fpu_helper.c | 1 + target-alpha/gdbstub.c | 1 + target-alpha/helper.c | 1 + target-alpha/int_helper.c | 1 + target-alpha/machine.c | 3 + target-alpha/mem_helper.c | 1 + target-alpha/sys_helper.c | 1 + target-alpha/translate.c | 1 + target-alpha/vax_helper.c | 1 + target-arm/arm-powerctl.c | 2 + target-arm/arm_ldst.h | 1 + target-arm/cpu-qom.h | 178 +------------------------- target-arm/cpu.c | 1 + target-arm/cpu.h | 181 +++++++++++++++++++++++++- target-arm/gdbstub.c | 1 + target-arm/gdbstub64.c | 1 + target-arm/helper-a64.c | 1 + target-arm/helper.c | 16 +++ target-arm/internals.h | 15 --- target-arm/kvm-stub.c | 1 + target-arm/kvm.c | 1 + target-arm/kvm32.c | 3 +- target-arm/kvm64.c | 2 +- target-arm/machine.c | 3 + target-arm/op_helper.c | 1 + target-arm/psci.c | 2 +- target-arm/translate-a64.c | 1 + target-arm/translate.c | 1 + target-cris/cpu-qom.h | 40 +----- target-cris/cpu.c | 1 + target-cris/cpu.h | 43 ++++++- target-cris/gdbstub.c | 1 + target-cris/helper.c | 1 + target-cris/machine.c | 3 + target-cris/mmu.c | 1 + target-cris/op_helper.c | 1 + target-cris/translate.c | 1 + target-i386/bpt_helper.c | 1 + target-i386/cpu-qom.h | 98 +-------------- target-i386/cpu.c | 3 +- target-i386/cpu.h | 107 +++++++++++++++- target-i386/excp_helper.c | 1 + target-i386/fpu_helper.c | 1 + target-i386/gdbstub.c | 1 + target-i386/helper.c | 1 + target-i386/int_helper.c | 1 + target-i386/kvm-stub.c | 1 + target-i386/kvm.c | 2 +- target-i386/machine.c | 6 + target-i386/mem_helper.c | 1 + target-i386/misc_helper.c | 1 + target-i386/mpx_helper.c | 1 + target-i386/seg_helper.c | 1 + target-i386/svm_helper.c | 1 + target-i386/translate.c | 1 + target-lm32/cpu-qom.h | 42 +------ target-lm32/cpu.c | 1 + target-lm32/cpu.h | 46 ++++++- target-lm32/gdbstub.c | 1 + target-lm32/helper.c | 1 + target-lm32/machine.c | 3 + target-lm32/op_helper.c | 1 + target-lm32/translate.c | 1 + target-m68k/cpu-qom.h | 34 +---- target-m68k/cpu.c | 1 + target-m68k/cpu.h | 38 +++++- target-m68k/gdbstub.c | 1 + target-m68k/helper.c | 1 + target-m68k/m68k-semi.c | 1 + target-m68k/op_helper.c | 1 + target-m68k/translate.c | 1 + target-microblaze/cpu-qom.h | 44 +------ target-microblaze/cpu.c | 1 + target-microblaze/cpu.h | 47 ++++++- target-microblaze/gdbstub.c | 1 + target-microblaze/helper.c | 1 + target-microblaze/mmu.c | 1 + target-microblaze/op_helper.c | 1 + target-microblaze/translate.c | 1 + target-mips/cpu-qom.h | 37 +----- target-mips/cpu.c | 1 + target-mips/cpu.h | 171 +++++++------------------ target-mips/gdbstub.c | 1 + target-mips/helper.c | 126 +++++++++++++++++++ target-mips/kvm.c | 2 +- target-mips/machine.c | 4 +- target-mips/mips-semi.c | 1 + target-mips/msa_helper.c | 1 + target-mips/op_helper.c | 1 + target-mips/translate.c | 1 + target-moxie/cpu.c | 1 + target-moxie/cpu.h | 1 - target-moxie/machine.c | 3 + target-openrisc/cpu.c | 1 + target-openrisc/cpu.h | 2 - target-openrisc/exception.c | 1 + target-openrisc/gdbstub.c | 1 + target-openrisc/interrupt.c | 1 + target-openrisc/interrupt_helper.c | 1 + target-openrisc/machine.c | 3 + target-openrisc/mmu.c | 1 + target-openrisc/mmu_helper.c | 1 + target-openrisc/sys_helper.c | 1 + target-ppc/cpu-qom.h | 167 +++++++++++++++--------- target-ppc/cpu.h | 166 ++++++++---------------- target-ppc/excp_helper.c | 1 + target-ppc/gdbstub.c | 1 + target-ppc/int_helper.c | 1 + target-ppc/kvm-stub.c | 1 + target-ppc/kvm.c | 2 +- target-ppc/machine.c | 5 + target-ppc/mem_helper.c | 2 + target-ppc/misc_helper.c | 1 + target-ppc/mmu-hash32.c | 3 +- target-ppc/mmu-hash32.h | 2 +- target-ppc/mmu-hash64.c | 3 +- target-ppc/mmu-hash64.h | 2 +- target-ppc/mmu_helper.c | 1 + target-ppc/timebase_helper.c | 1 + target-ppc/translate.c | 1 + target-ppc/translate_init.c | 92 ++++++-------- target-s390x/cc_helper.c | 1 + target-s390x/cpu-qom.h | 46 +------ target-s390x/cpu.c | 4 +- target-s390x/cpu.h | 188 ++++++++++------------------ target-s390x/fpu_helper.c | 1 + target-s390x/gdbstub.c | 2 + target-s390x/helper.c | 2 + target-s390x/int_helper.c | 1 + target-s390x/interrupt.c | 66 +++++++++- target-s390x/ioinst.c | 2 +- target-s390x/kvm.c | 2 +- target-s390x/machine.c | 20 +++ target-s390x/mem_helper.c | 4 + target-s390x/misc_helper.c | 3 +- target-s390x/translate.c | 1 + target-sh4/cpu-qom.h | 31 +---- target-sh4/cpu.c | 1 + target-sh4/cpu.h | 34 ++++- target-sh4/gdbstub.c | 1 + target-sh4/helper.c | 1 + target-sh4/op_helper.c | 1 + target-sh4/translate.c | 1 + target-sparc/cpu-qom.h | 38 +----- target-sparc/cpu.c | 1 + target-sparc/cpu.h | 40 +++++- target-sparc/gdbstub.c | 1 + target-sparc/helper.c | 1 + target-sparc/ldst_helper.c | 1 + target-sparc/machine.c | 6 + target-sparc/mmu_helper.c | 1 + target-sparc/translate.c | 1 + target-tilegx/cpu.c | 1 + target-tilegx/cpu.h | 2 - target-tilegx/helper.c | 1 + target-tilegx/translate.c | 1 + target-tricore/cpu-qom.h | 28 +---- target-tricore/cpu.c | 1 + target-tricore/cpu.h | 32 ++++- target-tricore/helper.c | 1 + target-tricore/op_helper.c | 1 + target-tricore/translate.c | 1 + target-unicore32/cpu-qom.h | 30 +---- target-unicore32/cpu.c | 1 + target-unicore32/cpu.h | 32 ++++- target-unicore32/helper.c | 1 + target-unicore32/op_helper.c | 1 + target-unicore32/softmmu.c | 1 + target-unicore32/translate.c | 1 + target-xtensa/cpu-qom.h | 39 +----- target-xtensa/cpu.c | 1 + target-xtensa/cpu.h | 38 +++++- target-xtensa/gdbstub.c | 2 + target-xtensa/op_helper.c | 1 + target-xtensa/translate.c | 1 + tcg/optimize.c | 3 +- tcg/tcg-common.c | 2 + tcg/tcg-op.c | 3 + tcg/tcg.c | 5 + tcg/tcg.h | 23 ++++ tests/ide-test.c | 1 + tests/libqos/malloc.c | 1 + translate-all.c | 1 + translate-common.c | 1 + ui/vnc-ws.c | 1 + user-exec.c | 1 + util/buffer.c | 1 + util/log.c | 12 +- vl.c | 2 + xen-hvm.c | 9 +- 431 files changed, 2099 insertions(+), 1615 deletions(-) create mode 100644 include/exec/tb-context.h rename {hw => include/hw}/s390x/css.h (76%) rename {target-s390x => include/hw/s390x}/ioinst.h (87%) create mode 100644 include/migration/cpu.h create mode 100644 scripts/analyze-inclusions