Accel & exec patches for 2024-12-20
Subsystems (16)
The following changes since commit 3e9793ab01904144c204589811e0e879109a9713:
Merge tag 'qga-pull-2024-12-18' of https://github.com/kostyanf14/qemu into staging (2024-12-18 20:24:59 -0500)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/exec-20241220
for you to fetch changes up to fc479101f5837dce6f6ebec6241388d6c1915597:
util/qemu-timer: fix indentation (2024-12-20 17:14:33 +0100)
----------------------------------------------------------------
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
Move a lot of declarations from these legacy mixed bag headers:
. "exec/cpu-all.h"
. "exec/cpu-common.h"
. "exec/cpu-defs.h"
. "exec/exec-all.h"
. "exec/translate-all"
to these more specific ones:
. "exec/page-protection.h"
. "exec/translation-block.h"
. "user/cpu_loop.h"
. "user/guest-host.h"
. "user/page-protection.h"----------------------------------------------------------------
Alex Bennée (1):
util/qemu-timer: fix indentation
Alexander Graf (1):
hvf: arm: Ignore writes to CNTP_CTL_EL0
Anton Johansson (1):
target/sparc: Uninline cpu_get_tb_cpu_state()
BALATON Zoltan (1):
log: Add separate debug option for logging invalid memory accesses
Peter Xu (7):
qom: Add TYPE_CONTAINER macro
qom: New object_property_add_new_container()
tests: Fix test-qdev-global-props on anonymous qdev realize()
tests: Explicitly create containers in test_qom_partial_path() ppc/e500: Avoid abuse of container_get()
hw/ppc: Explicitly create the drc container
qom: Create system containers explicitly
Philippe Mathieu-Daudé (48):
target/i386/sev: Reduce system specific declarations
include: Rename sysemu/ -> system/
system: Move 'exec/confidential-guest-support.h' to system/ tcg/tci: Include missing 'disas/dis-asm.h' header accel/tcg: Include missing 'exec/tswap.h' header in translator.c accel/tcg: Have tlb_vaddr_to_host() use vaddr type exec/cpu-all: Include missing 'exec/cpu-defs.h' header exec/cpu-defs: Remove unnecessary headers exec/translation-block: Include missing 'exec/vaddr.h' header linux-user/aarch64: Include missing 'user/abitypes.h' header
user: Introduce 'user/guest-host.h' header
target/arm/cpu: Restrict cpu_untagged_addr() to user emulation target/arm/mte: Restrict 'exec/ram_addr.h' to system emulation exec/ram_addr: Include missing 'exec/hwaddr.h' and 'exec/cpu-common.h'
include: Include missing 'qemu/clang-tsa.h' header accel/tcg: Declare mmap_[un]lock() in 'exec/page-protection.h' accel/tcg: Use tb_page_addr_t type in page_unprotect() accel/tcg: Move page_[un]protect() to 'user/page-protection.h'
system: Remove unnecessary 'exec/translate-all.h' include accel/tcg: Move 'exec/translate-all.h' -> 'tb-internal.h' accel/tcg: Un-inline log_pc()
accel/tcg: Move TranslationBlock declarations to 'tb-internal.h' accel/tcg: Really restrict cpu_io_recompile() to system emulation accel/tcg: Move user-related declarations out of 'exec/cpu-all.h'
(1/4)
accel/tcg: Move user-related declarations out of 'exec/cpu-all.h'
(2/4)
accel/tcg: Move user-related declarations out of 'exec/cpu-all.h'
(3/4)
accel/tcg: Move user-related declarations out of 'exec/cpu-all.h'
(4/4) user: Forward declare target_cpu_copy_regs structure
user: Move 'linux-user/cpu_loop-common.h' -> 'user/cpu_loop.h'
user: Declare cpu_loop() once in 'user/cpu_loop.h'
user: Move various declarations out of 'exec/exec-all.h' target/loongarch: Declare loongarch_cpu_dump_state() locally target/sparc: Move sparc_restore_state_to_opc() to cpu.c exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always
defined
accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h' exec/translation-block: Include missing 'qemu/atomic.h' header qemu/coroutine: Include missing 'qemu/atomic.h' header accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h' accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h' accel/tcg: Include missing 'exec/translation-block.h' header accel/tcg: Un-inline translator_is_same_page() target/xtensa: Remove tswap() calls in semihosting simcall() helper target/mips: Remove tswap() calls in semihosting uhi_fstat_cb() target/mips: Drop left-over comment about Jazz machine hw/xen: Remove unnecessary 'exec/cpu-common.h' header system/numa: Remove unnecessary 'exec/cpu-common.h' header system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header
meson: Do not define CONFIG_DEVICES on user emulation
MAINTAINERS | 76 +++++------
docs/specs/tpm.rst | 8 +-
meson.build | 3 +-
accel/kvm/kvm-cpus.h | 2 +-
accel/tcg/internal-common.h | 3 +
accel/tcg/internal-target.h | 48 +------
accel/tcg/tb-hash.h | 1 +
accel/tcg/tb-internal.h | 53 ++++++++
accel/tcg/tcg-accel-ops.h | 2 +-
backends/tpm/tpm_int.h | 2 +-
block/coroutines.h | 2 +-
block/export/virtio-blk-handler.h | 2 +-
bsd-user/aarch64/target_arch_cpu.h | 2 +-
bsd-user/arm/target_arch_cpu.h | 2 +-
bsd-user/bsd-mem.h | 1 +
bsd-user/i386/target_arch_cpu.h | 2 +-
bsd-user/qemu.h | 3 +-
bsd-user/riscv/target_arch_cpu.h | 2 +-
bsd-user/x86_64/target_arch_cpu.h | 2 +-
dump/win_dump.h | 2 +-
hw/acpi/hmat.h | 2 +-
hw/block/dataplane/xen-block.h | 2 +-
hw/tpm/tpm_prop.h | 2 +-
hw/tpm/tpm_tis.h | 2 +-
hw/usb/hcd-dwc2.h | 2 +-
hw/usb/hcd-ehci.h | 2 +-
hw/usb/hcd-ohci.h | 2 +-
hw/usb/hcd-xhci.h | 2 +-
hw/vfio/pci.h | 2 +-
include/block/block_int-common.h | 1 +
include/exec/cpu-all.h | 119 +-----------------
include/exec/cpu-common.h | 24 +++-
include/exec/cpu-defs.h | 8 --
include/exec/cpu_ldst.h | 50 +-------
include/exec/exec-all.h | 89 +------------
include/exec/page-protection.h | 24 ++++
include/exec/ram_addr.h | 7 +-
include/exec/translate-all.h | 33 -----
include/exec/translation-block.h | 5 +
include/exec/translator.h | 15 ++-
include/hw/acpi/tpm.h | 2 +-
include/hw/arm/allwinner-a10.h | 2 +-
include/hw/arm/allwinner-h3.h | 2 +-
include/hw/arm/allwinner-r40.h | 2 +-
include/hw/arm/virt.h | 2 +-
include/hw/boards.h | 4 +-
include/hw/core/sysemu-cpu-ops.h | 6 +-
include/hw/dma/xlnx-zdma.h | 2 +-
include/hw/dma/xlnx_dpdma.h | 2 +-
include/hw/hyperv/vmbus.h | 4 +-
include/hw/i386/hostmem-epc.h | 2 +-
include/hw/ide/ide-dev.h | 2 +-
include/hw/isa/superio.h | 2 +-
include/hw/nvram/fw_cfg.h | 2 +-
include/hw/nvram/xlnx-bbram.h | 2 +-
include/hw/nvram/xlnx-efuse.h | 2 +-
include/hw/pci/pci.h | 4 +-
include/hw/ppc/mac_dbdma.h | 2 +-
include/hw/ppc/spapr.h | 2 +-
include/hw/ppc/spapr_drc.h | 2 +-
include/hw/ppc/spapr_vio.h | 2 +-
include/hw/ppc/xive.h | 2 +-
include/hw/riscv/numa.h | 2 +-
include/hw/s390x/css.h | 2 +-
include/hw/s390x/s390-pci-inst.h | 2 +-
include/hw/tricore/triboard.h | 2 +-
include/hw/vfio/vfio-common.h | 6 +-
include/hw/virtio/virtio-balloon.h | 2 +-
include/hw/virtio/virtio-blk.h | 6 +-
include/hw/virtio/virtio-crypto.h | 4 +-
include/hw/virtio/virtio-gpu.h | 2 +-
include/hw/virtio/virtio-input.h | 2 +-
include/hw/virtio/virtio-iommu.h | 2 +-
include/hw/virtio/virtio-mem.h | 2 +-
include/hw/virtio/virtio-rng.h | 2 +-
include/hw/virtio/virtio-scsi.h | 2 +-
include/hw/xen/xen-block.h | 2 +-
include/hw/xen/xen-hvm-common.h | 8 +-
include/hw/xen/xen.h | 2 -
include/qemu/coroutine.h | 1 +
include/qemu/log.h | 1 +
include/qemu/main-loop.h | 2 +-
include/qemu/osdep.h | 8 +-
include/qom/object.h | 13 ++
include/{sysemu => system}/accel-blocker.h | 2 +-
include/{sysemu => system}/accel-ops.h | 2 +-
include/{sysemu => system}/arch_init.h | 0
include/{sysemu => system}/balloon.h | 0
.../{sysemu => system}/block-backend-common.h | 0
.../block-backend-global-state.h | 0
include/{sysemu => system}/block-backend-io.h | 0
include/{sysemu => system}/block-backend.h | 0
.../{sysemu => system}/block-ram-registrar.h | 0
include/{sysemu => system}/blockdev.h | 0
.../confidential-guest-support.h | 6 +-
include/{sysemu => system}/cpu-throttle.h | 6 +-
.../{sysemu => system}/cpu-timers-internal.h | 0
include/{sysemu => system}/cpu-timers.h | 6 +-
include/{sysemu => system}/cpus.h | 2 +-
.../{sysemu => system}/cryptodev-vhost-user.h | 2 +-
include/{sysemu => system}/cryptodev-vhost.h | 2 +-
include/{sysemu => system}/cryptodev.h | 0
include/{sysemu => system}/device_tree.h | 0
include/{sysemu => system}/dirtylimit.h | 0
include/{sysemu => system}/dirtyrate.h | 0
include/{sysemu => system}/dma.h | 0
include/{sysemu => system}/dump-arch.h | 0
include/{sysemu => system}/dump.h | 4 +-
include/{sysemu => system}/event-loop-base.h | 0
.../{sysemu => system}/host_iommu_device.h | 0
include/{sysemu => system}/hostmem.h | 6 +-
include/{sysemu => system}/hvf.h | 0
include/{sysemu => system}/hvf_int.h | 0
include/{sysemu => system}/hw_accel.h | 8 +-
include/{sysemu => system}/iommufd.h | 6 +-
include/{sysemu => system}/iothread.h | 2 +-
include/{sysemu => system}/kvm.h | 0
include/{sysemu => system}/kvm_int.h | 2 +-
include/{sysemu => system}/kvm_xen.h | 6 +-
include/{sysemu => system}/memory_mapping.h | 0
include/{sysemu => system}/numa.h | 5 +-
include/{sysemu => system}/nvmm.h | 0
include/{sysemu => system}/os-posix.h | 0
include/{sysemu => system}/os-win32.h | 0
include/{sysemu => system}/qtest.h | 0
include/{sysemu => system}/replay.h | 4 +-
include/{sysemu => system}/reset.h | 4 +-
include/{sysemu => system}/rng-random.h | 0
include/{sysemu => system}/rng.h | 0
include/{sysemu => system}/rtc.h | 4 +-
include/{sysemu => system}/runstate-action.h | 0
include/{sysemu => system}/runstate.h | 4 +-
include/{sysemu => system}/seccomp.h | 0
include/{sysemu => system}/spdm-socket.h | 0
include/{sysemu => system}/stats.h | 0
include/{sysemu/sysemu.h => system/system.h} | 4 +-
include/{sysemu => system}/tcg.h | 4 +-
include/{sysemu => system}/tpm.h | 0
include/{sysemu => system}/tpm_backend.h | 2 +-
include/{sysemu => system}/tpm_util.h | 8 +-
.../{sysemu => system}/vhost-user-backend.h | 0
include/{sysemu => system}/watchdog.h | 0
include/{sysemu => system}/whpx.h | 0
include/{sysemu => system}/xen-mapcache.h | 2 +-
include/{sysemu => system}/xen.h | 6 +-
include/user/cpu_loop.h | 90 +++++++++++++
include/user/guest-host.h | 87 +++++++++++++
include/user/page-protection.h | 99 +++++++++++++++
linux-user/aarch64/mte_user_helper.h | 2 +
linux-user/cpu_loop-common.h | 31 -----
linux-user/qemu.h | 1 +
linux-user/user-internals.h | 1 -
migration/dirtyrate.h | 2 +-
migration/migration.h | 2 +-
monitor/monitor-internal.h | 2 +-
nbd/nbd-internal.h | 2 +-
rust/wrapper.h | 2 +-
target/arm/cpu.h | 5 +-
target/arm/kvm_arm.h | 2 +-
target/arm/tcg/translate.h | 1 +
target/i386/confidential-guest.h | 2 +-
target/i386/cpu-internal.h | 2 +-
target/i386/cpu.h | 2 +-
target/i386/hvf/vmx.h | 4 +-
target/i386/kvm/hyperv.h | 2 +-
target/i386/kvm/kvm_i386.h | 2 +-
target/i386/nvmm/nvmm-accel-ops.h | 2 +-
target/i386/sev.h | 29 +++--
target/i386/whpx/whpx-accel-ops.h | 2 +-
target/loongarch/internals.h | 2 -
target/mips/helper.h | 2 +-
target/ppc/kvm_ppc.h | 2 +-
target/s390x/kvm/pv.h | 2 +-
target/s390x/s390x-internal.h | 6 +-
target/sparc/cpu.h | 43 +------
target/sparc/translate.h | 17 +++
tests/qtest/tpm-emu.h | 2 +-
...ysemu_helper.h.inc => system_helper.h.inc} | 2 +-
accel/accel-blocker.c | 2 +-
accel/accel-system.c | 2 +-
accel/dummy-cpus.c | 2 +-
accel/hvf/hvf-accel-ops.c | 8 +-
accel/hvf/hvf-all.c | 4 +-
accel/kvm/kvm-accel-ops.c | 8 +-
accel/kvm/kvm-all.c | 16 +--
accel/qtest/qtest.c | 4 +-
accel/stubs/kvm-stub.c | 2 +-
accel/stubs/xen-stub.c | 2 +-
accel/tcg/cpu-exec-common.c | 4 +-
accel/tcg/cpu-exec.c | 22 +++-
accel/tcg/cputlb.c | 5 +-
accel/tcg/icount-common.c | 12 +-
accel/tcg/monitor.c | 6 +-
accel/tcg/tb-maint.c | 8 +-
accel/tcg/tcg-accel-ops-icount.c | 4 +-
accel/tcg/tcg-accel-ops-mttcg.c | 6 +-
accel/tcg/tcg-accel-ops-rr.c | 6 +-
accel/tcg/tcg-accel-ops.c | 7 +-
accel/tcg/tcg-all.c | 4 +-
accel/tcg/translate-all.c | 10 +-
accel/tcg/translator.c | 9 +-
accel/tcg/user-exec.c | 6 +-
accel/tcg/watchpoint.c | 9 +-
accel/xen/xen-all.c | 6 +-
audio/audio.c | 6 +-
backends/confidential-guest-support.c | 2 +-
backends/cryptodev-builtin.c | 2 +-
backends/cryptodev-lkcf.c | 2 +-
backends/cryptodev-vhost-user.c | 4 +-
backends/cryptodev-vhost.c | 4 +-
backends/cryptodev.c | 4 +-
backends/host_iommu_device.c | 2 +-
backends/hostmem-epc.c | 2 +-
backends/hostmem-file.c | 2 +-
backends/hostmem-memfd.c | 2 +-
backends/hostmem-ram.c | 2 +-
backends/hostmem-shm.c | 2 +-
backends/hostmem.c | 2 +-
backends/iommufd.c | 2 +-
backends/rng-builtin.c | 4 +-
backends/rng-egd.c | 2 +-
backends/rng-random.c | 4 +-
backends/rng.c | 2 +-
backends/spdm-socket.c | 2 +-
backends/tpm/tpm_backend.c | 4 +-
backends/tpm/tpm_emulator.c | 6 +-
backends/tpm/tpm_passthrough.c | 4 +-
backends/tpm/tpm_util.c | 4 +-
backends/vhost-user.c | 4 +-
block.c | 2 +-
block/accounting.c | 2 +-
block/backup.c | 2 +-
block/blkdebug.c | 2 +-
block/blkio.c | 2 +-
block/blkreplay.c | 2 +-
block/block-backend.c | 8 +-
block/block-copy.c | 2 +-
block/block-ram-registrar.c | 4 +-
block/commit.c | 2 +-
block/copy-before-write.c | 2 +-
block/create.c | 1 +
block/crypto.c | 2 +-
block/export/export.c | 4 +-
block/export/fuse.c | 2 +-
block/io.c | 4 +-
block/io_uring.c | 2 +-
block/iscsi.c | 4 +-
block/linux-aio.c | 2 +-
block/mirror.c | 2 +-
block/monitor/block-hmp-cmds.c | 6 +-
block/nfs.c | 2 +-
block/null.c | 2 +-
block/nvme.c | 4 +-
block/parallels.c | 2 +-
block/{qapi-sysemu.c => qapi-system.c} | 4 +-
block/qapi.c | 2 +-
block/qcow.c | 2 +-
block/qcow2-snapshot.c | 2 +-
block/qcow2.c | 2 +-
block/qed.c | 2 +-
block/rbd.c | 2 +-
block/replication.c | 2 +-
block/snapshot-access.c | 2 +-
block/snapshot.c | 2 +-
block/stream.c | 2 +-
block/throttle-groups.c | 4 +-
block/vdi.c | 2 +-
block/vhdx.c | 2 +-
block/vmdk.c | 2 +-
block/vpc.c | 2 +-
blockdev-nbd.c | 4 +-
blockdev.c | 12 +-
blockjob.c | 2 +-
bsd-user/main.c | 1 +
bsd-user/mmap.c | 1 +
bsd-user/signal.c | 2 +
chardev/char-fe.c | 2 +-
chardev/char-mux.c | 2 +-
chardev/char.c | 2 +-
cpu-common.c | 2 +-
cpu-target.c | 7 +-
dump/dump.c | 6 +-
dump/win_dump.c | 2 +-
event-loop-base.c | 2 +-
gdbstub/gdbstub.c | 4 +-
gdbstub/syscalls.c | 2 +-
gdbstub/system.c | 6 +-
hw/9pfs/9p-synth.c | 2 +-
hw/9pfs/virtio-9p-device.c | 2 +-
hw/acpi/aml-build.c | 2 +-
hw/acpi/core.c | 2 +-
hw/acpi/cpu.c | 2 +-
hw/acpi/erst.c | 2 +-
hw/acpi/generic_event_device.c | 2 +-
hw/acpi/hmat.c | 2 +-
hw/acpi/ich9.c | 4 +-
hw/acpi/ich9_tco.c | 2 +-
hw/acpi/piix4.c | 6 +-
hw/acpi/vmgenid.c | 2 +-
hw/arm/allwinner-a10.c | 2 +-
hw/arm/allwinner-h3.c | 2 +-
hw/arm/allwinner-r40.c | 2 +-
hw/arm/armv7m.c | 2 +-
hw/arm/aspeed.c | 6 +-
hw/arm/aspeed_ast10x0.c | 2 +-
hw/arm/aspeed_ast2400.c | 2 +-
hw/arm/aspeed_ast2600.c | 2 +-
hw/arm/aspeed_ast27x0.c | 2 +-
hw/arm/bcm2835_peripherals.c | 2 +-
hw/arm/boot.c | 12 +-
hw/arm/digic.c | 2 +-
hw/arm/digic_boards.c | 2 +-
hw/arm/exynos4210.c | 4 +-
hw/arm/fby35.c | 4 +-
hw/arm/fsl-imx25.c | 2 +-
hw/arm/fsl-imx31.c | 2 +-
hw/arm/fsl-imx6.c | 2 +-
hw/arm/fsl-imx6ul.c | 2 +-
hw/arm/fsl-imx7.c | 2 +-
hw/arm/highbank.c | 4 +-
hw/arm/imx25_pdk.c | 2 +-
hw/arm/integratorcp.c | 4 +-
hw/arm/kzm.c | 4 +-
hw/arm/mcimx6ul-evk.c | 2 +-
hw/arm/mcimx7d-sabre.c | 2 +-
hw/arm/microbit.c | 2 +-
hw/arm/mps2-tz.c | 4 +-
hw/arm/mps2.c | 2 +-
hw/arm/mps3r.c | 2 +-
hw/arm/msf2-soc.c | 2 +-
hw/arm/musca.c | 2 +-
hw/arm/musicpal.c | 8 +-
hw/arm/npcm7xx.c | 2 +-
hw/arm/npcm7xx_boards.c | 6 +-
hw/arm/omap1.c | 12 +-
hw/arm/omap_sx1.c | 2 +-
hw/arm/raspi4b.c | 2 +-
hw/arm/realview.c | 2 +-
hw/arm/sabrelite.c | 2 +-
hw/arm/sbsa-ref.c | 10 +-
hw/arm/stellaris.c | 4 +-
hw/arm/stm32f100_soc.c | 2 +-
hw/arm/stm32f205_soc.c | 2 +-
hw/arm/stm32f405_soc.c | 2 +-
hw/arm/stm32l4x5_soc.c | 2 +-
hw/arm/strongarm.c | 4 +-
hw/arm/versatilepb.c | 2 +-
hw/arm/vexpress.c | 4 +-
hw/arm/virt-acpi-build.c | 6 +-
hw/arm/virt.c | 16 +--
hw/arm/xen-pvh.c | 2 +-
hw/arm/xen-stubs.c | 2 +-
hw/arm/xilinx_zynq.c | 4 +-
hw/arm/xlnx-versal-virt.c | 2 +-
hw/arm/xlnx-versal.c | 4 +-
hw/arm/xlnx-zcu102.c | 2 +-
hw/arm/xlnx-zynqmp.c | 4 +-
hw/audio/ac97.c | 2 +-
hw/audio/es1370.c | 2 +-
hw/audio/intel-hda.c | 2 +-
hw/audio/virtio-snd.c | 2 +-
hw/avr/atmega.c | 2 +-
hw/block/block.c | 4 +-
hw/block/dataplane/xen-block.c | 4 +-
hw/block/fdc-isa.c | 6 +-
hw/block/fdc.c | 6 +-
hw/block/hd-geometry.c | 2 +-
hw/block/m25p80.c | 2 +-
hw/block/nand.c | 2 +-
hw/block/pflash_cfi01.c | 6 +-
hw/block/pflash_cfi02.c | 2 +-
hw/block/swim.c | 2 +-
hw/block/vhost-user-blk.c | 4 +-
hw/block/virtio-blk.c | 8 +-
hw/block/xen-block.c | 6 +-
hw/char/goldfish_tty.c | 2 +-
hw/char/parallel-isa.c | 2 +-
hw/char/parallel.c | 4 +-
hw/char/riscv_htif.c | 4 +-
hw/char/serial-isa.c | 2 +-
hw/char/serial.c | 4 +-
hw/char/xen_console.c | 2 +-
hw/core/clock.c | 2 +-
hw/core/cpu-common.c | 4 +-
hw/core/{cpu-sysemu.c => cpu-system.c} | 2 +-
hw/core/generic-loader.c | 4 +-
hw/core/guest-loader.c | 4 +-
hw/core/loader-fit.c | 2 +-
hw/core/loader.c | 6 +-
hw/core/machine-hmp-cmds.c | 2 +-
hw/core/machine-qmp-cmds.c | 10 +-
hw/core/machine.c | 19 ++-
hw/core/numa.c | 6 +-
hw/core/ptimer.c | 4 +-
hw/core/qdev-properties-system.c | 4 +-
hw/core/reset.c | 2 +-
hw/core/sysbus-fdt.c | 4 +-
hw/core/vm-change-state-handler.c | 2 +-
hw/cpu/a15mpcore.c | 2 +-
hw/cxl/cxl-host.c | 2 +-
hw/cxl/cxl-mailbox-utils.c | 2 +-
hw/display/cirrus_vga.c | 2 +-
hw/display/qxl-render.c | 2 +-
hw/display/qxl.c | 2 +-
hw/display/ramfb.c | 2 +-
hw/display/vga.c | 2 +-
hw/display/virtio-gpu-gl.c | 2 +-
hw/display/virtio-gpu-udmabuf.c | 2 +-
hw/display/virtio-gpu.c | 6 +-
hw/display/xenfb.c | 2 +-
hw/dma/pl330.c | 2 +-
hw/dma/sifive_pdma.c | 2 +-
hw/dma/sparc32_dma.c | 2 +-
hw/dma/xilinx_axidma.c | 2 +-
hw/dma/xlnx-zynq-devcfg.c | 2 +-
hw/dma/xlnx_csu_dma.c | 2 +-
hw/gpio/gpio_pwr.c | 2 +-
hw/hppa/machine.c | 8 +-
hw/hyperv/hv-balloon.c | 6 +-
hw/hyperv/hyperv.c | 2 +-
hw/i386/acpi-build.c | 8 +-
hw/i386/fw_cfg.c | 2 +-
hw/i386/intel_iommu.c | 6 +-
hw/i386/kvm/apic.c | 4 +-
hw/i386/kvm/clock.c | 6 +-
hw/i386/kvm/i8254.c | 4 +-
hw/i386/kvm/i8259.c | 2 +-
hw/i386/kvm/ioapic.c | 2 +-
hw/i386/kvm/xen_evtchn.c | 4 +-
hw/i386/kvm/xen_gnttab.c | 4 +-
hw/i386/kvm/xen_overlay.c | 4 +-
hw/i386/kvm/xen_primary_console.c | 4 +-
hw/i386/kvm/xen_xenstore.c | 4 +-
hw/i386/microvm-dt.c | 2 +-
hw/i386/microvm.c | 10 +-
hw/i386/multiboot.c | 2 +-
hw/i386/nitro_enclave.c | 2 +-
hw/i386/pc.c | 8 +-
hw/i386/pc_piix.c | 8 +-
hw/i386/pc_q35.c | 6 +-
hw/i386/pc_sysfw.c | 6 +-
hw/i386/port92.c | 2 +-
hw/i386/sgx.c | 4 +-
hw/i386/vapic.c | 10 +-
hw/i386/vmport.c | 6 +-
hw/i386/x86-common.c | 6 +-
hw/i386/x86-cpu.c | 6 +-
hw/i386/x86-iommu.c | 2 +-
hw/i386/x86.c | 4 +-
hw/i386/xen/xen-pvh.c | 2 +-
hw/i386/xen/xen_platform.c | 4 +-
hw/ide/ahci-allwinner.c | 2 +-
hw/ide/ahci.c | 4 +-
hw/ide/atapi.c | 2 +-
hw/ide/cmd646.c | 4 +-
hw/ide/core.c | 12 +-
hw/ide/ich.c | 2 +-
hw/ide/ide-bus.c | 6 +-
hw/ide/ide-dev.c | 6 +-
hw/ide/isa.c | 2 +-
hw/ide/macio.c | 4 +-
hw/ide/mmio.c | 2 +-
hw/ide/pci.c | 2 +-
hw/ide/via.c | 2 +-
hw/input/pckbd.c | 4 +-
hw/input/ps2.c | 4 +-
hw/intc/apic.c | 2 +-
hw/intc/apic_common.c | 2 +-
hw/intc/arm_gic.c | 4 +-
hw/intc/arm_gic_common.c | 2 +-
hw/intc/arm_gic_kvm.c | 2 +-
hw/intc/arm_gicv2m.c | 2 +-
hw/intc/arm_gicv3_common.c | 2 +-
hw/intc/arm_gicv3_cpuif.c | 4 +-
hw/intc/arm_gicv3_its_common.c | 2 +-
hw/intc/arm_gicv3_its_kvm.c | 4 +-
hw/intc/arm_gicv3_kvm.c | 4 +-
hw/intc/armv7m_nvic.c | 4 +-
hw/intc/ioapic.c | 4 +-
hw/intc/mips_gic.c | 4 +-
hw/intc/openpic_kvm.c | 2 +-
hw/intc/pnv_xive.c | 6 +-
hw/intc/pnv_xive2.c | 8 +-
hw/intc/riscv_aplic.c | 4 +-
hw/intc/riscv_imsic.c | 4 +-
hw/intc/s390_flic_kvm.c | 2 +-
hw/intc/sifive_plic.c | 2 +-
hw/intc/spapr_xive.c | 4 +-
hw/intc/spapr_xive_kvm.c | 6 +-
hw/intc/xics.c | 4 +-
hw/intc/xics_kvm.c | 2 +-
hw/intc/xive.c | 6 +-
hw/intc/xive2.c | 4 +-
hw/ipmi/ipmi.c | 2 +-
hw/ipmi/ipmi_bmc_sim.c | 2 +-
hw/isa/isa-bus.c | 2 +-
hw/isa/isa-superio.c | 2 +-
hw/isa/lpc_ich9.c | 4 +-
hw/isa/piix.c | 2 +-
hw/loongarch/acpi-build.c | 6 +-
hw/loongarch/boot.c | 4 +-
hw/loongarch/fw_cfg.c | 2 +-
hw/loongarch/virt.c | 20 +--
hw/m68k/an5206.c | 2 +-
hw/m68k/mcf5206.c | 2 +-
hw/m68k/mcf5208.c | 4 +-
hw/m68k/next-cube.c | 4 +-
hw/m68k/q800.c | 8 +-
hw/m68k/virt.c | 8 +-
hw/mem/cxl_type3.c | 4 +-
hw/mem/memory-device.c | 2 +-
hw/mem/nvdimm.c | 2 +-
hw/mem/pc-dimm.c | 4 +-
hw/mem/sparse-mem.c | 2 +-
hw/microblaze/boot.c | 4 +-
hw/microblaze/petalogix_ml605_mmu.c | 2 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
hw/mips/boston.c | 10 +-
hw/mips/cps.c | 4 +-
hw/mips/fuloong2e.c | 6 +-
hw/mips/jazz.c | 6 +-
hw/mips/loongson3_virt.c | 8 +-
hw/mips/malta.c | 8 +-
hw/mips/mips_int.c | 2 +-
hw/mips/mipssim.c | 6 +-
hw/misc/arm_sysctl.c | 2 +-
hw/misc/bcm2835_powermgt.c | 2 +-
hw/misc/bcm2835_property.c | 2 +-
hw/misc/debugexit.c | 2 +-
hw/misc/exynos4210_pmu.c | 2 +-
hw/misc/imx7_snvs.c | 6 +-
hw/misc/iotkit-sysctl.c | 2 +-
hw/misc/ivshmem.c | 4 +-
hw/misc/lasi.c | 4 +-
hw/misc/mac_via.c | 6 +-
hw/misc/macio/cuda.c | 4 +-
hw/misc/macio/mac_dbdma.c | 2 +-
hw/misc/macio/pmu.c | 4 +-
hw/misc/npcm7xx_clk.c | 2 +-
hw/misc/pci-testdev.c | 2 +-
hw/misc/pvpanic-isa.c | 2 +-
hw/misc/pvpanic-pci.c | 2 +-
hw/misc/pvpanic.c | 2 +-
hw/misc/sbsa_ec.c | 2 +-
hw/misc/sifive_e_aon.c | 2 +-
hw/misc/sifive_test.c | 4 +-
hw/misc/sifive_u_otp.c | 4 +-
hw/misc/slavio_misc.c | 2 +-
hw/misc/virt_ctrl.c | 2 +-
hw/misc/vmcoreinfo.c | 2 +-
hw/misc/zynq_slcr.c | 2 +-
hw/net/allwinner-sun8i-emac.c | 2 +-
hw/net/cadence_gem.c | 2 +-
hw/net/e1000.c | 4 +-
hw/net/e1000e.c | 2 +-
hw/net/e1000e_core.c | 2 +-
hw/net/eepro100.c | 6 +-
hw/net/ftgmac100.c | 2 +-
hw/net/igb.c | 2 +-
hw/net/igb_core.c | 2 +-
hw/net/imx_fec.c | 2 +-
hw/net/lance.c | 2 +-
hw/net/lasi_i82596.c | 2 +-
hw/net/mv88w8618_eth.c | 2 +-
hw/net/ne2000-isa.c | 2 +-
hw/net/ne2000-pci.c | 2 +-
hw/net/npcm7xx_emc.c | 2 +-
hw/net/npcm_gmac.c | 2 +-
hw/net/pcnet-pci.c | 4 +-
hw/net/rtl8139.c | 4 +-
hw/net/spapr_llan.c | 2 +-
hw/net/sungem.c | 2 +-
hw/net/sunhme.c | 2 +-
hw/net/tulip.c | 2 +-
hw/net/virtio-net.c | 6 +-
hw/net/vmxnet3.c | 2 +-
hw/nvme/ctrl.c | 8 +-
hw/nvme/dif.c | 2 +-
hw/nvme/ns.c | 4 +-
hw/nvram/chrp_nvram.c | 2 +-
hw/nvram/eeprom_at24c.c | 2 +-
hw/nvram/fw_cfg.c | 6 +-
hw/nvram/mac_nvram.c | 2 +-
hw/nvram/spapr_nvram.c | 8 +-
hw/nvram/xlnx-bbram.c | 2 +-
hw/nvram/xlnx-efuse.c | 2 +-
hw/openrisc/boot.c | 6 +-
hw/openrisc/cputimer.c | 2 +-
hw/openrisc/openrisc_sim.c | 8 +-
hw/openrisc/virt.c | 8 +-
hw/pci-bridge/pci_expander_bridge.c | 2 +-
hw/pci-host/bonito.c | 2 +-
hw/pci-host/pnv_phb.c | 2 +-
hw/pci-host/pnv_phb3.c | 2 +-
hw/pci-host/pnv_phb3_msi.c | 2 +-
hw/pci-host/pnv_phb4_pec.c | 2 +-
hw/pci-host/ppc4xx_pci.c | 2 +-
hw/pci-host/ppce500.c | 4 +-
hw/pci-host/sabre.c | 2 +-
hw/pci/msi.c | 2 +-
hw/pci/msix.c | 2 +-
hw/pci/pci.c | 6 +-
hw/ppc/amigaone.c | 4 +-
hw/ppc/e500.c | 12 +-
hw/ppc/e500plat.c | 4 +-
hw/ppc/mac_newworld.c | 6 +-
hw/ppc/mac_oldworld.c | 6 +-
hw/ppc/mpc8544_guts.c | 2 +-
hw/ppc/mpc8544ds.c | 2 +-
hw/ppc/pef.c | 4 +-
hw/ppc/pegasos2.c | 10 +-
hw/ppc/pnv.c | 16 +--
hw/ppc/pnv_chiptod.c | 2 +-
hw/ppc/pnv_core.c | 2 +-
hw/ppc/pnv_homer.c | 2 +-
hw/ppc/pnv_i2c.c | 2 +-
hw/ppc/pnv_pnor.c | 4 +-
hw/ppc/pnv_psi.c | 2 +-
hw/ppc/pnv_xscom.c | 2 +-
hw/ppc/ppc.c | 8 +-
hw/ppc/ppc405_boards.c | 6 +-
hw/ppc/ppc405_uc.c | 4 +-
hw/ppc/ppc440_bamboo.c | 8 +-
hw/ppc/ppc440_uc.c | 2 +-
hw/ppc/ppc_booke.c | 4 +-
hw/ppc/ppce500_spin.c | 2 +-
hw/ppc/prep.c | 4 +-
hw/ppc/prep_systemio.c | 2 +-
hw/ppc/sam460ex.c | 10 +-
hw/ppc/spapr.c | 22 ++--
hw/ppc/spapr_caps.c | 4 +-
hw/ppc/spapr_cpu_core.c | 10 +-
hw/ppc/spapr_drc.c | 33 +++--
hw/ppc/spapr_events.c | 4 +-
hw/ppc/spapr_hcall.c | 6 +-
hw/ppc/spapr_iommu.c | 4 +-
hw/ppc/spapr_irq.c | 2 +-
hw/ppc/spapr_pci.c | 8 +-
hw/ppc/spapr_rng.c | 4 +-
hw/ppc/spapr_rtas.c | 12 +-
hw/ppc/spapr_rtc.c | 4 +-
hw/ppc/spapr_tpm_proxy.c | 2 +-
hw/ppc/spapr_vio.c | 4 +-
hw/ppc/spapr_vof.c | 2 +-
hw/ppc/virtex_ml507.c | 6 +-
hw/ppc/vof.c | 2 +-
hw/remote/message.c | 4 +-
hw/remote/mpqemu-link.c | 2 +-
hw/remote/proxy.c | 2 +-
hw/remote/remote-obj.c | 2 +-
hw/remote/vfio-user-obj.c | 4 +-
hw/riscv/boot.c | 8 +-
hw/riscv/microchip_pfsoc.c | 4 +-
hw/riscv/numa.c | 2 +-
hw/riscv/opentitan.c | 2 +-
hw/riscv/riscv_hart.c | 2 +-
hw/riscv/shakti_c.c | 2 +-
hw/riscv/sifive_e.c | 2 +-
hw/riscv/sifive_u.c | 6 +-
hw/riscv/spike.c | 4 +-
hw/riscv/virt-acpi-build.c | 2 +-
hw/riscv/virt.c | 12 +-
hw/rtc/allwinner-rtc.c | 2 +-
hw/rtc/aspeed_rtc.c | 2 +-
hw/rtc/ds1338.c | 2 +-
hw/rtc/exynos4210_rtc.c | 2 +-
hw/rtc/goldfish_rtc.c | 4 +-
hw/rtc/ls7a_rtc.c | 4 +-
hw/rtc/m41t80.c | 2 +-
hw/rtc/m48t59.c | 8 +-
hw/rtc/mc146818rtc.c | 10 +-
hw/rtc/pl031.c | 4 +-
hw/rtc/xlnx-zynqmp-rtc.c | 4 +-
hw/rx/rx-gdbsim.c | 6 +-
hw/rx/rx62n.c | 2 +-
hw/s390x/ipl.c | 6 +-
hw/s390x/s390-ccw.c | 2 +-
hw/s390x/s390-pci-bus.c | 4 +-
hw/s390x/s390-pci-inst.c | 2 +-
hw/s390x/s390-skeys-kvm.c | 2 +-
hw/s390x/s390-skeys.c | 4 +-
hw/s390x/s390-stattrib-kvm.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 8 +-
hw/s390x/sclpcpu.c | 2 +-
hw/s390x/sclpquiesce.c | 2 +-
hw/s390x/tod-kvm.c | 2 +-
hw/s390x/tod-tcg.c | 2 +-
hw/s390x/tod.c | 6 +-
hw/s390x/virtio-ccw.c | 4 +-
hw/scsi/lsi53c895a.c | 2 +-
hw/scsi/megasas.c | 6 +-
hw/scsi/mptendian.c | 2 +-
hw/scsi/mptsas.c | 2 +-
hw/scsi/scsi-bus.c | 10 +-
hw/scsi/scsi-disk.c | 10 +-
hw/scsi/scsi-generic.c | 2 +-
hw/scsi/vhost-scsi.c | 2 +-
hw/scsi/vhost-user-scsi.c | 2 +-
hw/scsi/virtio-scsi-dataplane.c | 2 +-
hw/scsi/virtio-scsi.c | 4 +-
hw/sd/allwinner-sdhost.c | 4 +-
hw/sd/bcm2835_sdhost.c | 2 +-
hw/sd/pl181.c | 2 +-
hw/sd/sd.c | 2 +-
hw/sd/sdhci.c | 2 +-
hw/sd/ssi-sd.c | 2 +-
hw/sh4/r2d.c | 6 +-
hw/sh4/sh7750.c | 2 +-
hw/smbios/smbios.c | 2 +-
hw/smbios/smbios_legacy.c | 2 +-
hw/sparc/leon3.c | 6 +-
hw/sparc/sun4m.c | 6 +-
hw/sparc64/niagara.c | 6 +-
hw/sparc64/sparc64.c | 2 +-
hw/sparc64/sun4u.c | 4 +-
hw/ssi/xilinx_spips.c | 2 +-
hw/timer/a9gtimer.c | 2 +-
hw/timer/pxa2xx_timer.c | 4 +-
hw/tpm/tpm_crb.c | 8 +-
hw/tpm/tpm_ppi.c | 2 +-
hw/tpm/tpm_spapr.c | 4 +-
hw/tpm/tpm_tis_common.c | 4 +-
hw/ufs/lu.c | 2 +-
hw/usb/bus-stub.c | 2 +-
hw/usb/bus.c | 2 +-
hw/usb/dev-network.c | 2 +-
hw/usb/dev-storage-classic.c | 4 +-
hw/usb/hcd-ehci.c | 2 +-
hw/usb/hcd-uhci.c | 2 +-
hw/usb/host-libusb.c | 4 +-
hw/usb/libhw.c | 2 +-
hw/usb/redirect.c | 4 +-
hw/vfio/ap.c | 2 +-
hw/vfio/ccw.c | 2 +-
hw/vfio/common.c | 8 +-
hw/vfio/container.c | 2 +-
hw/vfio/cpr.c | 2 +-
hw/vfio/iommufd.c | 4 +-
hw/vfio/migration.c | 2 +-
hw/vfio/pci.c | 6 +-
hw/vfio/platform.c | 4 +-
hw/vfio/spapr.c | 2 +-
hw/virtio/vdpa-dev.c | 4 +-
hw/virtio/vhost-user-fs.c | 2 +-
hw/virtio/vhost-user-scsi-pci.c | 2 +-
hw/virtio/vhost-user.c | 6 +-
hw/virtio/vhost.c | 2 +-
hw/virtio/virtio-balloon.c | 2 +-
hw/virtio/virtio-crypto.c | 2 +-
hw/virtio/virtio-iommu.c | 6 +-
hw/virtio/virtio-mem.c | 8 +-
hw/virtio/virtio-mmio.c | 4 +-
hw/virtio/virtio-pci.c | 4 +-
hw/virtio/virtio-pmem.c | 2 +-
hw/virtio/virtio-rng.c | 4 +-
hw/virtio/virtio.c | 4 +-
hw/watchdog/allwinner-wdt.c | 2 +-
hw/watchdog/cmsdk-apb-watchdog.c | 2 +-
hw/watchdog/sbsa_gwdt.c | 4 +-
hw/watchdog/watchdog.c | 4 +-
hw/watchdog/wdt_aspeed.c | 2 +-
hw/watchdog/wdt_diag288.c | 4 +-
hw/watchdog/wdt_i6300esb.c | 2 +-
hw/watchdog/wdt_ib700.c | 2 +-
hw/watchdog/wdt_imx2.c | 2 +-
hw/xen/xen-bus.c | 2 +-
hw/xen/xen-mapcache.c | 4 +-
hw/xen/xen-pvh-common.c | 6 +-
hw/xen/xen_devconfig.c | 4 +-
hw/xenpv/xen_machine_pv.c | 4 +-
hw/xtensa/sim.c | 4 +-
hw/xtensa/virt.c | 2 +-
hw/xtensa/xtfpga.c | 8 +-
iothread.c | 4 +-
linux-user/aarch64/cpu_loop.c | 4 +-
linux-user/alpha/cpu_loop.c | 4 +-
linux-user/arm/cpu_loop.c | 5 +-
linux-user/elfload.c | 3 +-
linux-user/flatload.c | 1 +
linux-user/hexagon/cpu_loop.c | 4 +-
linux-user/hppa/cpu_loop.c | 4 +-
linux-user/i386/cpu_loop.c | 4 +-
linux-user/loongarch64/cpu_loop.c | 4 +-
linux-user/m68k/cpu_loop.c | 4 +-
linux-user/main.c | 3 +-
linux-user/microblaze/cpu_loop.c | 4 +-
linux-user/mips/cpu_loop.c | 4 +-
linux-user/mmap.c | 2 +
linux-user/openrisc/cpu_loop.c | 4 +-
linux-user/ppc/cpu_loop.c | 4 +-
linux-user/riscv/cpu_loop.c | 4 +-
linux-user/s390x/cpu_loop.c | 4 +-
linux-user/sh4/cpu_loop.c | 4 +-
linux-user/signal.c | 2 +
linux-user/sparc/cpu_loop.c | 4 +-
linux-user/syscall.c | 4 +-
linux-user/xtensa/cpu_loop.c | 4 +-
migration/block-dirty-bitmap.c | 4 +-
migration/colo.c | 6 +-
migration/cpu-throttle.c | 4 +-
migration/dirtyrate.c | 4 +-
migration/global_state.c | 2 +-
migration/migration-hmp-cmds.c | 4 +-
migration/migration.c | 14 +--
migration/multifd.c | 2 +-
migration/options.c | 4 +-
migration/postcopy-ram.c | 2 +-
migration/ram.c | 8 +-
migration/savevm.c | 12 +-
monitor/fds.c | 2 +-
monitor/hmp-cmds-target.c | 2 +-
monitor/hmp-cmds.c | 2 +-
monitor/hmp-target.c | 2 +-
monitor/hmp.c | 2 +-
monitor/monitor.c | 2 +-
monitor/qmp-cmds-control.c | 2 +-
monitor/qmp-cmds.c | 10 +-
net/colo-compare.c | 2 +-
net/dump.c | 2 +-
net/filter-replay.c | 2 +-
net/hub.c | 2 +-
net/net.c | 2 +-
net/slirp.c | 2 +-
net/tap.c | 2 +-
os-posix.c | 2 +-
os-win32.c | 2 +-
plugins/api.c | 1 +
qemu-img.c | 2 +-
qemu-io-cmds.c | 2 +-
qemu-io.c | 2 +-
qemu-nbd.c | 4 +-
qom/container.c | 16 ++-
qom/object.c | 26 +++-
replay/replay-audio.c | 2 +-
replay/replay-char.c | 2 +-
replay/replay-debugging.c | 4 +-
replay/replay-events.c | 2 +-
replay/replay-input.c | 2 +-
replay/replay-internal.c | 4 +-
replay/replay-net.c | 2 +-
replay/replay-random.c | 2 +-
replay/replay-snapshot.c | 2 +-
replay/replay-time.c | 2 +-
replay/replay.c | 8 +-
replay/stubs-system.c | 2 +-
stats/stats-qmp-cmds.c | 2 +-
storage-daemon/qemu-storage-daemon.c | 2 +-
stubs/blk-commit-all.c | 2 +-
stubs/change-state-handler.c | 2 +-
stubs/cpu-get-clock.c | 2 +-
stubs/cpu-synchronize-state.c | 2 +-
stubs/cpus-virtual-clock.c | 2 +-
stubs/dump.c | 2 +-
stubs/get-vm-name.c | 2 +-
stubs/icount.c | 2 +-
stubs/qemu-timer-notify-cb.c | 2 +-
stubs/qtest.c | 2 +-
stubs/replay-mode.c | 2 +-
stubs/replay-tools.c | 2 +-
stubs/runstate-check.c | 2 +-
stubs/vm-stop.c | 2 +-
system/arch_init.c | 2 +-
system/balloon.c | 4 +-
system/bootdevice.c | 4 +-
system/cpu-timers.c | 10 +-
system/cpus.c | 12 +-
system/device_tree.c | 2 +-
system/dirtylimit.c | 6 +-
system/dma-helpers.c | 6 +-
system/globals.c | 4 +-
system/main.c | 2 +-
system/memory.c | 12 +-
system/memory_mapping.c | 2 +-
system/physmem.c | 22 ++--
system/qdev-monitor.c | 6 +-
system/qemu-seccomp.c | 2 +-
system/qtest.c | 6 +-
system/rtc.c | 6 +-
system/runstate-action.c | 4 +-
system/runstate.c | 16 +--
system/tpm.c | 4 +-
system/vl.c | 56 ++++++---
target/alpha/cpu.c | 1 +
target/alpha/sys_helper.c | 4 +-
target/alpha/translate.c | 3 +-
target/arm/arch_dump.c | 2 +-
target/arm/arm-powerctl.c | 2 +-
target/arm/cpu.c | 7 +-
target/arm/cpu64.c | 8 +-
target/arm/debug_helper.c | 2 +-
target/arm/gdbstub.c | 2 +-
target/arm/helper.c | 8 +-
target/arm/hvf/hvf.c | 19 ++-
target/arm/kvm.c | 8 +-
target/arm/machine.c | 4 +-
target/arm/tcg/helper-a64.c | 4 +
target/arm/tcg/mte_helper.c | 5 +
target/arm/tcg/psci.c | 2 +-
target/arm/tcg/sve_helper.c | 3 +
target/avr/cpu.c | 1 +
target/avr/translate.c | 1 +
target/hexagon/cpu.c | 1 +
target/hppa/cpu.c | 1 +
target/hppa/op_helper.c | 3 +
target/hppa/sys_helper.c | 4 +-
target/hppa/translate.c | 1 +
target/i386/arch_dump.c | 4 +-
target/i386/arch_memory_mapping.c | 2 +-
target/i386/cpu-apic.c | 6 +-
target/i386/{cpu-sysemu.c => cpu-system.c} | 2 +-
target/i386/cpu.c | 5 +-
target/i386/helper.c | 5 +-
target/i386/host-cpu.c | 2 +-
target/i386/hvf/hvf-cpu.c | 4 +-
target/i386/hvf/hvf.c | 8 +-
target/i386/hvf/x86_cpuid.c | 2 +-
target/i386/hvf/x86_task.c | 2 +-
target/i386/hvf/x86hvf.c | 2 +-
target/i386/kvm/kvm-cpu.c | 2 +-
target/i386/kvm/kvm.c | 8 +-
target/i386/kvm/xen-emu.c | 6 +-
target/i386/machine.c | 6 +-
target/i386/nvmm/nvmm-accel-ops.c | 6 +-
target/i386/nvmm/nvmm-all.c | 6 +-
.../{sev-sysemu-stub.c => sev-system-stub.c} | 0
target/i386/sev.c | 6 +-
target/i386/tcg/excp_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/bpt_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/excp_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/fpu_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/misc_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/seg_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/smm_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/svm_helper.c | 2 +-
target/i386/tcg/{sysemu => system}/tcg-cpu.c | 4 +-
target/i386/tcg/tcg-cpu.c | 1 +
target/i386/tcg/translate.c | 9 +-
target/i386/whpx/whpx-accel-ops.c | 6 +-
target/i386/whpx/whpx-all.c | 6 +-
target/i386/whpx/whpx-apic.c | 4 +-
target/loongarch/arch_dump.c | 2 +-
target/loongarch/cpu.c | 11 +-
target/loongarch/kvm/kvm.c | 8 +-
target/loongarch/machine.c | 2 +-
target/m68k/translate.c | 1 +
target/microblaze/cpu.c | 1 +
target/microblaze/translate.c | 1 +
target/mips/cpu.c | 8 +-
target/mips/kvm.c | 6 +-
target/mips/{sysemu => system}/addr.c | 0
target/mips/{sysemu => system}/cp0.c | 0
target/mips/{sysemu => system}/cp0_timer.c | 2 +-
target/mips/{sysemu => system}/machine.c | 0
.../mips/{sysemu => system}/mips-qmp-cmds.c | 0
target/mips/{sysemu => system}/physaddr.c | 0
target/mips/tcg/exception.c | 1 +
.../mips/tcg/{sysemu => system}/cp0_helper.c | 0
.../mips/tcg/{sysemu => system}/lcsr_helper.c | 0
.../mips/tcg/{sysemu => system}/mips-semi.c | 43 +++++--
.../tcg/{sysemu => system}/semihosting-stub.c | 0
.../tcg/{sysemu => system}/special_helper.c | 1 +
.../mips/tcg/{sysemu => system}/tlb_helper.c | 0
target/mips/tcg/translate.c | 2 +-
target/openrisc/cpu.c | 1 +
target/openrisc/translate.c | 1 +
target/ppc/arch_dump.c | 4 +-
target/ppc/compat.c | 6 +-
target/ppc/cpu.c | 2 +-
target/ppc/cpu_init.c | 6 +-
target/ppc/excp_helper.c | 6 +-
target/ppc/helper_regs.c | 4 +-
target/ppc/kvm.c | 14 +--
target/ppc/machine.c | 6 +-
target/ppc/mmu-hash32.c | 2 +-
target/ppc/mmu-hash64.c | 2 +-
target/ppc/mmu-radix64.c | 2 +-
target/ppc/mmu_common.c | 2 +-
target/ppc/mmu_helper.c | 2 +-
target/ppc/translate.c | 1 +
target/riscv/arch_dump.c | 2 +-
target/riscv/cpu.c | 6 +-
target/riscv/cpu_helper.c | 2 +-
target/riscv/csr.c | 2 +-
target/riscv/debug.c | 2 +-
target/riscv/kvm/kvm-cpu.c | 8 +-
target/riscv/machine.c | 4 +-
target/riscv/pmu.c | 4 +-
target/riscv/riscv-qmp-cmds.c | 4 +-
target/riscv/tcg/tcg-cpu.c | 1 +
target/riscv/translate.c | 5 +-
target/rx/cpu.c | 1 +
target/rx/translate.c | 1 +
target/s390x/arch_dump.c | 2 +-
target/s390x/cpu-dump.c | 2 +-
target/s390x/{cpu-sysemu.c => cpu-system.c} | 18 +--
target/s390x/cpu.c | 14 +--
target/s390x/cpu_models.c | 6 +-
...pu_models_sysemu.c => cpu_models_system.c} | 4 +-
target/s390x/diag.c | 4 +-
target/s390x/gdbstub.c | 4 +-
target/s390x/helper.c | 6 +-
target/s390x/interrupt.c | 4 +-
target/s390x/kvm/kvm.c | 10 +-
target/s390x/kvm/pv.c | 6 +-
target/s390x/machine.c | 4 +-
target/s390x/mmu_helper.c | 4 +-
target/s390x/sigp.c | 6 +-
target/s390x/tcg/mem_helper.c | 5 +-
target/s390x/tcg/misc_helper.c | 4 +-
target/s390x/tcg/translate.c | 5 +-
target/sh4/cpu.c | 1 +
target/sh4/helper.c | 2 +-
target/sh4/translate.c | 1 +
target/sparc/cpu.c | 63 ++++++++++
target/sparc/int32_helper.c | 2 +-
target/sparc/ldst_helper.c | 3 +
target/sparc/translate.c | 32 +----
target/tricore/cpu.c | 1 +
target/tricore/translate.c | 1 +
target/xtensa/translate.c | 1 +
target/xtensa/xtensa-semi.c | 15 +--
tcg/tci.c | 1 +
tests/qtest/fuzz/fuzz.c | 6 +-
tests/qtest/vhost-user-test.c | 2 +-
tests/unit/check-qom-proplist.c | 2 +-
tests/unit/test-bdrv-drain.c | 3 +-
tests/unit/test-bdrv-graph-mod.c | 2 +-
tests/unit/test-block-backend.c | 2 +-
tests/unit/test-block-iothread.c | 3 +-
tests/unit/test-blockjob-txn.c | 2 +-
tests/unit/test-blockjob.c | 2 +-
tests/unit/test-char.c | 2 +-
tests/unit/test-image-locking.c | 2 +-
tests/unit/test-qdev-global-props.c | 22 ++++
tests/unit/test-replication.c | 2 +-
tests/unit/test-seccomp.c | 2 +-
tests/unit/test-throttle.c | 2 +-
tests/unit/test-timed-average.c | 2 +-
tests/unit/test-yank.c | 2 +-
ui/curses.c | 2 +-
ui/dbus-clipboard.c | 2 +-
ui/dbus-listener.c | 2 +-
ui/dbus.c | 2 +-
ui/egl-helpers.c | 2 +-
ui/gtk-egl.c | 2 +-
ui/gtk-gl-area.c | 2 +-
ui/gtk.c | 4 +-
ui/input-barrier.c | 2 +-
ui/input-linux.c | 2 +-
ui/input.c | 6 +-
ui/sdl2.c | 6 +-
ui/spice-app.c | 2 +-
ui/spice-core.c | 4 +-
ui/vnc.c | 4 +-
ui/win32-kbd-hook.c | 2 +-
util/async.c | 2 +-
util/log.c | 2 +
util/main-loop.c | 4 +-
util/oslib-posix.c | 2 +-
util/qemu-thread-posix.c | 1 +
util/qemu-timer.c | 8 +-
crypto/akcipher-gcrypt.c.inc | 2 +-
crypto/akcipher-nettle.c.inc | 2 +-
block/meson.build | 6 +-
hw/core/meson.build | 2 +-
net/vmnet-common.m | 2 +-
scripts/clean-includes | 6 +-
.../codeconverter/test_regexps.py | 4 +-
scripts/coverity-scan/COMPONENTS.md | 4 +-
target/i386/meson.build | 5 +-
target/i386/tcg/meson.build | 2 +-
.../i386/tcg/{sysemu => system}/meson.build | 0
target/mips/meson.build | 2 +-
target/mips/{sysemu => system}/meson.build | 0
target/mips/tcg/meson.build | 2 +-
.../mips/tcg/{sysemu => system}/meson.build | 0
target/s390x/meson.build | 4 +-
target/s390x/trace-events | 2 +-
ui/cocoa.m | 10 +-
1079 files changed, 2572 insertions(+), 2309 deletions(-)
create mode 100644 accel/tcg/tb-internal.h
delete mode 100644 include/exec/translate-all.h
rename include/{sysemu => system}/accel-blocker.h (98%)
rename include/{sysemu => system}/accel-ops.h (98%)
rename include/{sysemu => system}/arch_init.h (100%)
rename include/{sysemu => system}/balloon.h (100%)
rename include/{sysemu => system}/block-backend-common.h (100%)
rename include/{sysemu => system}/block-backend-global-state.h (100%)
rename include/{sysemu => system}/block-backend-io.h (100%)
rename include/{sysemu => system}/block-backend.h (100%)
rename include/{sysemu => system}/block-ram-registrar.h (100%)
rename include/{sysemu => system}/blockdev.h (100%)
rename include/{exec => system}/confidential-guest-support.h (96%)
rename include/{sysemu => system}/cpu-throttle.h (95%)
rename include/{sysemu => system}/cpu-timers-internal.h (100%)
rename include/{sysemu => system}/cpu-timers.h (96%)
rename include/{sysemu => system}/cpus.h (97%)
rename include/{sysemu => system}/cryptodev-vhost-user.h (97%)
rename include/{sysemu => system}/cryptodev-vhost.h (99%)
rename include/{sysemu => system}/cryptodev.h (100%)
rename include/{sysemu => system}/device_tree.h (100%)
rename include/{sysemu => system}/dirtylimit.h (100%)
rename include/{sysemu => system}/dirtyrate.h (100%)
rename include/{sysemu => system}/dma.h (100%)
rename include/{sysemu => system}/dump-arch.h (100%)
rename include/{sysemu => system}/dump.h (99%)
rename include/{sysemu => system}/event-loop-base.h (100%)
rename include/{sysemu => system}/host_iommu_device.h (100%)
rename include/{sysemu => system}/hostmem.h (97%)
rename include/{sysemu => system}/hvf.h (100%)
rename include/{sysemu => system}/hvf_int.h (100%)
rename include/{sysemu => system}/hw_accel.h (83%)
rename include/{sysemu => system}/iommufd.h (96%)
rename include/{sysemu => system}/iothread.h (97%)
rename include/{sysemu => system}/kvm.h (100%)
rename include/{sysemu => system}/kvm_int.h (99%)
rename include/{sysemu => system}/kvm_xen.h (93%)
rename include/{sysemu => system}/memory_mapping.h (100%)
rename include/{sysemu => system}/numa.h (97%)
rename include/{sysemu => system}/nvmm.h (100%)
rename include/{sysemu => system}/os-posix.h (100%)
rename include/{sysemu => system}/os-win32.h (100%)
rename include/{sysemu => system}/qtest.h (100%)
rename include/{sysemu => system}/replay.h (99%)
rename include/{sysemu => system}/reset.h (98%)
rename include/{sysemu => system}/rng-random.h (100%)
rename include/{sysemu => system}/rng.h (100%)
rename include/{sysemu => system}/rtc.h (98%)
rename include/{sysemu => system}/runstate-action.h (100%)
rename include/{sysemu => system}/runstate.h (98%)
rename include/{sysemu => system}/seccomp.h (100%)
rename include/{sysemu => system}/spdm-socket.h (100%)
rename include/{sysemu => system}/stats.h (100%)
rename include/{sysemu/sysemu.h => system/system.h} (99%)
rename include/{sysemu => system}/tcg.h (88%)
rename include/{sysemu => system}/tpm.h (100%)
rename include/{sysemu => system}/tpm_backend.h (99%)
rename include/{sysemu => system}/tpm_util.h (94%)
rename include/{sysemu => system}/vhost-user-backend.h (100%)
rename include/{sysemu => system}/watchdog.h (100%)
rename include/{sysemu => system}/whpx.h (100%)
rename include/{sysemu => system}/xen-mapcache.h (98%)
rename include/{sysemu => system}/xen.h (92%)
create mode 100644 include/user/cpu_loop.h
create mode 100644 include/user/guest-host.h
create mode 100644 include/user/page-protection.h
delete mode 100644 linux-user/cpu_loop-common.h
create mode 100644 target/sparc/translate.h
rename target/mips/tcg/{sysemu_helper.h.inc => system_helper.h.inc} (99%)
rename block/{qapi-sysemu.c => qapi-system.c} (99%)
rename hw/core/{cpu-sysemu.c => cpu-system.c} (98%)
rename target/i386/{cpu-sysemu.c => cpu-system.c} (99%)
rename target/i386/{sev-sysemu-stub.c => sev-system-stub.c} (100%)
rename target/i386/tcg/{sysemu => system}/bpt_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/excp_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/fpu_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/misc_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/seg_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/smm_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/svm_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/tcg-cpu.c (96%)
rename target/mips/{sysemu => system}/addr.c (100%)
rename target/mips/{sysemu => system}/cp0.c (100%)
rename target/mips/{sysemu => system}/cp0_timer.c (99%)
rename target/mips/{sysemu => system}/machine.c (100%)
rename target/mips/{sysemu => system}/mips-qmp-cmds.c (100%)
rename target/mips/{sysemu => system}/physaddr.c (100%)
rename target/mips/tcg/{sysemu => system}/cp0_helper.c (100%)
rename target/mips/tcg/{sysemu => system}/lcsr_helper.c (100%)
rename target/mips/tcg/{sysemu => system}/mips-semi.c (84%)
rename target/mips/tcg/{sysemu => system}/semihosting-stub.c (100%)
rename target/mips/tcg/{sysemu => system}/special_helper.c (99%)
rename target/mips/tcg/{sysemu => system}/tlb_helper.c (100%)
rename target/s390x/{cpu-sysemu.c => cpu-system.c} (96%)
rename target/s390x/{cpu_models_sysemu.c => cpu_models_system.c} (99%)
rename target/i386/tcg/{sysemu => system}/meson.build (100%)
rename target/mips/{sysemu => system}/meson.build (100%)
rename target/mips/tcg/{sysemu => system}/meson.build (100%)Signature · 1 line
2.47.1
[PULL 06/59] tests: Explicitly create containers in test_qom_partial_path()
From: Peter Xu <[email protected]>
Drop one use of container_get(), instead switch to the explicit function to create a container.
Message-ID: <[email protected]>
--- tests/unit/check-qom-proplist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/unit/check-qom-proplist.c +1 -1
@@ -610,7 +610,7 @@ static void test_dummy_delchild(void)static void test_qom_partial_path (void ) {Object *root =object_get_objects_root (); -Object *cont1 =container_get (root,"/cont1" ); +Object *cont1 =object_property_add_new_container (root,"cont1" );Object *obj1 =object_new (TYPE_DUMMY );Object *obj2a =object_new (TYPE_DUMMY );Object *obj2b =object_new (TYPE_DUMMY );
Signature · 1 line
2.47.1
[PULL 05/59] tests: Fix test-qdev-global-props on anonymous qdev realize()
In reply to Philippe Mathieu-DaudéFrom: Peter Xu <[email protected]>
test-qdev-global-props creates a few subprocesses and test things based on qdev realize(). One thing was overlooked since the start, that anonymous creations of qdev (then realize() the device) requires the machine object's presence, as all these devices need to be attached to QOM tree, by default to path "/machine/unattached".
The test didn't crash simply because container_get() has an implicit semantic to silently create any missing container, hence what happened here is container_get() (when running these tests) will try to create containers at QOM path "/machine" on the fly. That's probably unexpected by the test, but worked like charm before.
We're going to fix device_set_realized() soon, but before that make the test case prepared, by creating the machine object on its own.
Message-ID: <[email protected]>
--- tests/unit/test-qdev-global-props.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
tests/unit/test-qdev-global-props.c +22 -0
@@ -72,6 +72,26 @@ static const TypeInfo subclass_type = { .parent = TYPE_STATIC_PROPS, }; +/* +* Initialize a fake machine, being prepared for future tests. +* +* All the tests later (even if to be run in subprocesses.. which will +* inherit the global states of the parent process) will try to create qdev +* and realize the device. +* +* Realization of such anonymous qdev (with no parent object) requires both +* the machine object and its "unattached" container to be at least present. +*/ +static void test_init_machine (void ) +{ +/* This is a fake machine - it doesn't need to be a machine object */ +Object *machine =object_property_add_new_container ( +object_get_root (),"machine" ); + +/* This container must exist for anonymous qdevs to realize() */ +object_property_add_new_container (machine,"unattached" ); +} +/* Test simple static property setting to default value */ static void test_static_prop_subprocess (void ) {
@@ -295,6 +315,8 @@ int main(int argc, char **argv)type_register_static (&nohotplug_type);type_register_static (&nondevice_type); +test_init_machine (); +g_test_add_func ("/qdev/properties/static/default/subprocess" , test_static_prop_subprocess); g_test_add_func("/qdev/properties/static/default",
Signature · 1 line
2.47.1
[PULL 01/59] hvf: arm: Ignore writes to CNTP_CTL_EL0
In reply to Philippe Mathieu-DaudéFrom: Alexander Graf <[email protected]>
MacOS unconditionally disables interrupts of the physical timer on boot and then continues to use the virtual one. We don't really want to support a full physical timer emulation, so let's just ignore those writes.
Message-ID: <[email protected]>
--- target/arm/hvf/hvf.c | 9 +++++++++ 1 file changed, 9 insertions(+)
target/arm/hvf/hvf.c +9 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/log.h" #include "sysemu/runstate.h" #include "sysemu/hvf.h"
@@ -184,6 +185,7 @@ void hvf_arm_init_debug(void)#define SYSREG_OSLSR_EL1 SYSREG(2, 0, 1, 1, 4)#define SYSREG_OSDLR_EL1 SYSREG(2, 0, 1, 3, 4)#define SYSREG_CNTPCT_EL0 SYSREG(3, 3, 14, 0, 1) +#define SYSREG_CNTP_CTL_EL0 SYSREG(3, 3, 14, 2, 1)#define SYSREG_PMCR_EL0 SYSREG(3, 3, 9, 12, 0)#define SYSREG_PMUSERENR_EL0 SYSREG(3, 3, 9, 14, 0)#define SYSREG_PMCNTENSET_EL0 SYSREG(3, 3, 9, 12, 1)
@@ -1620,6 +1622,13 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)case SYSREG_OSLAR_EL1 : env->cp15.oslsr_el1 = val &1 ;return 0 ; +case SYSREG_CNTP_CTL_EL0 : +/* +* Guests should not rely on the physical counter, but macOS emits +* disable writes to it. Let it do so, but ignore the requests. +*/ +qemu_log_mask (LOG_UNIMP ,"Unsupported write to CNTP_CTL_EL0\n" ); +return 0 ;case SYSREG_OSDLR_EL1 :/* Dummy register */ return 0 ;
Signature · 1 line
2.47.1
[PULL 11/59] include: Rename sysemu/ -> system/
In reply to Philippe Mathieu-DaudéHeaders in include/sysemu/ are not only related to system *emulation*, they are also used by virtualization. Rename as system/ which is clearer.
Files renamed manually then mechanical change using sed tool.
Message-Id: <[email protected]>
---
MAINTAINERS | 76 +++++++++----------
docs/specs/tpm.rst | 8 +-
accel/kvm/kvm-cpus.h | 2 +-
accel/tcg/tcg-accel-ops.h | 2 +-
backends/tpm/tpm_int.h | 2 +-
block/coroutines.h | 2 +-
block/export/virtio-blk-handler.h | 2 +-
dump/win_dump.h | 2 +-
hw/acpi/hmat.h | 2 +-
hw/block/dataplane/xen-block.h | 2 +-
hw/tpm/tpm_prop.h | 2 +-
hw/tpm/tpm_tis.h | 2 +-
hw/usb/hcd-dwc2.h | 2 +-
hw/usb/hcd-ehci.h | 2 +-
hw/usb/hcd-ohci.h | 2 +-
hw/usb/hcd-xhci.h | 2 +-
hw/vfio/pci.h | 2 +-
include/exec/ram_addr.h | 4 +-
include/hw/acpi/tpm.h | 2 +-
include/hw/arm/allwinner-a10.h | 2 +-
include/hw/arm/allwinner-h3.h | 2 +-
include/hw/arm/allwinner-r40.h | 2 +-
include/hw/arm/virt.h | 2 +-
include/hw/boards.h | 4 +-
include/hw/core/sysemu-cpu-ops.h | 6 +-
include/hw/dma/xlnx-zdma.h | 2 +-
include/hw/dma/xlnx_dpdma.h | 2 +-
include/hw/hyperv/vmbus.h | 4 +-
include/hw/i386/hostmem-epc.h | 2 +-
include/hw/ide/ide-dev.h | 2 +-
include/hw/isa/superio.h | 2 +-
include/hw/nvram/fw_cfg.h | 2 +-
include/hw/nvram/xlnx-bbram.h | 2 +-
include/hw/nvram/xlnx-efuse.h | 2 +-
include/hw/pci/pci.h | 4 +-
include/hw/ppc/mac_dbdma.h | 2 +-
include/hw/ppc/spapr.h | 2 +-
include/hw/ppc/spapr_drc.h | 2 +-
include/hw/ppc/spapr_vio.h | 2 +-
include/hw/ppc/xive.h | 2 +-
include/hw/riscv/numa.h | 2 +-
include/hw/s390x/css.h | 2 +-
include/hw/s390x/s390-pci-inst.h | 2 +-
include/hw/tricore/triboard.h | 2 +-
include/hw/vfio/vfio-common.h | 6 +-
include/hw/virtio/virtio-balloon.h | 2 +-
include/hw/virtio/virtio-blk.h | 6 +-
include/hw/virtio/virtio-crypto.h | 4 +-
include/hw/virtio/virtio-gpu.h | 2 +-
include/hw/virtio/virtio-input.h | 2 +-
include/hw/virtio/virtio-iommu.h | 2 +-
include/hw/virtio/virtio-mem.h | 2 +-
include/hw/virtio/virtio-rng.h | 2 +-
include/hw/virtio/virtio-scsi.h | 2 +-
include/hw/xen/xen-block.h | 2 +-
include/hw/xen/xen-hvm-common.h | 8 +-
include/qemu/main-loop.h | 2 +-
include/qemu/osdep.h | 8 +-
include/{sysemu => system}/accel-blocker.h | 2 +-
include/{sysemu => system}/accel-ops.h | 0
include/{sysemu => system}/arch_init.h | 0
include/{sysemu => system}/balloon.h | 0
.../{sysemu => system}/block-backend-common.h | 0
.../block-backend-global-state.h | 0
include/{sysemu => system}/block-backend-io.h | 0
include/{sysemu => system}/block-backend.h | 0
.../{sysemu => system}/block-ram-registrar.h | 0
include/{sysemu => system}/blockdev.h | 0
include/{sysemu => system}/cpu-throttle.h | 6 +-
.../{sysemu => system}/cpu-timers-internal.h | 0
include/{sysemu => system}/cpu-timers.h | 6 +-
include/{sysemu => system}/cpus.h | 2 +-
.../{sysemu => system}/cryptodev-vhost-user.h | 2 +-
include/{sysemu => system}/cryptodev-vhost.h | 2 +-
include/{sysemu => system}/cryptodev.h | 0
include/{sysemu => system}/device_tree.h | 0
include/{sysemu => system}/dirtylimit.h | 0
include/{sysemu => system}/dirtyrate.h | 0
include/{sysemu => system}/dma.h | 0
include/{sysemu => system}/dump-arch.h | 0
include/{sysemu => system}/dump.h | 4 +-
include/{sysemu => system}/event-loop-base.h | 0
.../{sysemu => system}/host_iommu_device.h | 0
include/{sysemu => system}/hostmem.h | 6 +-
include/{sysemu => system}/hvf.h | 0
include/{sysemu => system}/hvf_int.h | 0
include/{sysemu => system}/hw_accel.h | 8 +-
include/{sysemu => system}/iommufd.h | 6 +-
include/{sysemu => system}/iothread.h | 2 +-
include/{sysemu => system}/kvm.h | 0
include/{sysemu => system}/kvm_int.h | 2 +-
include/{sysemu => system}/kvm_xen.h | 6 +-
include/{sysemu => system}/memory_mapping.h | 0
include/{sysemu => system}/numa.h | 4 +-
include/{sysemu => system}/nvmm.h | 0
include/{sysemu => system}/os-posix.h | 0
include/{sysemu => system}/os-win32.h | 0
include/{sysemu => system}/qtest.h | 0
include/{sysemu => system}/replay.h | 4 +-
include/{sysemu => system}/reset.h | 4 +-
include/{sysemu => system}/rng-random.h | 0
include/{sysemu => system}/rng.h | 0
include/{sysemu => system}/rtc.h | 4 +-
include/{sysemu => system}/runstate-action.h | 0
include/{sysemu => system}/runstate.h | 4 +-
include/{sysemu => system}/seccomp.h | 0
include/{sysemu => system}/spdm-socket.h | 0
include/{sysemu => system}/stats.h | 0
include/{sysemu/sysemu.h => system/system.h} | 4 +-
include/{sysemu => system}/tcg.h | 4 +-
include/{sysemu => system}/tpm.h | 0
include/{sysemu => system}/tpm_backend.h | 2 +-
include/{sysemu => system}/tpm_util.h | 8 +-
.../{sysemu => system}/vhost-user-backend.h | 0
include/{sysemu => system}/watchdog.h | 0
include/{sysemu => system}/whpx.h | 0
include/{sysemu => system}/xen-mapcache.h | 2 +-
include/{sysemu => system}/xen.h | 6 +-
migration/dirtyrate.h | 2 +-
migration/migration.h | 2 +-
monitor/monitor-internal.h | 2 +-
nbd/nbd-internal.h | 2 +-
rust/wrapper.h | 2 +-
target/arm/kvm_arm.h | 2 +-
target/i386/cpu-internal.h | 2 +-
target/i386/cpu.h | 2 +-
target/i386/hvf/vmx.h | 4 +-
target/i386/kvm/hyperv.h | 2 +-
target/i386/kvm/kvm_i386.h | 2 +-
target/i386/nvmm/nvmm-accel-ops.h | 2 +-
target/i386/whpx/whpx-accel-ops.h | 2 +-
target/mips/helper.h | 2 +-
target/ppc/kvm_ppc.h | 2 +-
target/s390x/kvm/pv.h | 2 +-
target/s390x/s390x-internal.h | 6 +-
tests/qtest/tpm-emu.h | 2 +-
...ysemu_helper.h.inc => system_helper.h.inc} | 2 +-
accel/accel-blocker.c | 2 +-
accel/accel-system.c | 2 +-
accel/dummy-cpus.c | 2 +-
accel/hvf/hvf-accel-ops.c | 8 +-
accel/hvf/hvf-all.c | 4 +-
accel/kvm/kvm-accel-ops.c | 8 +-
accel/kvm/kvm-all.c | 16 ++--
accel/qtest/qtest.c | 4 +-
accel/stubs/kvm-stub.c | 2 +-
accel/stubs/xen-stub.c | 2 +-
accel/tcg/cpu-exec-common.c | 4 +-
accel/tcg/cpu-exec.c | 6 +-
accel/tcg/icount-common.c | 12 +--
accel/tcg/monitor.c | 6 +-
accel/tcg/tb-maint.c | 2 +-
accel/tcg/tcg-accel-ops-icount.c | 4 +-
accel/tcg/tcg-accel-ops-mttcg.c | 6 +-
accel/tcg/tcg-accel-ops-rr.c | 6 +-
accel/tcg/tcg-accel-ops.c | 6 +-
accel/tcg/tcg-all.c | 4 +-
accel/tcg/translate-all.c | 6 +-
accel/tcg/watchpoint.c | 4 +-
accel/xen/xen-all.c | 6 +-
audio/audio.c | 6 +-
backends/cryptodev-builtin.c | 2 +-
backends/cryptodev-lkcf.c | 2 +-
backends/cryptodev-vhost-user.c | 4 +-
backends/cryptodev-vhost.c | 4 +-
backends/cryptodev.c | 4 +-
backends/host_iommu_device.c | 2 +-
backends/hostmem-epc.c | 2 +-
backends/hostmem-file.c | 2 +-
backends/hostmem-memfd.c | 2 +-
backends/hostmem-ram.c | 2 +-
backends/hostmem-shm.c | 2 +-
backends/hostmem.c | 2 +-
backends/iommufd.c | 2 +-
backends/rng-builtin.c | 4 +-
backends/rng-egd.c | 2 +-
backends/rng-random.c | 4 +-
backends/rng.c | 2 +-
backends/spdm-socket.c | 2 +-
backends/tpm/tpm_backend.c | 4 +-
backends/tpm/tpm_emulator.c | 6 +-
backends/tpm/tpm_passthrough.c | 4 +-
backends/tpm/tpm_util.c | 4 +-
backends/vhost-user.c | 4 +-
block.c | 2 +-
block/accounting.c | 2 +-
block/backup.c | 2 +-
block/blkdebug.c | 2 +-
block/blkio.c | 2 +-
block/blkreplay.c | 2 +-
block/block-backend.c | 8 +-
block/block-copy.c | 2 +-
block/block-ram-registrar.c | 4 +-
block/commit.c | 2 +-
block/copy-before-write.c | 2 +-
block/crypto.c | 2 +-
block/export/export.c | 4 +-
block/export/fuse.c | 2 +-
block/io.c | 4 +-
block/io_uring.c | 2 +-
block/iscsi.c | 4 +-
block/linux-aio.c | 2 +-
block/mirror.c | 2 +-
block/monitor/block-hmp-cmds.c | 6 +-
block/nfs.c | 2 +-
block/null.c | 2 +-
block/nvme.c | 4 +-
block/parallels.c | 2 +-
block/{qapi-sysemu.c => qapi-system.c} | 4 +-
block/qapi.c | 2 +-
block/qcow.c | 2 +-
block/qcow2-snapshot.c | 2 +-
block/qcow2.c | 2 +-
block/qed.c | 2 +-
block/rbd.c | 2 +-
block/replication.c | 2 +-
block/snapshot-access.c | 2 +-
block/snapshot.c | 2 +-
block/stream.c | 2 +-
block/throttle-groups.c | 4 +-
block/vdi.c | 2 +-
block/vhdx.c | 2 +-
block/vmdk.c | 2 +-
block/vpc.c | 2 +-
blockdev-nbd.c | 4 +-
blockdev.c | 12 +--
blockjob.c | 2 +-
chardev/char-fe.c | 2 +-
chardev/char-mux.c | 2 +-
chardev/char.c | 2 +-
cpu-common.c | 2 +-
cpu-target.c | 4 +-
dump/dump.c | 6 +-
dump/win_dump.c | 2 +-
event-loop-base.c | 2 +-
gdbstub/gdbstub.c | 4 +-
gdbstub/syscalls.c | 2 +-
gdbstub/system.c | 6 +-
hw/9pfs/9p-synth.c | 2 +-
hw/9pfs/virtio-9p-device.c | 2 +-
hw/acpi/aml-build.c | 2 +-
hw/acpi/core.c | 2 +-
hw/acpi/cpu.c | 2 +-
hw/acpi/erst.c | 2 +-
hw/acpi/generic_event_device.c | 2 +-
hw/acpi/hmat.c | 2 +-
hw/acpi/ich9.c | 4 +-
hw/acpi/ich9_tco.c | 2 +-
hw/acpi/piix4.c | 6 +-
hw/acpi/vmgenid.c | 2 +-
hw/arm/allwinner-a10.c | 2 +-
hw/arm/allwinner-h3.c | 2 +-
hw/arm/allwinner-r40.c | 2 +-
hw/arm/armv7m.c | 2 +-
hw/arm/aspeed.c | 6 +-
hw/arm/aspeed_ast10x0.c | 2 +-
hw/arm/aspeed_ast2400.c | 2 +-
hw/arm/aspeed_ast2600.c | 2 +-
hw/arm/aspeed_ast27x0.c | 2 +-
hw/arm/bcm2835_peripherals.c | 2 +-
hw/arm/boot.c | 12 +--
hw/arm/digic.c | 2 +-
hw/arm/digic_boards.c | 2 +-
hw/arm/exynos4210.c | 4 +-
hw/arm/fby35.c | 4 +-
hw/arm/fsl-imx25.c | 2 +-
hw/arm/fsl-imx31.c | 2 +-
hw/arm/fsl-imx6.c | 2 +-
hw/arm/fsl-imx6ul.c | 2 +-
hw/arm/fsl-imx7.c | 2 +-
hw/arm/highbank.c | 4 +-
hw/arm/imx25_pdk.c | 2 +-
hw/arm/integratorcp.c | 4 +-
hw/arm/kzm.c | 4 +-
hw/arm/mcimx6ul-evk.c | 2 +-
hw/arm/mcimx7d-sabre.c | 2 +-
hw/arm/microbit.c | 2 +-
hw/arm/mps2-tz.c | 4 +-
hw/arm/mps2.c | 2 +-
hw/arm/mps3r.c | 2 +-
hw/arm/msf2-soc.c | 2 +-
hw/arm/musca.c | 2 +-
hw/arm/musicpal.c | 8 +-
hw/arm/npcm7xx.c | 2 +-
hw/arm/npcm7xx_boards.c | 6 +-
hw/arm/omap1.c | 12 +--
hw/arm/omap_sx1.c | 2 +-
hw/arm/raspi4b.c | 2 +-
hw/arm/realview.c | 2 +-
hw/arm/sabrelite.c | 2 +-
hw/arm/sbsa-ref.c | 10 +--
hw/arm/stellaris.c | 2 +-
hw/arm/stm32f100_soc.c | 2 +-
hw/arm/stm32f205_soc.c | 2 +-
hw/arm/stm32f405_soc.c | 2 +-
hw/arm/stm32l4x5_soc.c | 2 +-
hw/arm/strongarm.c | 4 +-
hw/arm/versatilepb.c | 2 +-
hw/arm/vexpress.c | 4 +-
hw/arm/virt-acpi-build.c | 6 +-
hw/arm/virt.c | 16 ++--
hw/arm/xen-pvh.c | 2 +-
hw/arm/xen-stubs.c | 2 +-
hw/arm/xilinx_zynq.c | 4 +-
hw/arm/xlnx-versal-virt.c | 2 +-
hw/arm/xlnx-versal.c | 4 +-
hw/arm/xlnx-zcu102.c | 2 +-
hw/arm/xlnx-zynqmp.c | 4 +-
hw/audio/ac97.c | 2 +-
hw/audio/es1370.c | 2 +-
hw/audio/intel-hda.c | 2 +-
hw/audio/virtio-snd.c | 2 +-
hw/avr/atmega.c | 2 +-
hw/block/block.c | 4 +-
hw/block/dataplane/xen-block.c | 4 +-
hw/block/fdc-isa.c | 6 +-
hw/block/fdc.c | 6 +-
hw/block/hd-geometry.c | 2 +-
hw/block/m25p80.c | 2 +-
hw/block/nand.c | 2 +-
hw/block/pflash_cfi01.c | 6 +-
hw/block/pflash_cfi02.c | 2 +-
hw/block/swim.c | 2 +-
hw/block/vhost-user-blk.c | 4 +-
hw/block/virtio-blk.c | 8 +-
hw/block/xen-block.c | 6 +-
hw/char/goldfish_tty.c | 2 +-
hw/char/parallel-isa.c | 2 +-
hw/char/parallel.c | 4 +-
hw/char/riscv_htif.c | 4 +-
hw/char/serial-isa.c | 2 +-
hw/char/serial.c | 4 +-
hw/char/xen_console.c | 2 +-
hw/core/clock.c | 2 +-
hw/core/cpu-common.c | 4 +-
hw/core/{cpu-sysemu.c => cpu-system.c} | 2 +-
hw/core/generic-loader.c | 4 +-
hw/core/guest-loader.c | 4 +-
hw/core/loader-fit.c | 2 +-
hw/core/loader.c | 6 +-
hw/core/machine-hmp-cmds.c | 2 +-
hw/core/machine-qmp-cmds.c | 10 +--
hw/core/machine.c | 14 ++--
hw/core/numa.c | 6 +-
hw/core/ptimer.c | 4 +-
hw/core/qdev-properties-system.c | 4 +-
hw/core/reset.c | 2 +-
hw/core/sysbus-fdt.c | 4 +-
hw/core/vm-change-state-handler.c | 2 +-
hw/cpu/a15mpcore.c | 2 +-
hw/cxl/cxl-host.c | 2 +-
hw/cxl/cxl-mailbox-utils.c | 2 +-
hw/display/cirrus_vga.c | 2 +-
hw/display/qxl-render.c | 2 +-
hw/display/qxl.c | 2 +-
hw/display/ramfb.c | 2 +-
hw/display/vga.c | 2 +-
hw/display/virtio-gpu-gl.c | 2 +-
hw/display/virtio-gpu-udmabuf.c | 2 +-
hw/display/virtio-gpu.c | 6 +-
hw/display/xenfb.c | 2 +-
hw/dma/pl330.c | 2 +-
hw/dma/sifive_pdma.c | 2 +-
hw/dma/sparc32_dma.c | 2 +-
hw/dma/xilinx_axidma.c | 2 +-
hw/dma/xlnx-zynq-devcfg.c | 2 +-
hw/dma/xlnx_csu_dma.c | 2 +-
hw/gpio/gpio_pwr.c | 2 +-
hw/hppa/machine.c | 8 +-
hw/hyperv/hv-balloon.c | 6 +-
hw/hyperv/hyperv.c | 2 +-
hw/i386/acpi-build.c | 8 +-
hw/i386/fw_cfg.c | 2 +-
hw/i386/intel_iommu.c | 6 +-
hw/i386/kvm/apic.c | 4 +-
hw/i386/kvm/clock.c | 6 +-
hw/i386/kvm/i8254.c | 4 +-
hw/i386/kvm/i8259.c | 2 +-
hw/i386/kvm/ioapic.c | 2 +-
hw/i386/kvm/xen_evtchn.c | 4 +-
hw/i386/kvm/xen_gnttab.c | 4 +-
hw/i386/kvm/xen_overlay.c | 4 +-
hw/i386/kvm/xen_primary_console.c | 4 +-
hw/i386/kvm/xen_xenstore.c | 4 +-
hw/i386/microvm-dt.c | 2 +-
hw/i386/microvm.c | 10 +--
hw/i386/multiboot.c | 2 +-
hw/i386/nitro_enclave.c | 2 +-
hw/i386/pc.c | 8 +-
hw/i386/pc_piix.c | 8 +-
hw/i386/pc_q35.c | 6 +-
hw/i386/pc_sysfw.c | 4 +-
hw/i386/port92.c | 2 +-
hw/i386/sgx.c | 4 +-
hw/i386/vapic.c | 10 +--
hw/i386/vmport.c | 6 +-
hw/i386/x86-common.c | 6 +-
hw/i386/x86-cpu.c | 6 +-
hw/i386/x86-iommu.c | 2 +-
hw/i386/x86.c | 4 +-
hw/i386/xen/xen-pvh.c | 2 +-
hw/i386/xen/xen_platform.c | 4 +-
hw/ide/ahci-allwinner.c | 2 +-
hw/ide/ahci.c | 4 +-
hw/ide/atapi.c | 2 +-
hw/ide/cmd646.c | 4 +-
hw/ide/core.c | 12 +--
hw/ide/ich.c | 2 +-
hw/ide/ide-bus.c | 6 +-
hw/ide/ide-dev.c | 6 +-
hw/ide/isa.c | 2 +-
hw/ide/macio.c | 4 +-
hw/ide/mmio.c | 2 +-
hw/ide/pci.c | 2 +-
hw/ide/via.c | 2 +-
hw/input/pckbd.c | 4 +-
hw/input/ps2.c | 4 +-
hw/intc/apic.c | 2 +-
hw/intc/apic_common.c | 2 +-
hw/intc/arm_gic.c | 4 +-
hw/intc/arm_gic_common.c | 2 +-
hw/intc/arm_gic_kvm.c | 2 +-
hw/intc/arm_gicv2m.c | 2 +-
hw/intc/arm_gicv3_common.c | 2 +-
hw/intc/arm_gicv3_cpuif.c | 4 +-
hw/intc/arm_gicv3_its_common.c | 2 +-
hw/intc/arm_gicv3_its_kvm.c | 4 +-
hw/intc/arm_gicv3_kvm.c | 4 +-
hw/intc/armv7m_nvic.c | 4 +-
hw/intc/ioapic.c | 4 +-
hw/intc/mips_gic.c | 4 +-
hw/intc/openpic_kvm.c | 2 +-
hw/intc/pnv_xive.c | 6 +-
hw/intc/pnv_xive2.c | 8 +-
hw/intc/riscv_aplic.c | 4 +-
hw/intc/riscv_imsic.c | 4 +-
hw/intc/s390_flic_kvm.c | 2 +-
hw/intc/sifive_plic.c | 2 +-
hw/intc/spapr_xive.c | 4 +-
hw/intc/spapr_xive_kvm.c | 6 +-
hw/intc/xics.c | 4 +-
hw/intc/xics_kvm.c | 2 +-
hw/intc/xive.c | 6 +-
hw/intc/xive2.c | 4 +-
hw/ipmi/ipmi.c | 2 +-
hw/ipmi/ipmi_bmc_sim.c | 2 +-
hw/isa/isa-bus.c | 2 +-
hw/isa/isa-superio.c | 2 +-
hw/isa/lpc_ich9.c | 4 +-
hw/isa/piix.c | 2 +-
hw/loongarch/acpi-build.c | 6 +-
hw/loongarch/boot.c | 4 +-
hw/loongarch/fw_cfg.c | 2 +-
hw/loongarch/virt.c | 20 ++---
hw/m68k/an5206.c | 2 +-
hw/m68k/mcf5206.c | 2 +-
hw/m68k/mcf5208.c | 4 +-
hw/m68k/next-cube.c | 4 +-
hw/m68k/q800.c | 8 +-
hw/m68k/virt.c | 8 +-
hw/mem/cxl_type3.c | 4 +-
hw/mem/memory-device.c | 2 +-
hw/mem/nvdimm.c | 2 +-
hw/mem/pc-dimm.c | 4 +-
hw/mem/sparse-mem.c | 2 +-
hw/microblaze/boot.c | 4 +-
hw/microblaze/petalogix_ml605_mmu.c | 2 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
hw/mips/boston.c | 10 +--
hw/mips/cps.c | 4 +-
hw/mips/fuloong2e.c | 6 +-
hw/mips/jazz.c | 6 +-
hw/mips/loongson3_virt.c | 8 +-
hw/mips/malta.c | 8 +-
hw/mips/mips_int.c | 2 +-
hw/mips/mipssim.c | 6 +-
hw/misc/arm_sysctl.c | 2 +-
hw/misc/bcm2835_powermgt.c | 2 +-
hw/misc/bcm2835_property.c | 2 +-
hw/misc/debugexit.c | 2 +-
hw/misc/exynos4210_pmu.c | 2 +-
hw/misc/imx7_snvs.c | 6 +-
hw/misc/iotkit-sysctl.c | 2 +-
hw/misc/ivshmem.c | 4 +-
hw/misc/lasi.c | 4 +-
hw/misc/mac_via.c | 6 +-
hw/misc/macio/cuda.c | 4 +-
hw/misc/macio/mac_dbdma.c | 2 +-
hw/misc/macio/pmu.c | 4 +-
hw/misc/npcm7xx_clk.c | 2 +-
hw/misc/pci-testdev.c | 2 +-
hw/misc/pvpanic-isa.c | 2 +-
hw/misc/pvpanic-pci.c | 2 +-
hw/misc/pvpanic.c | 2 +-
hw/misc/sbsa_ec.c | 2 +-
hw/misc/sifive_e_aon.c | 2 +-
hw/misc/sifive_test.c | 4 +-
hw/misc/sifive_u_otp.c | 4 +-
hw/misc/slavio_misc.c | 2 +-
hw/misc/virt_ctrl.c | 2 +-
hw/misc/vmcoreinfo.c | 2 +-
hw/misc/zynq_slcr.c | 2 +-
hw/net/allwinner-sun8i-emac.c | 2 +-
hw/net/cadence_gem.c | 2 +-
hw/net/e1000.c | 4 +-
hw/net/e1000e.c | 2 +-
hw/net/e1000e_core.c | 2 +-
hw/net/eepro100.c | 6 +-
hw/net/ftgmac100.c | 2 +-
hw/net/igb.c | 2 +-
hw/net/igb_core.c | 2 +-
hw/net/imx_fec.c | 2 +-
hw/net/lance.c | 2 +-
hw/net/lasi_i82596.c | 2 +-
hw/net/mv88w8618_eth.c | 2 +-
hw/net/ne2000-isa.c | 2 +-
hw/net/ne2000-pci.c | 2 +-
hw/net/npcm7xx_emc.c | 2 +-
hw/net/npcm_gmac.c | 2 +-
hw/net/pcnet-pci.c | 4 +-
hw/net/rtl8139.c | 4 +-
hw/net/spapr_llan.c | 2 +-
hw/net/sungem.c | 2 +-
hw/net/sunhme.c | 2 +-
hw/net/tulip.c | 2 +-
hw/net/virtio-net.c | 6 +-
hw/net/vmxnet3.c | 2 +-
hw/nvme/ctrl.c | 8 +-
hw/nvme/dif.c | 2 +-
hw/nvme/ns.c | 4 +-
hw/nvram/chrp_nvram.c | 2 +-
hw/nvram/eeprom_at24c.c | 2 +-
hw/nvram/fw_cfg.c | 6 +-
hw/nvram/mac_nvram.c | 2 +-
hw/nvram/spapr_nvram.c | 8 +-
hw/nvram/xlnx-bbram.c | 2 +-
hw/nvram/xlnx-efuse.c | 2 +-
hw/openrisc/boot.c | 6 +-
hw/openrisc/cputimer.c | 2 +-
hw/openrisc/openrisc_sim.c | 8 +-
hw/openrisc/virt.c | 8 +-
hw/pci-bridge/pci_expander_bridge.c | 2 +-
hw/pci-host/bonito.c | 2 +-
hw/pci-host/pnv_phb.c | 2 +-
hw/pci-host/pnv_phb3.c | 2 +-
hw/pci-host/pnv_phb3_msi.c | 2 +-
hw/pci-host/pnv_phb4_pec.c | 2 +-
hw/pci-host/ppc4xx_pci.c | 2 +-
hw/pci-host/sabre.c | 2 +-
hw/pci/msi.c | 2 +-
hw/pci/msix.c | 2 +-
hw/pci/pci.c | 6 +-
hw/ppc/amigaone.c | 4 +-
hw/ppc/e500.c | 12 +--
hw/ppc/e500plat.c | 4 +-
hw/ppc/mac_newworld.c | 6 +-
hw/ppc/mac_oldworld.c | 6 +-
hw/ppc/mpc8544_guts.c | 2 +-
hw/ppc/mpc8544ds.c | 2 +-
hw/ppc/pef.c | 2 +-
hw/ppc/pegasos2.c | 10 +--
hw/ppc/pnv.c | 16 ++--
hw/ppc/pnv_chiptod.c | 2 +-
hw/ppc/pnv_core.c | 2 +-
hw/ppc/pnv_homer.c | 2 +-
hw/ppc/pnv_i2c.c | 2 +-
hw/ppc/pnv_pnor.c | 4 +-
hw/ppc/pnv_psi.c | 2 +-
hw/ppc/pnv_xscom.c | 2 +-
hw/ppc/ppc.c | 8 +-
hw/ppc/ppc405_boards.c | 6 +-
hw/ppc/ppc405_uc.c | 4 +-
hw/ppc/ppc440_bamboo.c | 8 +-
hw/ppc/ppc440_uc.c | 2 +-
hw/ppc/ppc_booke.c | 4 +-
hw/ppc/ppce500_spin.c | 2 +-
hw/ppc/prep.c | 4 +-
hw/ppc/prep_systemio.c | 2 +-
hw/ppc/sam460ex.c | 10 +--
hw/ppc/spapr.c | 20 ++---
hw/ppc/spapr_caps.c | 4 +-
hw/ppc/spapr_cpu_core.c | 10 +--
hw/ppc/spapr_drc.c | 4 +-
hw/ppc/spapr_events.c | 4 +-
hw/ppc/spapr_hcall.c | 6 +-
hw/ppc/spapr_iommu.c | 4 +-
hw/ppc/spapr_irq.c | 2 +-
hw/ppc/spapr_pci.c | 8 +-
hw/ppc/spapr_rng.c | 4 +-
hw/ppc/spapr_rtas.c | 12 +--
hw/ppc/spapr_rtc.c | 4 +-
hw/ppc/spapr_tpm_proxy.c | 2 +-
hw/ppc/spapr_vio.c | 4 +-
hw/ppc/spapr_vof.c | 2 +-
hw/ppc/virtex_ml507.c | 6 +-
hw/ppc/vof.c | 2 +-
hw/remote/message.c | 4 +-
hw/remote/mpqemu-link.c | 2 +-
hw/remote/proxy.c | 2 +-
hw/remote/remote-obj.c | 2 +-
hw/remote/vfio-user-obj.c | 4 +-
hw/riscv/boot.c | 8 +-
hw/riscv/microchip_pfsoc.c | 4 +-
hw/riscv/numa.c | 2 +-
hw/riscv/opentitan.c | 2 +-
hw/riscv/riscv_hart.c | 2 +-
hw/riscv/shakti_c.c | 2 +-
hw/riscv/sifive_e.c | 2 +-
hw/riscv/sifive_u.c | 6 +-
hw/riscv/spike.c | 4 +-
hw/riscv/virt-acpi-build.c | 2 +-
hw/riscv/virt.c | 12 +--
hw/rtc/allwinner-rtc.c | 2 +-
hw/rtc/aspeed_rtc.c | 2 +-
hw/rtc/ds1338.c | 2 +-
hw/rtc/exynos4210_rtc.c | 2 +-
hw/rtc/goldfish_rtc.c | 4 +-
hw/rtc/ls7a_rtc.c | 4 +-
hw/rtc/m41t80.c | 2 +-
hw/rtc/m48t59.c | 8 +-
hw/rtc/mc146818rtc.c | 10 +--
hw/rtc/pl031.c | 4 +-
hw/rtc/xlnx-zynqmp-rtc.c | 4 +-
hw/rx/rx-gdbsim.c | 6 +-
hw/rx/rx62n.c | 2 +-
hw/s390x/ipl.c | 6 +-
hw/s390x/s390-ccw.c | 2 +-
hw/s390x/s390-pci-bus.c | 4 +-
hw/s390x/s390-pci-inst.c | 2 +-
hw/s390x/s390-skeys-kvm.c | 2 +-
hw/s390x/s390-skeys.c | 4 +-
hw/s390x/s390-stattrib-kvm.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 6 +-
hw/s390x/sclpcpu.c | 2 +-
hw/s390x/sclpquiesce.c | 2 +-
hw/s390x/tod-kvm.c | 2 +-
hw/s390x/tod-tcg.c | 2 +-
hw/s390x/tod.c | 6 +-
hw/s390x/virtio-ccw.c | 4 +-
hw/scsi/lsi53c895a.c | 2 +-
hw/scsi/megasas.c | 6 +-
hw/scsi/mptendian.c | 2 +-
hw/scsi/mptsas.c | 2 +-
hw/scsi/scsi-bus.c | 10 +--
hw/scsi/scsi-disk.c | 10 +--
hw/scsi/scsi-generic.c | 2 +-
hw/scsi/vhost-scsi.c | 2 +-
hw/scsi/vhost-user-scsi.c | 2 +-
hw/scsi/virtio-scsi-dataplane.c | 2 +-
hw/scsi/virtio-scsi.c | 4 +-
hw/sd/allwinner-sdhost.c | 4 +-
hw/sd/bcm2835_sdhost.c | 2 +-
hw/sd/pl181.c | 2 +-
hw/sd/sd.c | 2 +-
hw/sd/sdhci.c | 2 +-
hw/sd/ssi-sd.c | 2 +-
hw/sh4/r2d.c | 6 +-
hw/sh4/sh7750.c | 2 +-
hw/smbios/smbios.c | 2 +-
hw/smbios/smbios_legacy.c | 2 +-
hw/sparc/leon3.c | 6 +-
hw/sparc/sun4m.c | 6 +-
hw/sparc64/niagara.c | 6 +-
hw/sparc64/sparc64.c | 2 +-
hw/sparc64/sun4u.c | 4 +-
hw/ssi/xilinx_spips.c | 2 +-
hw/timer/a9gtimer.c | 2 +-
hw/timer/pxa2xx_timer.c | 4 +-
hw/tpm/tpm_crb.c | 8 +-
hw/tpm/tpm_ppi.c | 2 +-
hw/tpm/tpm_spapr.c | 4 +-
hw/tpm/tpm_tis_common.c | 4 +-
hw/ufs/lu.c | 2 +-
hw/usb/bus-stub.c | 2 +-
hw/usb/bus.c | 2 +-
hw/usb/dev-network.c | 2 +-
hw/usb/dev-storage-classic.c | 4 +-
hw/usb/hcd-ehci.c | 2 +-
hw/usb/hcd-uhci.c | 2 +-
hw/usb/host-libusb.c | 4 +-
hw/usb/libhw.c | 2 +-
hw/usb/redirect.c | 4 +-
hw/vfio/ap.c | 2 +-
hw/vfio/ccw.c | 2 +-
hw/vfio/common.c | 8 +-
hw/vfio/container.c | 2 +-
hw/vfio/cpr.c | 2 +-
hw/vfio/iommufd.c | 4 +-
hw/vfio/migration.c | 2 +-
hw/vfio/pci.c | 6 +-
hw/vfio/platform.c | 4 +-
hw/vfio/spapr.c | 2 +-
hw/virtio/vdpa-dev.c | 4 +-
hw/virtio/vhost-user-fs.c | 2 +-
hw/virtio/vhost-user-scsi-pci.c | 2 +-
hw/virtio/vhost-user.c | 6 +-
hw/virtio/vhost.c | 2 +-
hw/virtio/virtio-balloon.c | 2 +-
hw/virtio/virtio-crypto.c | 2 +-
hw/virtio/virtio-iommu.c | 6 +-
hw/virtio/virtio-mem.c | 8 +-
hw/virtio/virtio-mmio.c | 4 +-
hw/virtio/virtio-pci.c | 4 +-
hw/virtio/virtio-pmem.c | 2 +-
hw/virtio/virtio-rng.c | 4 +-
hw/virtio/virtio.c | 4 +-
hw/watchdog/allwinner-wdt.c | 2 +-
hw/watchdog/cmsdk-apb-watchdog.c | 2 +-
hw/watchdog/sbsa_gwdt.c | 4 +-
hw/watchdog/watchdog.c | 4 +-
hw/watchdog/wdt_aspeed.c | 2 +-
hw/watchdog/wdt_diag288.c | 4 +-
hw/watchdog/wdt_i6300esb.c | 2 +-
hw/watchdog/wdt_ib700.c | 2 +-
hw/watchdog/wdt_imx2.c | 2 +-
hw/xen/xen-bus.c | 2 +-
hw/xen/xen-mapcache.c | 4 +-
hw/xen/xen-pvh-common.c | 6 +-
hw/xen/xen_devconfig.c | 4 +-
hw/xenpv/xen_machine_pv.c | 4 +-
hw/xtensa/sim.c | 4 +-
hw/xtensa/virt.c | 2 +-
hw/xtensa/xtfpga.c | 8 +-
iothread.c | 4 +-
migration/block-dirty-bitmap.c | 4 +-
migration/colo.c | 6 +-
migration/cpu-throttle.c | 4 +-
migration/dirtyrate.c | 4 +-
migration/global_state.c | 2 +-
migration/migration-hmp-cmds.c | 4 +-
migration/migration.c | 14 ++--
migration/multifd.c | 2 +-
migration/options.c | 4 +-
migration/postcopy-ram.c | 2 +-
migration/ram.c | 8 +-
migration/savevm.c | 12 +--
monitor/fds.c | 2 +-
monitor/hmp-cmds-target.c | 2 +-
monitor/hmp-cmds.c | 2 +-
monitor/hmp-target.c | 2 +-
monitor/hmp.c | 2 +-
monitor/monitor.c | 2 +-
monitor/qmp-cmds-control.c | 2 +-
monitor/qmp-cmds.c | 10 +--
net/colo-compare.c | 2 +-
net/dump.c | 2 +-
net/filter-replay.c | 2 +-
net/hub.c | 2 +-
net/net.c | 2 +-
net/slirp.c | 2 +-
net/tap.c | 2 +-
os-posix.c | 2 +-
os-win32.c | 2 +-
qemu-img.c | 2 +-
qemu-io-cmds.c | 2 +-
qemu-io.c | 2 +-
qemu-nbd.c | 4 +-
replay/replay-audio.c | 2 +-
replay/replay-char.c | 2 +-
replay/replay-debugging.c | 4 +-
replay/replay-events.c | 2 +-
replay/replay-input.c | 2 +-
replay/replay-internal.c | 4 +-
replay/replay-net.c | 2 +-
replay/replay-random.c | 2 +-
replay/replay-snapshot.c | 2 +-
replay/replay-time.c | 2 +-
replay/replay.c | 8 +-
replay/stubs-system.c | 2 +-
stats/stats-qmp-cmds.c | 2 +-
storage-daemon/qemu-storage-daemon.c | 2 +-
stubs/blk-commit-all.c | 2 +-
stubs/change-state-handler.c | 2 +-
stubs/cpu-get-clock.c | 2 +-
stubs/cpu-synchronize-state.c | 2 +-
stubs/cpus-virtual-clock.c | 2 +-
stubs/dump.c | 2 +-
stubs/get-vm-name.c | 2 +-
stubs/icount.c | 2 +-
stubs/qemu-timer-notify-cb.c | 2 +-
stubs/qtest.c | 2 +-
stubs/replay-mode.c | 2 +-
stubs/replay-tools.c | 2 +-
stubs/runstate-check.c | 2 +-
stubs/vm-stop.c | 2 +-
system/arch_init.c | 2 +-
system/balloon.c | 4 +-
system/bootdevice.c | 4 +-
system/cpu-timers.c | 10 +--
system/cpus.c | 12 +--
system/device_tree.c | 2 +-
system/dirtylimit.c | 6 +-
system/dma-helpers.c | 6 +-
system/globals.c | 4 +-
system/main.c | 2 +-
system/memory.c | 6 +-
system/memory_mapping.c | 2 +-
system/physmem.c | 18 ++---
system/qdev-monitor.c | 6 +-
system/qemu-seccomp.c | 2 +-
system/qtest.c | 6 +-
system/rtc.c | 6 +-
system/runstate-action.c | 4 +-
system/runstate.c | 16 ++--
system/tpm.c | 4 +-
system/vl.c | 38 +++++-----
target/alpha/sys_helper.c | 4 +-
target/alpha/translate.c | 2 +-
target/arm/arch_dump.c | 2 +-
target/arm/arm-powerctl.c | 2 +-
target/arm/cpu.c | 6 +-
target/arm/cpu64.c | 8 +-
target/arm/debug_helper.c | 2 +-
target/arm/gdbstub.c | 2 +-
target/arm/helper.c | 6 +-
target/arm/hvf/hvf.c | 10 +--
target/arm/kvm.c | 8 +-
target/arm/machine.c | 4 +-
target/arm/tcg/psci.c | 2 +-
target/hppa/sys_helper.c | 4 +-
target/i386/arch_dump.c | 4 +-
target/i386/arch_memory_mapping.c | 2 +-
target/i386/cpu-apic.c | 6 +-
target/i386/{cpu-sysemu.c => cpu-system.c} | 2 +-
target/i386/cpu.c | 4 +-
target/i386/helper.c | 4 +-
target/i386/host-cpu.c | 2 +-
target/i386/hvf/hvf-cpu.c | 4 +-
target/i386/hvf/hvf.c | 8 +-
target/i386/hvf/x86_cpuid.c | 2 +-
target/i386/hvf/x86_task.c | 2 +-
target/i386/hvf/x86hvf.c | 2 +-
target/i386/kvm/kvm-cpu.c | 2 +-
target/i386/kvm/kvm.c | 8 +-
target/i386/kvm/xen-emu.c | 6 +-
target/i386/machine.c | 6 +-
target/i386/nvmm/nvmm-accel-ops.c | 6 +-
target/i386/nvmm/nvmm-all.c | 6 +-
.../{sev-sysemu-stub.c => sev-system-stub.c} | 0
target/i386/sev.c | 6 +-
target/i386/tcg/excp_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/bpt_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/excp_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/fpu_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/misc_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/seg_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/smm_helper.c | 2 +-
.../i386/tcg/{sysemu => system}/svm_helper.c | 2 +-
target/i386/tcg/{sysemu => system}/tcg-cpu.c | 4 +-
target/i386/tcg/translate.c | 2 +-
target/i386/whpx/whpx-accel-ops.c | 6 +-
target/i386/whpx/whpx-all.c | 6 +-
target/i386/whpx/whpx-apic.c | 4 +-
target/loongarch/arch_dump.c | 2 +-
target/loongarch/cpu.c | 8 +-
target/loongarch/kvm/kvm.c | 8 +-
target/loongarch/machine.c | 2 +-
target/mips/cpu.c | 4 +-
target/mips/kvm.c | 6 +-
target/mips/{sysemu => system}/addr.c | 0
target/mips/{sysemu => system}/cp0.c | 0
target/mips/{sysemu => system}/cp0_timer.c | 2 +-
target/mips/{sysemu => system}/machine.c | 0
.../mips/{sysemu => system}/mips-qmp-cmds.c | 0
target/mips/{sysemu => system}/physaddr.c | 0
.../mips/tcg/{sysemu => system}/cp0_helper.c | 0
.../mips/tcg/{sysemu => system}/lcsr_helper.c | 0
.../mips/tcg/{sysemu => system}/mips-semi.c | 0
.../tcg/{sysemu => system}/semihosting-stub.c | 0
.../tcg/{sysemu => system}/special_helper.c | 0
.../mips/tcg/{sysemu => system}/tlb_helper.c | 0
target/mips/tcg/translate.c | 2 +-
target/ppc/arch_dump.c | 4 +-
target/ppc/compat.c | 6 +-
target/ppc/cpu.c | 2 +-
target/ppc/cpu_init.c | 6 +-
target/ppc/excp_helper.c | 6 +-
target/ppc/helper_regs.c | 4 +-
target/ppc/kvm.c | 14 ++--
target/ppc/machine.c | 6 +-
target/ppc/mmu-hash32.c | 2 +-
target/ppc/mmu-hash64.c | 2 +-
target/ppc/mmu-radix64.c | 2 +-
target/ppc/mmu_common.c | 2 +-
target/ppc/mmu_helper.c | 2 +-
target/riscv/arch_dump.c | 2 +-
target/riscv/cpu.c | 6 +-
target/riscv/cpu_helper.c | 2 +-
target/riscv/csr.c | 2 +-
target/riscv/debug.c | 2 +-
target/riscv/kvm/kvm-cpu.c | 8 +-
target/riscv/machine.c | 4 +-
target/riscv/pmu.c | 4 +-
target/riscv/riscv-qmp-cmds.c | 4 +-
target/s390x/arch_dump.c | 2 +-
target/s390x/cpu-dump.c | 2 +-
target/s390x/{cpu-sysemu.c => cpu-system.c} | 18 ++---
target/s390x/cpu.c | 14 ++--
target/s390x/cpu_models.c | 6 +-
...pu_models_sysemu.c => cpu_models_system.c} | 4 +-
target/s390x/diag.c | 4 +-
target/s390x/gdbstub.c | 4 +-
target/s390x/helper.c | 6 +-
target/s390x/interrupt.c | 4 +-
target/s390x/kvm/kvm.c | 10 +--
target/s390x/kvm/pv.c | 4 +-
target/s390x/machine.c | 4 +-
target/s390x/mmu_helper.c | 4 +-
target/s390x/sigp.c | 6 +-
target/s390x/tcg/misc_helper.c | 4 +-
target/sh4/helper.c | 2 +-
target/sparc/int32_helper.c | 2 +-
tests/qtest/fuzz/fuzz.c | 6 +-
tests/qtest/vhost-user-test.c | 2 +-
tests/unit/test-bdrv-drain.c | 2 +-
tests/unit/test-bdrv-graph-mod.c | 2 +-
tests/unit/test-block-backend.c | 2 +-
tests/unit/test-block-iothread.c | 2 +-
tests/unit/test-blockjob-txn.c | 2 +-
tests/unit/test-blockjob.c | 2 +-
tests/unit/test-char.c | 2 +-
tests/unit/test-image-locking.c | 2 +-
tests/unit/test-replication.c | 2 +-
tests/unit/test-seccomp.c | 2 +-
tests/unit/test-throttle.c | 2 +-
tests/unit/test-timed-average.c | 2 +-
tests/unit/test-yank.c | 2 +-
ui/curses.c | 2 +-
ui/dbus-clipboard.c | 2 +-
ui/dbus-listener.c | 2 +-
ui/dbus.c | 2 +-
ui/egl-helpers.c | 2 +-
ui/gtk-egl.c | 2 +-
ui/gtk-gl-area.c | 2 +-
ui/gtk.c | 4 +-
ui/input-barrier.c | 2 +-
ui/input-linux.c | 2 +-
ui/input.c | 6 +-
ui/sdl2.c | 6 +-
ui/spice-app.c | 2 +-
ui/spice-core.c | 4 +-
ui/vnc.c | 4 +-
ui/win32-kbd-hook.c | 2 +-
util/async.c | 2 +-
util/main-loop.c | 4 +-
util/oslib-posix.c | 2 +-
util/qemu-timer.c | 6 +-
crypto/akcipher-gcrypt.c.inc | 2 +-
crypto/akcipher-nettle.c.inc | 2 +-
block/meson.build | 6 +-
hw/core/meson.build | 2 +-
net/vmnet-common.m | 2 +-
scripts/clean-includes | 6 +-
.../codeconverter/test_regexps.py | 4 +-
scripts/coverity-scan/COMPONENTS.md | 4 +-
target/i386/meson.build | 5 +-
target/i386/tcg/meson.build | 2 +-
.../i386/tcg/{sysemu => system}/meson.build | 0
target/mips/meson.build | 2 +-
target/mips/{sysemu => system}/meson.build | 0
target/mips/tcg/meson.build | 2 +-
.../mips/tcg/{sysemu => system}/meson.build | 0
target/s390x/meson.build | 4 +-
target/s390x/trace-events | 2 +-
ui/cocoa.m | 10 +--
965 files changed, 1708 insertions(+), 1707 deletions(-)
rename include/{sysemu => system}/accel-blocker.h (98%)
rename include/{sysemu => system}/accel-ops.h (100%)
rename include/{sysemu => system}/arch_init.h (100%)
rename include/{sysemu => system}/balloon.h (100%)
rename include/{sysemu => system}/block-backend-common.h (100%)
rename include/{sysemu => system}/block-backend-global-state.h (100%)
rename include/{sysemu => system}/block-backend-io.h (100%)
rename include/{sysemu => system}/block-backend.h (100%)
rename include/{sysemu => system}/block-ram-registrar.h (100%)
rename include/{sysemu => system}/blockdev.h (100%)
rename include/{sysemu => system}/cpu-throttle.h (95%)
rename include/{sysemu => system}/cpu-timers-internal.h (100%)
rename include/{sysemu => system}/cpu-timers.h (96%)
rename include/{sysemu => system}/cpus.h (97%)
rename include/{sysemu => system}/cryptodev-vhost-user.h (97%)
rename include/{sysemu => system}/cryptodev-vhost.h (99%)
rename include/{sysemu => system}/cryptodev.h (100%)
rename include/{sysemu => system}/device_tree.h (100%)
rename include/{sysemu => system}/dirtylimit.h (100%)
rename include/{sysemu => system}/dirtyrate.h (100%)
rename include/{sysemu => system}/dma.h (100%)
rename include/{sysemu => system}/dump-arch.h (100%)
rename include/{sysemu => system}/dump.h (99%)
rename include/{sysemu => system}/event-loop-base.h (100%)
rename include/{sysemu => system}/host_iommu_device.h (100%)
rename include/{sysemu => system}/hostmem.h (97%)
rename include/{sysemu => system}/hvf.h (100%)
rename include/{sysemu => system}/hvf_int.h (100%)
rename include/{sysemu => system}/hw_accel.h (83%)
rename include/{sysemu => system}/iommufd.h (96%)
rename include/{sysemu => system}/iothread.h (97%)
rename include/{sysemu => system}/kvm.h (100%)
rename include/{sysemu => system}/kvm_int.h (99%)
rename include/{sysemu => system}/kvm_xen.h (93%)
rename include/{sysemu => system}/memory_mapping.h (100%)
rename include/{sysemu => system}/numa.h (98%)
rename include/{sysemu => system}/nvmm.h (100%)
rename include/{sysemu => system}/os-posix.h (100%)
rename include/{sysemu => system}/os-win32.h (100%)
rename include/{sysemu => system}/qtest.h (100%)
rename include/{sysemu => system}/replay.h (99%)
rename include/{sysemu => system}/reset.h (98%)
rename include/{sysemu => system}/rng-random.h (100%)
rename include/{sysemu => system}/rng.h (100%)
rename include/{sysemu => system}/rtc.h (98%)
rename include/{sysemu => system}/runstate-action.h (100%)
rename include/{sysemu => system}/runstate.h (98%)
rename include/{sysemu => system}/seccomp.h (100%)
rename include/{sysemu => system}/spdm-socket.h (100%)
rename include/{sysemu => system}/stats.h (100%)
rename include/{sysemu/sysemu.h => system/system.h} (99%)
rename include/{sysemu => system}/tcg.h (88%)
rename include/{sysemu => system}/tpm.h (100%)
rename include/{sysemu => system}/tpm_backend.h (99%)
rename include/{sysemu => system}/tpm_util.h (94%)
rename include/{sysemu => system}/vhost-user-backend.h (100%)
rename include/{sysemu => system}/watchdog.h (100%)
rename include/{sysemu => system}/whpx.h (100%)
rename include/{sysemu => system}/xen-mapcache.h (98%)
rename include/{sysemu => system}/xen.h (92%)
rename target/mips/tcg/{sysemu_helper.h.inc => system_helper.h.inc} (99%)
rename block/{qapi-sysemu.c => qapi-system.c} (99%)
rename hw/core/{cpu-sysemu.c => cpu-system.c} (98%)
rename target/i386/{cpu-sysemu.c => cpu-system.c} (99%)
rename target/i386/{sev-sysemu-stub.c => sev-system-stub.c} (100%)
rename target/i386/tcg/{sysemu => system}/bpt_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/excp_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/fpu_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/misc_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/seg_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/smm_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/svm_helper.c (99%)
rename target/i386/tcg/{sysemu => system}/tcg-cpu.c (96%)
rename target/mips/{sysemu => system}/addr.c (100%)
rename target/mips/{sysemu => system}/cp0.c (100%)
rename target/mips/{sysemu => system}/cp0_timer.c (99%)
rename target/mips/{sysemu => system}/machine.c (100%)
rename target/mips/{sysemu => system}/mips-qmp-cmds.c (100%)
rename target/mips/{sysemu => system}/physaddr.c (100%)
rename target/mips/tcg/{sysemu => system}/cp0_helper.c (100%)
rename target/mips/tcg/{sysemu => system}/lcsr_helper.c (100%)
rename target/mips/tcg/{sysemu => system}/mips-semi.c (100%)
rename target/mips/tcg/{sysemu => system}/semihosting-stub.c (100%)
rename target/mips/tcg/{sysemu => system}/special_helper.c (100%)
rename target/mips/tcg/{sysemu => system}/tlb_helper.c (100%)
rename target/s390x/{cpu-sysemu.c => cpu-system.c} (96%)
rename target/s390x/{cpu_models_sysemu.c => cpu_models_system.c} (99%)
rename target/i386/tcg/{sysemu => system}/meson.build (100%)
rename target/mips/{sysemu => system}/meson.build (100%)
rename target/mips/tcg/{sysemu => system}/meson.build (100%)MAINTAINERS +38 -38
@@ -170,8 +170,8 @@ F: include/exec/helper*.h F: include/exec/helper*.h.inc F: include/exec/helper-info.c.inc F: include/exec/page-protection.h -F: include/sysemu/cpus.h -F: include/sysemu/tcg.h +F: include/system/cpus.h +F: include/system/tcg.h F: include/hw/core/tcg-cpu-ops.h F: host/include/*/host/cpuinfo.h F: util/cpuinfo-*.c
@@ -434,7 +434,7 @@ F: */*/kvm* F: accel/kvm/ F: accel/stubs/kvm-stub.c F: include/hw/kvm/ -F: include/sysemu/kvm*.h +F: include/system/kvm*.h F: scripts/kvm/kvm_flightrecorder ARM KVM CPUs
@@ -447,7 +447,7 @@ MIPS KVM CPUs M: Huacai Chen <[email protected]> S: Odd Fixes F: target/mips/kvm* -F: target/mips/sysemu/ +F: target/mips/system/ PPC KVM CPUs M: Nicholas Piggin <[email protected]>
@@ -481,7 +481,7 @@ Xen emulation on X86 KVM CPUs M: David Woodhouse <[email protected]> M: Paul Durrant <[email protected]> S: Supported -F: include/sysemu/kvm_xen.h +F: include/system/kvm_xen.h F: target/i386/kvm/xen* F: hw/i386/kvm/xen* F: tests/avocado/kvm_xen_guest.py
@@ -493,7 +493,7 @@ M: Richard Henderson <[email protected]> R: Paolo Bonzini <[email protected]> S: Maintained F: include/qemu/accel.h -F: include/sysemu/accel-*.h +F: include/system/accel-*.h F: include/hw/core/accel-cpu.h F: accel/accel-*.c F: accel/Makefile.objs
@@ -517,14 +517,14 @@ M: Roman Bolshakov <[email protected]> W: https://wiki.qemu.org/Features/HVF S: Maintained F: accel/hvf/ -F: include/sysemu/hvf.h -F: include/sysemu/hvf_int.h +F: include/system/hvf.h +F: include/system/hvf_int.h WHPX CPUs M: Sunil Muthuswamy <[email protected]> S: Supported F: target/i386/whpx/ -F: include/sysemu/whpx.h +F: include/system/whpx.h Guest CPU Cores (Xen) ---------------------
@@ -550,8 +550,8 @@ F: hw/i386/xen/ F: hw/pci-host/xen_igd_pt.c F: include/hw/block/dataplane/xen* F: include/hw/xen/ -F: include/sysemu/xen.h -F: include/sysemu/xen-mapcache.h +F: include/system/xen.h +F: include/system/xen-mapcache.h F: stubs/xen-hw-stub.c F: docs/system/arm/xenpvh.rst F: docs/system/i386/xenpvh.rst
@@ -561,7 +561,7 @@ Guest CPU Cores (NVMM) NetBSD Virtual Machine Monitor (NVMM) CPU support M: Reinoud Zandijk <[email protected]> S: Maintained -F: include/sysemu/nvmm.h +F: include/system/nvmm.h F: target/i386/nvmm/ Hosts
@@ -579,7 +579,7 @@ POSIX M: Paolo Bonzini <[email protected]> S: Maintained F: os-posix.c -F: include/sysemu/os-posix.h +F: include/system/os-posix.h F: util/*posix*.c F: include/qemu/*posix*.h
@@ -1866,7 +1866,7 @@ R: Yanan Wang <[email protected]> R: Zhao Liu <[email protected]> S: Supported F: hw/core/cpu-common.c -F: hw/core/cpu-sysemu.c +F: hw/core/cpu-system.c F: hw/core/machine-qmp-cmds.c F: hw/core/machine.c F: hw/core/machine-smp.c
@@ -1879,7 +1879,7 @@ F: qapi/machine-target.json F: include/hw/boards.h F: include/hw/core/cpu.h F: include/hw/cpu/cluster.h -F: include/sysemu/numa.h +F: include/system/numa.h F: tests/functional/test_cpu_queries.py F: tests/functional/test_empty_cpu_model.py F: tests/unit/test-smp-parse.c
@@ -2189,9 +2189,9 @@ M: Eric Auger <[email protected]> M: Zhenzhong Duan <[email protected]> S: Supported F: backends/iommufd.c -F: include/sysemu/iommufd.h +F: include/system/iommufd.h F: backends/host_iommu_device.c -F: include/sysemu/host_iommu_device.h +F: include/system/host_iommu_device.h F: include/qemu/chardev_open.h F: util/chardev_open.c F: docs/devel/vfio-iommufd.rst
@@ -2205,7 +2205,7 @@ F: docs/interop/vhost-user.json F: docs/interop/vhost-user.rst F: contrib/vhost-user-*/ F: backends/vhost-user.c -F: include/sysemu/vhost-user-backend.h +F: include/system/vhost-user-backend.h F: subprojects/libvhost-user/ vhost-shadow-virtqueue
@@ -2233,7 +2233,7 @@ F: docs/interop/virtio-balloon-stats.rst F: hw/virtio/virtio-balloon*.c F: include/hw/virtio/virtio-balloon.h F: system/balloon.c -F: include/sysemu/balloon.h +F: include/system/balloon.h F: tests/qtest/virtio-balloon-test.c virtio-9p
@@ -2315,7 +2315,7 @@ R: Amit Shah <[email protected]> S: Supported F: hw/virtio/virtio-rng.c F: include/hw/virtio/virtio-rng.h -F: include/sysemu/rng*.h +F: include/system/rng*.h F: backends/rng*.c F: tests/qtest/virtio-rng-test.c
@@ -2841,7 +2841,7 @@ F: hw/block/ F: qapi/block*.json F: qapi/transaction.json F: include/block/ -F: include/sysemu/block-*.h +F: include/system/block-*.h F: qemu-img* F: docs/tools/qemu-img.rst F: qemu-io*
@@ -2980,7 +2980,7 @@ M: Alistair Francis <[email protected]> R: David Gibson <[email protected]> S: Maintained F: system/device_tree.c -F: include/sysemu/device_tree.h +F: include/system/device_tree.h Dump S: Supported
@@ -2989,8 +2989,8 @@ F: dump/ F: hw/misc/vmcoreinfo.c F: include/hw/misc/vmcoreinfo.h F: include/qemu/win_dump_defs -F: include/sysemu/dump-arch.h -F: include/sysemu/dump.h +F: include/system/dump-arch.h +F: include/system/dump.h F: qapi/dump.json F: scripts/dump-guest-memory.py F: stubs/dump.c
@@ -3036,7 +3036,7 @@ F: include/exec/memop.h F: include/exec/memory.h F: include/exec/ram_addr.h F: include/exec/ramblock.h -F: include/sysemu/memory_mapping.h +F: include/system/memory_mapping.h F: system/dma-helpers.c F: system/ioport.c F: system/memory.c
@@ -3089,8 +3089,8 @@ Main loop M: Paolo Bonzini <[email protected]> S: Maintained F: include/qemu/main-loop.h -F: include/sysemu/runstate.h -F: include/sysemu/runstate-action.h +F: include/system/runstate.h +F: include/system/runstate-action.h F: util/main-loop.c F: util/qemu-timer*.c F: system/vl.c
@@ -3153,7 +3153,7 @@ M: David Hildenbrand <[email protected]> M: Igor Mammedov <[email protected]> S: Maintained F: backends/hostmem*.c -F: include/sysemu/hostmem.h +F: include/system/hostmem.h F: docs/system/vm-templating.rst T: git https://gitlab.com/ehabkost/qemu.git machine-next
@@ -3161,7 +3161,7 @@ Cryptodev Backends M: Gonglei <[email protected]> M: zhenwei pi <[email protected]> S: Maintained -F: include/sysemu/cryptodev*.h +F: include/system/cryptodev*.h F: backends/cryptodev*.c F: qapi/cryptodev.json
@@ -3310,7 +3310,7 @@ M: Laurent Vivier <[email protected]> R: Paolo Bonzini <[email protected]> S: Maintained F: system/qtest.c -F: include/sysemu/qtest.h +F: include/system/qtest.h F: accel/qtest/ F: tests/qtest/ F: docs/devel/qgraph.rst
@@ -3361,7 +3361,7 @@ T: git https://people.debian.org/~sthibault/qemu.git slirp Stats S: Orphan -F: include/sysemu/stats.h +F: include/system/stats.h F: stats/ F: qapi/stats.json
@@ -3402,7 +3402,7 @@ S: Maintained F: system/tpm* F: hw/tpm/* F: include/hw/acpi/tpm.h -F: include/sysemu/tpm* +F: include/system/tpm* F: qapi/tpm.json F: backends/tpm/ F: tests/qtest/*tpm*
@@ -3413,7 +3413,7 @@ SPDM M: Alistair Francis <[email protected]> S: Maintained F: backends/spdm-socket.c -F: include/sysemu/spdm-socket.h +F: include/system/spdm-socket.h Checkpatch S: Odd Fixes
@@ -3448,10 +3448,10 @@ Migration dirty limit and dirty page rate M: Hyman Huang <[email protected]> S: Maintained F: system/dirtylimit.c -F: include/sysemu/dirtylimit.h +F: include/system/dirtylimit.h F: migration/dirtyrate.c F: migration/dirtyrate.h -F: include/sysemu/dirtyrate.h +F: include/system/dirtyrate.h F: docs/devel/migration/dirty-limit.rst Detached LUKS header
@@ -3479,7 +3479,7 @@ Seccomp M: Daniel P. Berrange <[email protected]> S: Odd Fixes F: system/qemu-seccomp.c -F: include/sysemu/seccomp.h +F: include/system/seccomp.h F: tests/unit/test-seccomp.c Cryptography
@@ -3592,7 +3592,7 @@ F: replay/* F: block/blkreplay.c F: net/filter-replay.c F: include/exec/replay-core.h -F: include/sysemu/replay.h +F: include/system/replay.h F: docs/devel/replay.rst F: docs/system/replay.rst F: stubs/replay.c
@@ -3711,7 +3711,7 @@ M: Peter Maydell <[email protected]> S: Maintained F: include/hw/resettable.h F: include/hw/core/resetcontainer.h -F: include/sysemu/reset.h +F: include/system/reset.h F: hw/core/reset.c F: hw/core/resettable.c F: hw/core/resetcontainer.c
docs/specs/tpm.rst +4 -4
@@ -205,8 +205,8 @@ to be used with the passthrough backend or the swtpm backend. QEMU files related to TPM backends: - ``backends/tpm.c`` - - ``include/sysemu/tpm.h`` - - ``include/sysemu/tpm_backend.h`` + - ``include/system/tpm.h`` + - ``include/system/tpm_backend.h`` The QEMU TPM passthrough device -------------------------------
@@ -240,7 +240,7 @@ PCRs. QEMU files related to the TPM passthrough device: - ``backends/tpm/tpm_passthrough.c`` - ``backends/tpm/tpm_util.c`` - - ``include/sysemu/tpm_util.h`` + - ``include/system/tpm_util.h`` Command line to start QEMU with the TPM passthrough device using the host's
@@ -301,7 +301,7 @@ command. QEMU files related to the TPM emulator device: - ``backends/tpm/tpm_emulator.c`` - ``backends/tpm/tpm_util.c`` - - ``include/sysemu/tpm_util.h`` + - ``include/system/tpm_util.h`` The following commands start the swtpm with a UnixIO control channel over a socket interface. They do not need to be run as root.
accel/kvm/kvm-cpus.h +1 -1
@@ -10,7 +10,7 @@#ifndef KVM_CPUS_H #define KVM_CPUS_H -#include "sysemu/cpus.h" +#include "system/cpus.h" int kvm_init_vcpu (CPUState *cpu,Error **errp);int kvm_cpu_exec (CPUState *cpu);
accel/tcg/tcg-accel-ops.h +1 -1
@@ -12,7 +12,7 @@#ifndef TCG_ACCEL_OPS_H #define TCG_ACCEL_OPS_H -#include "sysemu/cpus.h" +#include "system/cpus.h" void tcg_cpu_destroy (CPUState *cpu);int tcg_cpu_exec (CPUState *cpu);
backends/tpm/tpm_int.h +1 -1
@@ -13,7 +13,7 @@#define BACKENDS_TPM_INT_H #include "qemu/option.h" -#include "sysemu/tpm.h" +#include "system/tpm.h" #define TPM_STANDARD_CMDLINE_OPTS \ { \
block/coroutines.h +1 -1
@@ -28,7 +28,7 @@#include "block/block_int.h" /* For blk_bs() in generated block/block-gen.c */ -#include "sysemu/block-backend.h" +#include "system/block-backend.h" /* * I/O API functions. These functions are thread-safe.
block/export/virtio-blk-handler.h +1 -1
@@ -13,7 +13,7 @@#ifndef VIRTIO_BLK_HANDLER_H #define VIRTIO_BLK_HANDLER_H -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #define VIRTIO_BLK_SECTOR_BITS 9#define VIRTIO_BLK_SECTOR_SIZE (1ULL << VIRTIO_BLK_SECTOR_BITS)
dump/win_dump.h +1 -1
@@ -11,7 +11,7 @@#ifndef WIN_DUMP_H #define WIN_DUMP_H -#include "sysemu/dump.h" +#include "system/dump.h" /* Check Windows dump availability for the current target */ bool win_dump_available (Error **errp);
hw/acpi/hmat.h +1 -1
@@ -28,7 +28,7 @@#define HMAT_H #include "hw/acpi/bios-linker-loader.h" -#include "sysemu/numa.h" +#include "system/numa.h" /* * ACPI 6.3: 5.2.27.3 Memory Proximity Domain Attributes Structure,
hw/block/dataplane/xen-block.h +1 -1
@@ -10,7 +10,7 @@#include "hw/block/block.h" #include "hw/xen/xen-bus.h" -#include "sysemu/iothread.h" +#include "system/iothread.h" typedef struct XenBlockDataPlane XenBlockDataPlane ;
hw/tpm/tpm_prop.h +1 -1
@@ -22,7 +22,7 @@#ifndef HW_TPM_PROP_H #define HW_TPM_PROP_H -#include "sysemu/tpm_backend.h" +#include "system/tpm_backend.h" #include "hw/qdev-properties.h" extern const PropertyInfo qdev_prop_tpm;
hw/tpm/tpm_tis.h +1 -1
@@ -24,7 +24,7 @@#ifndef TPM_TPM_TIS_H #define TPM_TPM_TIS_H -#include "sysemu/tpm_backend.h" +#include "system/tpm_backend.h" #include "tpm_ppi.h" #define TPM_TIS_NUM_LOCALITIES 5/* per spec */
hw/usb/hcd-dwc2.h +1 -1
@@ -23,7 +23,7 @@#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/usb.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "qom/object.h" #define DWC2_MMIO_SIZE 0x11000
hw/usb/hcd-ehci.h +1 -1
@@ -20,7 +20,7 @@#include "qemu/timer.h" #include "hw/usb.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "hw/pci/pci_device.h" #include "hw/sysbus.h"
hw/usb/hcd-ohci.h +1 -1
@@ -22,7 +22,7 @@#define HCD_OHCI_H #include "hw/sysbus.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "hw/usb.h" #include "qom/object.h"
hw/usb/hcd-xhci.h +1 -1
@@ -25,7 +25,7 @@#include "hw/usb.h" #include "hw/usb/xhci.h" -#include "sysemu/dma.h" +#include "system/dma.h" OBJECT_DECLARE_SIMPLE_TYPE (XHCIState,XHCI )
hw/vfio/pci.h +1 -1
@@ -19,7 +19,7 @@#include "qemu/queue.h" #include "qemu/timer.h" #include "qom/object.h" -#include "sysemu/kvm.h" +#include "system/kvm.h" #define PCI_ANY_ID (~0)
include/exec/ram_addr.h +2 -2
@@ -21,8 +21,8 @@#ifndef CONFIG_USER_ONLY #include "cpu.h" -#include "sysemu/xen.h" -#include "sysemu/tcg.h" +#include "system/xen.h" +#include "system/tcg.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h"
include/hw/acpi/tpm.h +1 -1
@@ -19,7 +19,7 @@#include "qemu/units.h" #include "hw/registerfields.h" #include "hw/acpi/aml-build.h" -#include "sysemu/tpm.h" +#include "system/tpm.h" #ifdef CONFIG_TPM
include/hw/arm/allwinner-a10.h +1 -1
@@ -14,7 +14,7 @@#include "hw/i2c/allwinner-i2c.h" #include "hw/ssi/allwinner-a10-spi.h" #include "hw/watchdog/allwinner-wdt.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "target/arm/cpu.h" #include "qom/object.h"
include/hw/arm/allwinner-h3.h +1 -1
@@ -49,7 +49,7 @@#include "hw/i2c/allwinner-i2c.h" #include "hw/watchdog/allwinner-wdt.h" #include "target/arm/cpu.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" /** * Allwinner H3 device list
include/hw/arm/allwinner-r40.h +1 -1
@@ -35,7 +35,7 @@#include "hw/usb/hcd-ehci.h" #include "hw/watchdog/allwinner-wdt.h" #include "target/arm/cpu.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" enum {AW_R40_DEV_SRAM_A1 ,
include/hw/arm/virt.h +1 -1
@@ -36,7 +36,7 @@#include "hw/arm/boot.h" #include "hw/arm/bsa.h" #include "hw/block/flash.h" -#include "sysemu/kvm.h" +#include "system/kvm.h" #include "hw/intc/arm_gicv3_common.h" #include "qom/object.h"
include/hw/boards.h +2 -2
@@ -4,8 +4,8 @@#define HW_BOARDS_H #include "exec/memory.h" -#include "sysemu/hostmem.h" -#include "sysemu/blockdev.h" +#include "system/hostmem.h" +#include "system/blockdev.h" #include "qapi/qapi-types-machine.h" #include "qemu/module.h" #include "qom/object.h"
include/hw/core/sysemu-cpu-ops.h +3 -3
@@ -7,8 +7,8 @@* See the COPYING file in the top-level directory. */ -#ifndef SYSEMU_CPU_OPS_H -#define SYSEMU_CPU_OPS_H +#ifndef SYSTEM_CPU_OPS_H +#define SYSTEM_CPU_OPS_H #include "hw/core/cpu.h"
@@ -89,4 +89,4 @@ typedef struct SysemuCPUOps { } SysemuCPUOps; -#endif /* SYSEMU_CPU_OPS_H */ +#endif /* SYSTEM_CPU_OPS_H */
include/hw/dma/xlnx-zdma.h +1 -1
@@ -31,7 +31,7 @@#include "hw/sysbus.h" #include "hw/register.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "qom/object.h" #define ZDMA_R_MAX (0x204 / 4)
include/hw/dma/xlnx_dpdma.h +1 -1
@@ -27,7 +27,7 @@#include "hw/sysbus.h" #include "ui/console.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "qom/object.h" #define XLNX_DPDMA_REG_ARRAY_SIZE (0x1000 >> 2)
include/hw/hyperv/vmbus.h +2 -2
@@ -10,8 +10,8 @@#ifndef HW_HYPERV_VMBUS_H #define HW_HYPERV_VMBUS_H -#include "sysemu/sysemu.h" -#include "sysemu/dma.h" +#include "system/system.h" +#include "system/dma.h" #include "hw/qdev-core.h" #include "migration/vmstate.h" #include "hw/hyperv/vmbus-proto.h"
include/hw/i386/hostmem-epc.h +1 -1
@@ -12,7 +12,7 @@#ifndef QEMU_HOSTMEM_EPC_H #define QEMU_HOSTMEM_EPC_H -#include "sysemu/hostmem.h" +#include "system/hostmem.h" #define TYPE_MEMORY_BACKEND_EPC "memory-backend-epc"
include/hw/ide/ide-dev.h +1 -1
@@ -20,7 +20,7 @@#ifndef IDE_DEV_H #define IDE_DEV_H -#include "sysemu/dma.h" +#include "system/dma.h" #include "hw/qdev-properties.h" #include "hw/block/block.h"
include/hw/isa/superio.h +1 -1
@@ -10,7 +10,7 @@#ifndef HW_ISA_SUPERIO_H #define HW_ISA_SUPERIO_H -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/isa/isa.h" #include "qom/object.h"
include/hw/nvram/fw_cfg.h +1 -1
@@ -4,7 +4,7 @@#include "exec/hwaddr.h" #include "standard-headers/linux/qemu_fw_cfg.h" #include "hw/sysbus.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "qom/object.h" #define TYPE_FW_CFG "fw_cfg"
include/hw/nvram/xlnx-bbram.h +1 -1
@@ -26,7 +26,7 @@#ifndef XLNX_BBRAM_H #define XLNX_BBRAM_H -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "hw/qdev-core.h" #include "hw/irq.h" #include "hw/sysbus.h"
include/hw/nvram/xlnx-efuse.h +1 -1
@@ -27,7 +27,7 @@#ifndef XLNX_EFUSE_H #define XLNX_EFUSE_H -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "hw/qdev-core.h" #define TYPE_XLNX_EFUSE "xlnx-efuse"
include/hw/pci/pci.h +2 -2
@@ -2,8 +2,8 @@#define QEMU_PCI_H #include "exec/memory.h" -#include "sysemu/dma.h" -#include "sysemu/host_iommu_device.h" +#include "system/dma.h" +#include "system/host_iommu_device.h" /* PCI includes legacy ISA access. */ #include "hw/isa/isa.h"
include/hw/ppc/mac_dbdma.h +1 -1
@@ -25,7 +25,7 @@#include "exec/memory.h" #include "qemu/iov.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "hw/sysbus.h" #include "qom/object.h"
include/hw/ppc/spapr.h +1 -1
@@ -2,7 +2,7 @@#define HW_SPAPR_H #include "qemu/units.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "hw/boards.h" #include "hw/ppc/spapr_drc.h" #include "hw/mem/pc-dimm.h"
include/hw/ppc/spapr_drc.h +1 -1
@@ -15,7 +15,7 @@#include <libfdt.h> #include "qom/object.h" -#include "sysemu/runstate.h" +#include "system/runstate.h" #include "hw/qdev-core.h" #include "qapi/error.h"
include/hw/ppc/spapr_vio.h +1 -1
@@ -23,7 +23,7 @@*/ #include "hw/ppc/spapr.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "hw/irq.h" #include "qom/object.h"
include/hw/ppc/xive.h +1 -1
@@ -140,7 +140,7 @@#ifndef PPC_XIVE_H #define PPC_XIVE_H -#include "sysemu/kvm.h" +#include "system/kvm.h" #include "hw/sysbus.h" #include "hw/ppc/xive_regs.h" #include "qom/object.h"
include/hw/riscv/numa.h +1 -1
@@ -21,7 +21,7 @@#include "hw/boards.h" #include "hw/sysbus.h" -#include "sysemu/numa.h" +#include "system/numa.h" /** * riscv_socket_count:
include/hw/s390x/css.h +1 -1
@@ -15,7 +15,7 @@#include "hw/s390x/adapter.h" #include "hw/s390x/s390_flic.h" #include "hw/s390x/ioinst.h" -#include "sysemu/kvm.h" +#include "system/kvm.h" #include "target/s390x/cpu-qom.h" /* Channel subsystem constants. */
include/hw/s390x/s390-pci-inst.h +1 -1
@@ -15,7 +15,7 @@#define HW_S390_PCI_INST_H #include "s390-pci-bus.h" -#include "sysemu/dma.h" +#include "system/dma.h" /* Load/Store status codes */ #define ZPCI_PCI_ST_FUNC_NOT_ENABLED 4
include/hw/tricore/triboard.h +1 -1
@@ -20,7 +20,7 @@#include "qapi/error.h" #include "hw/boards.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "exec/address-spaces.h" #include "qom/object.h"
include/hw/vfio/vfio-common.h +3 -3
@@ -29,10 +29,10 @@#ifdef CONFIG_LINUX #include <linux/vfio.h> #endif -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/vfio/vfio-container-base.h" -#include "sysemu/host_iommu_device.h" -#include "sysemu/iommufd.h" +#include "system/host_iommu_device.h" +#include "system/iommufd.h" #define VFIO_MSG_PREFIX "vfio %s: "
include/hw/virtio/virtio-balloon.h +1 -1
@@ -17,7 +17,7 @@#include "standard-headers/linux/virtio_balloon.h" #include "hw/virtio/virtio.h" -#include "sysemu/iothread.h" +#include "system/iothread.h" #include "qom/object.h" #define TYPE_VIRTIO_BALLOON "virtio-balloon-device"
include/hw/virtio/virtio-blk.h +3 -3
@@ -17,9 +17,9 @@#include "standard-headers/linux/virtio_blk.h" #include "hw/virtio/virtio.h" #include "hw/block/block.h" -#include "sysemu/iothread.h" -#include "sysemu/block-backend.h" -#include "sysemu/block-ram-registrar.h" +#include "system/iothread.h" +#include "system/block-backend.h" +#include "system/block-ram-registrar.h" #include "qom/object.h" #include "qapi/qapi-types-virtio.h"
include/hw/virtio/virtio-crypto.h +2 -2
@@ -16,8 +16,8 @@#include "standard-headers/linux/virtio_crypto.h" #include "hw/virtio/virtio.h" -#include "sysemu/iothread.h" -#include "sysemu/cryptodev.h" +#include "system/iothread.h" +#include "system/cryptodev.h" #include "qom/object.h"
include/hw/virtio/virtio-gpu.h +1 -1
@@ -19,7 +19,7 @@#include "ui/console.h" #include "hw/virtio/virtio.h" #include "qemu/log.h" -#include "sysemu/vhost-user-backend.h" +#include "system/vhost-user-backend.h" #include "standard-headers/linux/virtio_gpu.h" #include "standard-headers/linux/virtio_ids.h"
include/hw/virtio/virtio-input.h +1 -1
@@ -4,7 +4,7 @@#include "hw/virtio/vhost-user.h" #include "hw/virtio/vhost-user-base.h" #include "ui/input.h" -#include "sysemu/vhost-user-backend.h" +#include "system/vhost-user-backend.h" /* ----------------------------------------------------------------- */ /* virtio input protocol */
include/hw/virtio/virtio-iommu.h +1 -1
@@ -25,7 +25,7 @@#include "hw/pci/pci.h" #include "qom/object.h" #include "qapi/qapi-types-virtio.h" -#include "sysemu/host_iommu_device.h" +#include "system/host_iommu_device.h" #define TYPE_VIRTIO_IOMMU "virtio-iommu-device"#define TYPE_VIRTIO_IOMMU_PCI "virtio-iommu-pci"
include/hw/virtio/virtio-mem.h +1 -1
@@ -17,7 +17,7 @@#include "hw/resettable.h" #include "hw/virtio/virtio.h" #include "qapi/qapi-types-misc.h" -#include "sysemu/hostmem.h" +#include "system/hostmem.h" #include "qom/object.h" #define TYPE_VIRTIO_MEM "virtio-mem"
include/hw/virtio/virtio-rng.h +1 -1
@@ -13,7 +13,7 @@#define QEMU_VIRTIO_RNG_H #include "hw/virtio/virtio.h" -#include "sysemu/rng.h" +#include "system/rng.h" #include "standard-headers/linux/virtio_rng.h" #include "qom/object.h"
include/hw/virtio/virtio-scsi.h +1 -1
@@ -22,7 +22,7 @@#include "hw/virtio/virtio.h" #include "hw/scsi/scsi.h" #include "chardev/char-fe.h" -#include "sysemu/iothread.h" +#include "system/iothread.h" #define TYPE_VIRTIO_SCSI_COMMON "virtio-scsi-common"OBJECT_DECLARE_SIMPLE_TYPE (VirtIOSCSICommon,VIRTIO_SCSI_COMMON )
include/hw/xen/xen-block.h +1 -1
@@ -11,7 +11,7 @@#include "hw/xen/xen-bus.h" #include "hw/block/block.h" #include "hw/block/dataplane/xen-block.h" -#include "sysemu/iothread.h" +#include "system/iothread.h" #include "qom/object.h" typedef enum XenBlockVdevType {
include/hw/xen/xen-hvm-common.h +4 -4
@@ -8,10 +8,10 @@#include "hw/hw.h" #include "hw/xen/xen_native.h" #include "hw/xen/xen-legacy-backend.h" -#include "sysemu/runstate.h" -#include "sysemu/sysemu.h" -#include "sysemu/xen.h" -#include "sysemu/xen-mapcache.h" +#include "system/runstate.h" +#include "system/system.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" #include "qemu/error-report.h" #include <xen/hvm/ioreq.h>
include/qemu/main-loop.h +1 -1
@@ -27,7 +27,7 @@#include "block/aio.h" #include "qom/object.h" -#include "sysemu/event-loop-base.h" +#include "system/event-loop-base.h" #define SIG_IPI SIGUSR1
include/qemu/osdep.h +4 -4
@@ -8,7 +8,7 @@* To avoid getting into possible circular include dependencies, this * file should not include any other QEMU headers, with the exceptions * of config-host.h, config-target.h, qemu/compiler.h, -* sysemu/os-posix.h, sysemu/os-win32.h, glib-compat.h and +* system/os-posix.h, system/os-win32.h, glib-compat.h and * qemu/typedefs.h, all of which are doing a similar job to this file * and are under similar constraints. *
@@ -128,7 +128,7 @@ QEMU_EXTERN_C int daemon(int, int);#include <sys/stat.h> #include <sys/time.h> #include <assert.h> -/* setjmp must be declared before sysemu/os-win32.h +/* setjmp must be declared before system/os-win32.h * because it is redefined there. */ #include <setjmp.h> #include <signal.h>
@@ -161,11 +161,11 @@ QEMU_EXTERN_C int daemon(int, int);#include "glib-compat.h" #ifdef _WIN32 -#include "sysemu/os-win32.h" +#include "system/os-win32.h" #endif #ifdef CONFIG_POSIX -#include "sysemu/os-posix.h" +#include "system/os-posix.h" #endif #ifdef __cplusplus
include/system/accel-blocker.h renamed from include/sysemu/accel-blocker.h +1 -1
@@ -14,7 +14,7 @@#ifndef ACCEL_BLOCKER_H #define ACCEL_BLOCKER_H -#include "sysemu/cpus.h" +#include "system/cpus.h" void accel_blocker_init (void );
include/system/accel-ops.h renamed from include/sysemu/accel-ops.h +0 -0
include/system/arch_init.h renamed from include/sysemu/arch_init.h +0 -0
include/system/balloon.h renamed from include/sysemu/balloon.h +0 -0
include/system/block-backend-common.h renamed from include/sysemu/block-backend-common.h +0 -0
include/system/block-backend-global-state.h renamed from include/sysemu/block-backend-global-state.h +0 -0
include/system/block-backend-io.h renamed from include/sysemu/block-backend-io.h +0 -0
include/system/block-backend.h renamed from include/sysemu/block-backend.h +0 -0
include/system/block-ram-registrar.h renamed from include/sysemu/block-ram-registrar.h +0 -0
include/system/blockdev.h renamed from include/sysemu/blockdev.h +0 -0
include/system/cpu-throttle.h renamed from include/sysemu/cpu-throttle.h +3 -3
@@ -16,8 +16,8 @@* <http://www.gnu.org/licenses/gpl-2.0.html> */ -#ifndef SYSEMU_CPU_THROTTLE_H -#define SYSEMU_CPU_THROTTLE_H +#ifndef SYSTEM_CPU_THROTTLE_H +#define SYSTEM_CPU_THROTTLE_H #include "qemu/timer.h"
@@ -79,4 +79,4 @@ void cpu_throttle_dirty_sync_timer_tick(void *opaque);*/ void cpu_throttle_dirty_sync_timer (bool enable); -#endif /* SYSEMU_CPU_THROTTLE_H */ +#endif /* SYSTEM_CPU_THROTTLE_H */
include/system/cpu-timers-internal.h renamed from include/sysemu/cpu-timers-internal.h +0 -0
include/system/cpu-timers.h renamed from include/sysemu/cpu-timers.h +3 -3
@@ -7,8 +7,8 @@* See the COPYING file in the top-level directory. * */ -#ifndef SYSEMU_CPU_TIMERS_H -#define SYSEMU_CPU_TIMERS_H +#ifndef SYSTEM_CPU_TIMERS_H +#define SYSTEM_CPU_TIMERS_H #include "qemu/timer.h"
@@ -101,4 +101,4 @@ int64_t cpus_get_virtual_clock(void);void cpus_set_virtual_clock (int64_t new_time);int64_t cpus_get_elapsed_ticks (void ); -#endif /* SYSEMU_CPU_TIMERS_H */ +#endif /* SYSTEM_CPU_TIMERS_H */
include/system/cpus.h renamed from include/sysemu/cpus.h +1 -1
@@ -1,7 +1,7 @@#ifndef QEMU_CPUS_H #define QEMU_CPUS_H -#include "sysemu/accel-ops.h" +#include "system/accel-ops.h" /* register accel-specific operations */ void cpus_register_accel (const AccelOpsClass *i);
include/system/cryptodev-vhost-user.h renamed from include/sysemu/cryptodev-vhost-user.h +1 -1
@@ -24,7 +24,7 @@#ifndef CRYPTODEV_VHOST_USER_H #define CRYPTODEV_VHOST_USER_H -#include "sysemu/cryptodev-vhost.h" +#include "system/cryptodev-vhost.h" #define VHOST_USER_MAX_AUTH_KEY_LEN 512#define VHOST_USER_MAX_CIPHER_KEY_LEN 64
include/system/cryptodev-vhost.h renamed from include/sysemu/cryptodev-vhost.h +1 -1
@@ -28,7 +28,7 @@#include "hw/virtio/vhost-backend.h" #include "chardev/char.h" -#include "sysemu/cryptodev.h" +#include "system/cryptodev.h" typedef struct CryptoDevBackendVhostOptions {
include/system/cryptodev.h renamed from include/sysemu/cryptodev.h +0 -0
include/system/device_tree.h renamed from include/sysemu/device_tree.h +0 -0
include/system/dirtylimit.h renamed from include/sysemu/dirtylimit.h +0 -0
include/system/dirtyrate.h renamed from include/sysemu/dirtyrate.h +0 -0
include/system/dma.h renamed from include/sysemu/dma.h +0 -0
include/system/dump-arch.h renamed from include/sysemu/dump-arch.h +0 -0
include/system/dump.h renamed from include/sysemu/dump.h +2 -2
@@ -39,8 +39,8 @@#define DUMP_LEVEL (1)#define DISKDUMP_HEADER_BLOCKS (1) -#include "sysemu/dump-arch.h" -#include "sysemu/memory_mapping.h" +#include "system/dump-arch.h" +#include "system/memory_mapping.h" typedef struct QEMU_PACKED MakedumpfileHeader {char signature[16 ];/* = "makedumpfile" */
include/system/event-loop-base.h renamed from include/sysemu/event-loop-base.h +0 -0
include/system/host_iommu_device.h renamed from include/sysemu/host_iommu_device.h +0 -0
include/system/hostmem.h renamed from include/sysemu/hostmem.h +3 -3
@@ -10,10 +10,10 @@* See the COPYING file in the top-level directory. */ -#ifndef SYSEMU_HOSTMEM_H -#define SYSEMU_HOSTMEM_H +#ifndef SYSTEM_HOSTMEM_H +#define SYSTEM_HOSTMEM_H -#include "sysemu/numa.h" +#include "system/numa.h" #include "qapi/qapi-types-machine.h" #include "qom/object.h" #include "exec/memory.h"
include/system/hvf.h renamed from include/sysemu/hvf.h +0 -0
include/system/hvf_int.h renamed from include/sysemu/hvf_int.h +0 -0
include/system/hw_accel.h renamed from include/sysemu/hw_accel.h +4 -4
@@ -12,10 +12,10 @@#define QEMU_HW_ACCEL_H #include "hw/core/cpu.h" -#include "sysemu/kvm.h" -#include "sysemu/hvf.h" -#include "sysemu/whpx.h" -#include "sysemu/nvmm.h" +#include "system/kvm.h" +#include "system/hvf.h" +#include "system/whpx.h" +#include "system/nvmm.h" void cpu_synchronize_state (CPUState *cpu);void cpu_synchronize_post_reset (CPUState *cpu);
include/system/iommufd.h renamed from include/sysemu/iommufd.h +3 -3
@@ -11,13 +11,13 @@* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef SYSEMU_IOMMUFD_H -#define SYSEMU_IOMMUFD_H +#ifndef SYSTEM_IOMMUFD_H +#define SYSTEM_IOMMUFD_H #include "qom/object.h" #include "exec/hwaddr.h" #include "exec/cpu-common.h" -#include "sysemu/host_iommu_device.h" +#include "system/host_iommu_device.h" #define TYPE_IOMMUFD_BACKEND "iommufd"OBJECT_DECLARE_TYPE (IOMMUFDBackend, IOMMUFDBackendClass,IOMMUFD_BACKEND )
include/system/iothread.h renamed from include/sysemu/iothread.h +1 -1
@@ -17,7 +17,7 @@#include "block/aio.h" #include "qemu/thread.h" #include "qom/object.h" -#include "sysemu/event-loop-base.h" +#include "system/event-loop-base.h" #define TYPE_IOTHREAD "iothread"
include/system/kvm.h renamed from include/sysemu/kvm.h +0 -0
include/system/kvm_int.h renamed from include/sysemu/kvm_int.h +1 -1
@@ -13,7 +13,7 @@#include "qapi/qapi-types-common.h" #include "qemu/accel.h" #include "qemu/queue.h" -#include "sysemu/kvm.h" +#include "system/kvm.h" #include "hw/boards.h" #include "hw/i386/topology.h" #include "io/channel-socket.h"
include/system/kvm_xen.h renamed from include/sysemu/kvm_xen.h +3 -3
@@ -9,8 +9,8 @@* */ -#ifndef QEMU_SYSEMU_KVM_XEN_H -#define QEMU_SYSEMU_KVM_XEN_H +#ifndef QEMU_SYSTEM_KVM_XEN_H +#define QEMU_SYSTEM_KVM_XEN_H /* The KVM API uses these to indicate "no GPA" or "no GFN" */ #define INVALID_GPA UINT64_MAX
@@ -41,4 +41,4 @@ uint16_t kvm_xen_get_evtchn_max_pirq(void);#define XEN_SPECIAL_PFN (x) ((XEN_SPECIAL_AREA_ADDR >> TARGET_PAGE_BITS) + \ XEN_SPECIALPAGE_##x) -#endif /* QEMU_SYSEMU_KVM_XEN_H */ +#endif /* QEMU_SYSTEM_KVM_XEN_H */
include/system/memory_mapping.h renamed from include/sysemu/memory_mapping.h +0 -0
include/system/numa.h renamed from include/sysemu/numa.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef SYSEMU_NUMA_H -#define SYSEMU_NUMA_H +#ifndef SYSTEM_NUMA_H +#define SYSTEM_NUMA_H #include "qemu/bitmap.h" #include "qapi/qapi-types-machine.h"
include/system/nvmm.h renamed from include/sysemu/nvmm.h +0 -0
include/system/os-posix.h renamed from include/sysemu/os-posix.h +0 -0
include/system/os-win32.h renamed from include/sysemu/os-win32.h +0 -0
include/system/qtest.h renamed from include/sysemu/qtest.h +0 -0
include/system/replay.h renamed from include/sysemu/replay.h +2 -2
@@ -8,8 +8,8 @@* See the COPYING file in the top-level directory. * */ -#ifndef SYSEMU_REPLAY_H -#define SYSEMU_REPLAY_H +#ifndef SYSTEM_REPLAY_H +#define SYSTEM_REPLAY_H #ifdef CONFIG_USER_ONLY #error Cannot include this header from user emulation
include/system/reset.h renamed from include/sysemu/reset.h +2 -2
@@ -24,8 +24,8 @@* THE SOFTWARE. */ -#ifndef QEMU_SYSEMU_RESET_H -#define QEMU_SYSEMU_RESET_H +#ifndef QEMU_SYSTEM_RESET_H +#define QEMU_SYSTEM_RESET_H #include "hw/resettable.h" #include "qapi/qapi-events-run-state.h"
include/system/rng-random.h renamed from include/sysemu/rng-random.h +0 -0
include/system/rng.h renamed from include/sysemu/rng.h +0 -0
include/system/rtc.h renamed from include/sysemu/rtc.h +2 -2
@@ -22,8 +22,8 @@* THE SOFTWARE. */ -#ifndef SYSEMU_RTC_H -#define SYSEMU_RTC_H +#ifndef SYSTEM_RTC_H +#define SYSTEM_RTC_H /** * qemu_get_timedate: Get the current RTC time
include/system/runstate-action.h renamed from include/sysemu/runstate-action.h +0 -0
include/system/runstate.h renamed from include/sysemu/runstate.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef SYSEMU_RUNSTATE_H -#define SYSEMU_RUNSTATE_H +#ifndef SYSTEM_RUNSTATE_H +#define SYSTEM_RUNSTATE_H #include "qapi/qapi-types-run-state.h" #include "qemu/notify.h"
include/system/seccomp.h renamed from include/sysemu/seccomp.h +0 -0
include/system/spdm-socket.h renamed from include/sysemu/spdm-socket.h +0 -0
include/system/stats.h renamed from include/sysemu/stats.h +0 -0
include/system/system.h renamed from include/sysemu/sysemu.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef SYSEMU_H -#define SYSEMU_H +#ifndef SYSTEM_H +#define SYSTEM_H /* Misc. things related to the system emulator. */ #include "qemu/timer.h"
include/system/tcg.h renamed from include/sysemu/tcg.h +2 -2
@@ -7,8 +7,8 @@/* header to be included in non-TCG-specific code */ -#ifndef SYSEMU_TCG_H -#define SYSEMU_TCG_H +#ifndef SYSTEM_TCG_H +#define SYSTEM_TCG_H #ifdef CONFIG_TCG extern bool tcg_allowed;
include/system/tpm.h renamed from include/sysemu/tpm.h +0 -0
include/system/tpm_backend.h renamed from include/sysemu/tpm_backend.h +1 -1
@@ -15,7 +15,7 @@#include "qom/object.h" #include "qemu/option.h" -#include "sysemu/tpm.h" +#include "system/tpm.h" #include "qapi/error.h" #ifdef CONFIG_TPM
include/system/tpm_util.h renamed from include/sysemu/tpm_util.h +4 -4
@@ -19,10 +19,10 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ -#ifndef SYSEMU_TPM_UTIL_H -#define SYSEMU_TPM_UTIL_H +#ifndef SYSTEM_TPM_UTIL_H +#define SYSTEM_TPM_UTIL_H -#include "sysemu/tpm.h" +#include "system/tpm.h" #include "qemu/bswap.h" void tpm_util_write_fatal_error_response (uint8_t *out,uint32_t out_len);
@@ -69,4 +69,4 @@ static inline void tpm_cmd_set_error(void *b, uint32_t error)void tpm_util_show_buffer (const unsigned char *buffer,size_t buffer_size,const char *string); -#endif /* SYSEMU_TPM_UTIL_H */ +#endif /* SYSTEM_TPM_UTIL_H */
include/system/vhost-user-backend.h renamed from include/sysemu/vhost-user-backend.h +0 -0
include/system/watchdog.h renamed from include/sysemu/watchdog.h +0 -0
include/system/whpx.h renamed from include/sysemu/whpx.h +0 -0
include/system/xen-mapcache.h renamed from include/sysemu/xen-mapcache.h +1 -1
@@ -10,7 +10,7 @@#define XEN_MAPCACHE_H #include "exec/cpu-common.h" -#include "sysemu/xen.h" +#include "system/xen.h" typedef hwaddr (*phys_offset_to_gaddr_t )(hwaddr phys_offset,ram_addr_t size);
include/system/xen.h renamed from include/sysemu/xen.h +3 -3
@@ -7,11 +7,11 @@/* header to be included in non-Xen-specific code */ -#ifndef SYSEMU_XEN_H -#define SYSEMU_XEN_H +#ifndef SYSTEM_XEN_H +#define SYSTEM_XEN_H #ifdef CONFIG_USER_ONLY -#error Cannot include sysemu/xen.h from user emulation +#error Cannot include system/xen.h from user emulation#endif #include "exec/cpu-common.h"
migration/dirtyrate.h +1 -1
@@ -13,7 +13,7 @@#ifndef QEMU_MIGRATION_DIRTYRATE_H #define QEMU_MIGRATION_DIRTYRATE_H -#include "sysemu/dirtyrate.h" +#include "system/dirtyrate.h" /* * Sample 512 pages per GB as default.
migration/migration.h +1 -1
@@ -25,7 +25,7 @@#include "net/announce.h" #include "qom/object.h" #include "postcopy-ram.h" -#include "sysemu/runstate.h" +#include "system/runstate.h" #include "migration/misc.h" #define MIGRATION_THREAD_SNAPSHOT "mig/snapshot"
monitor/monitor-internal.h +1 -1
@@ -31,7 +31,7 @@#include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qemu/readline.h" -#include "sysemu/iothread.h" +#include "system/iothread.h" /* * Supported types:
nbd/nbd-internal.h +1 -1
@@ -10,7 +10,7 @@#ifndef NBD_INTERNAL_H #define NBD_INTERNAL_H #include "block/nbd.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "io/channel-tls.h" #include "qemu/iov.h"
rust/wrapper.h +1 -1
@@ -50,7 +50,7 @@ typedef enum memory_order {#include "qemu/osdep.h" #include "qemu/module.h" #include "qemu-io.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/sysbus.h" #include "exec/memory.h" #include "chardev/char-fe.h"
target/arm/kvm_arm.h +1 -1
@@ -11,7 +11,7 @@#ifndef QEMU_KVM_ARM_H #define QEMU_KVM_ARM_H -#include "sysemu/kvm.h" +#include "system/kvm.h" #define KVM_ARM_VGIC_V2 (1 << 0)#define KVM_ARM_VGIC_V3 (1 << 1)
target/i386/cpu-internal.h +1 -1
@@ -1,5 +1,5 @@/* -* i386 CPU internal definitions to be shared between cpu.c and cpu-sysemu.c +* i386 CPU internal definitions to be shared between cpu.c and cpu-system.c * * Copyright (c) 2003 Fabrice Bellard *
target/i386/cpu.h +1 -1
@@ -20,7 +20,7 @@#ifndef I386_CPU_H #define I386_CPU_H -#include "sysemu/tcg.h" +#include "system/tcg.h" #include "cpu-qom.h" #include "kvm/hyperv-proto.h" #include "exec/cpu-defs.h"
target/i386/hvf/vmx.h +2 -2
@@ -30,8 +30,8 @@#include "vmcs.h" #include "cpu.h" #include "x86.h" -#include "sysemu/hvf.h" -#include "sysemu/hvf_int.h" +#include "system/hvf.h" +#include "system/hvf_int.h" #include "exec/address-spaces.h"
target/i386/kvm/hyperv.h +1 -1
@@ -15,7 +15,7 @@#define TARGET_I386_HYPERV_H #include "cpu.h" -#include "sysemu/kvm.h" +#include "system/kvm.h" #include "hw/hyperv/hyperv.h" #ifdef CONFIG_KVM
target/i386/kvm/kvm_i386.h +1 -1
@@ -11,7 +11,7 @@#ifndef QEMU_KVM_I386_H #define QEMU_KVM_I386_H -#include "sysemu/kvm.h" +#include "system/kvm.h" /* always false if !CONFIG_KVM */ #define kvm_pit_in_kernel () \
target/i386/nvmm/nvmm-accel-ops.h +1 -1
@@ -10,7 +10,7 @@#ifndef TARGET_I386_NVMM_ACCEL_OPS_H #define TARGET_I386_NVMM_ACCEL_OPS_H -#include "sysemu/cpus.h" +#include "system/cpus.h" int nvmm_init_vcpu (CPUState *cpu);int nvmm_vcpu_exec (CPUState *cpu);
target/i386/whpx/whpx-accel-ops.h +1 -1
@@ -10,7 +10,7 @@#ifndef TARGET_I386_WHPX_ACCEL_OPS_H #define TARGET_I386_WHPX_ACCEL_OPS_H -#include "sysemu/cpus.h" +#include "system/cpus.h" int whpx_init_vcpu (CPUState *cpu);int whpx_vcpu_exec (CPUState *cpu);
target/mips/helper.h +1 -1
@@ -594,7 +594,7 @@ DEF_HELPER_FLAGS_3(wrdsp, 0, void, tl, tl, env) DEF_HELPER_FLAGS_2(rddsp, 0, tl, tl, env)#ifndef CONFIG_USER_ONLY -#include "tcg/sysemu_helper.h.inc" +#include "tcg/system_helper.h.inc" #endif /* !CONFIG_USER_ONLY */ #include "tcg/msa_helper.h.inc"
target/ppc/kvm_ppc.h +1 -1
@@ -9,7 +9,7 @@#ifndef KVM_PPC_H #define KVM_PPC_H -#include "sysemu/kvm.h" +#include "system/kvm.h" #include "exec/hwaddr.h" #include "cpu.h"
target/s390x/kvm/pv.h +1 -1
@@ -13,7 +13,7 @@#define HW_S390_PV_H #include "qapi/error.h" -#include "sysemu/kvm.h" +#include "system/kvm.h" #include "hw/s390x/s390-virtio-ccw.h" #ifdef CONFIG_KVM
target/s390x/s390x-internal.h +3 -3
@@ -240,10 +240,10 @@ uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst,#ifndef CONFIG_USER_ONLY unsigned int s390_cpu_halt (S390CPU *cpu);void s390_cpu_unhalt (S390CPU *cpu); -void s390_cpu_init_sysemu (Object *obj); -bool s390_cpu_realize_sysemu (DeviceState *dev,Error **errp); +void s390_cpu_system_init (Object *obj); +bool s390_cpu_system_realize (DeviceState *dev,Error **errp);void s390_cpu_finalize (Object *obj); -void s390_cpu_class_init_sysemu (CPUClass *cc); +void s390_cpu_system_class_init (CPUClass *cc);void s390_cpu_machine_reset_cb (void *opaque);#else
tests/qtest/tpm-emu.h +1 -1
@@ -21,7 +21,7 @@#include "qemu/sockets.h" #include "io/channel.h" -#include "sysemu/tpm.h" +#include "system/tpm.h" #include "libqtest.h" struct tpm_hdr {
target/mips/tcg/system_helper.h.inc renamed from target/mips/tcg/sysemu_helper.h.inc +1 -1
@@ -1,5 +1,5 @@ /* - * QEMU MIPS sysemu helpers + * QEMU MIPS TCG system helpers * * Copyright (c) 2004-2005 Jocelyn Mayer * Copyright (c) 2006 Marius Groeger (FPU operations)
accel/accel-blocker.c +1 -1
@@ -29,7 +29,7 @@#include "qemu/thread.h" #include "qemu/main-loop.h" #include "hw/core/cpu.h" -#include "sysemu/accel-blocker.h" +#include "system/accel-blocker.h" static QemuLockCnt accel_in_ioctl_lock;static QemuEvent accel_in_ioctl_event;
accel/accel-system.c +1 -1
@@ -26,7 +26,7 @@#include "qemu/osdep.h" #include "qemu/accel.h" #include "hw/boards.h" -#include "sysemu/cpus.h" +#include "system/cpus.h" #include "qemu/error-report.h" #include "accel-system.h"
accel/dummy-cpus.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" #include "qemu/rcu.h" -#include "sysemu/cpus.h" +#include "system/cpus.h" #include "qemu/guest-random.h" #include "qemu/main-loop.h" #include "hw/core/cpu.h"
accel/hvf/hvf-accel-ops.c +4 -4
@@ -54,10 +54,10 @@#include "exec/exec-all.h" #include "gdbstub/enums.h" #include "hw/boards.h" -#include "sysemu/cpus.h" -#include "sysemu/hvf.h" -#include "sysemu/hvf_int.h" -#include "sysemu/runstate.h" +#include "system/cpus.h" +#include "system/hvf.h" +#include "system/hvf_int.h" +#include "system/runstate.h" #include "qemu/guest-random.h" HVFState *hvf_state;
accel/hvf/hvf-all.c +2 -2
@@ -10,8 +10,8 @@#include "qemu/osdep.h" #include "qemu/error-report.h" -#include "sysemu/hvf.h" -#include "sysemu/hvf_int.h" +#include "system/hvf.h" +#include "system/hvf_int.h" const char *hvf_return_string (hv_return_t ret) {
accel/kvm/kvm-accel-ops.c +4 -4
@@ -16,10 +16,10 @@#include "qemu/osdep.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" -#include "sysemu/kvm.h" -#include "sysemu/kvm_int.h" -#include "sysemu/runstate.h" -#include "sysemu/cpus.h" +#include "system/kvm.h" +#include "system/kvm_int.h" +#include "system/runstate.h" +#include "system/cpus.h" #include "qemu/guest-random.h" #include "qapi/error.h"
accel/kvm/kvm-all.c +8 -8
@@ -28,10 +28,10 @@#include "hw/pci/msix.h" #include "hw/s390x/adapter.h" #include "gdbstub/enums.h" -#include "sysemu/kvm_int.h" -#include "sysemu/runstate.h" -#include "sysemu/cpus.h" -#include "sysemu/accel-blocker.h" +#include "system/kvm_int.h" +#include "system/runstate.h" +#include "system/cpus.h" +#include "system/accel-blocker.h" #include "qemu/bswap.h" #include "exec/memory.h" #include "exec/ram_addr.h"
@@ -42,15 +42,15 @@#include "qapi/visitor.h" #include "qapi/qapi-types-common.h" #include "qapi/qapi-visit-common.h" -#include "sysemu/reset.h" +#include "system/reset.h" #include "qemu/guest-random.h" -#include "sysemu/hw_accel.h" +#include "system/hw_accel.h" #include "kvm-cpus.h" -#include "sysemu/dirtylimit.h" +#include "system/dirtylimit.h" #include "qemu/range.h" #include "hw/boards.h" -#include "sysemu/stats.h" +#include "system/stats.h" /* This check must be after config-host.h is included */ #ifdef CONFIG_EVENTFD
accel/qtest/qtest.c +2 -2
@@ -18,8 +18,8 @@#include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/accel.h" -#include "sysemu/qtest.h" -#include "sysemu/cpus.h" +#include "system/qtest.h" +#include "system/cpus.h" #include "qemu/guest-random.h" #include "qemu/main-loop.h" #include "hw/core/cpu.h"
accel/stubs/kvm-stub.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/kvm.h" +#include "system/kvm.h" #include "hw/pci/msi.h" KVMState *kvm_state;
accel/stubs/xen-stub.c +1 -1
@@ -6,7 +6,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/xen.h" +#include "system/xen.h" #include "qapi/qapi-commands-migration.h" bool xen_allowed;
accel/tcg/cpu-exec-common.c +2 -2
@@ -18,8 +18,8 @@*/ #include "qemu/osdep.h" -#include "sysemu/cpus.h" -#include "sysemu/tcg.h" +#include "system/cpus.h" +#include "system/tcg.h" #include "qemu/plugin.h" #include "internal-common.h"
accel/tcg/cpu-exec.c +3 -3
@@ -30,11 +30,11 @@#include "qemu/rcu.h" #include "exec/log.h" #include "qemu/main-loop.h" -#include "sysemu/cpus.h" +#include "system/cpus.h" #include "exec/cpu-all.h" -#include "sysemu/cpu-timers.h" +#include "system/cpu-timers.h" #include "exec/replay-core.h" -#include "sysemu/tcg.h" +#include "system/tcg.h" #include "exec/helper-proto-common.h" #include "tb-jmp-cache.h" #include "tb-hash.h"
accel/tcg/icount-common.c +6 -6
@@ -27,16 +27,16 @@#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "sysemu/cpus.h" -#include "sysemu/qtest.h" +#include "system/cpus.h" +#include "system/qtest.h" #include "qemu/main-loop.h" #include "qemu/option.h" #include "qemu/seqlock.h" -#include "sysemu/replay.h" -#include "sysemu/runstate.h" +#include "system/replay.h" +#include "system/runstate.h" #include "hw/core/cpu.h" -#include "sysemu/cpu-timers.h" -#include "sysemu/cpu-timers-internal.h" +#include "system/cpu-timers.h" +#include "system/cpu-timers-internal.h" /* * ICOUNT: Instruction Counter
accel/tcg/monitor.c +3 -3
@@ -13,9 +13,9 @@#include "qapi/type-helpers.h" #include "qapi/qapi-commands-machine.h" #include "monitor/monitor.h" -#include "sysemu/cpus.h" -#include "sysemu/cpu-timers.h" -#include "sysemu/tcg.h" +#include "system/cpus.h" +#include "system/cpu-timers.h" +#include "system/tcg.h" #include "tcg/tcg.h" #include "internal-common.h" #include "tb-context.h"
accel/tcg/tb-maint.c +1 -1
@@ -26,7 +26,7 @@#include "exec/page-protection.h" #include "exec/tb-flush.h" #include "exec/translate-all.h" -#include "sysemu/tcg.h" +#include "system/tcg.h" #include "tcg/tcg.h" #include "tb-hash.h" #include "tb-context.h"
accel/tcg/tcg-accel-ops-icount.c +2 -2
@@ -24,8 +24,8 @@*/ #include "qemu/osdep.h" -#include "sysemu/replay.h" -#include "sysemu/cpu-timers.h" +#include "system/replay.h" +#include "system/cpu-timers.h" #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "exec/exec-all.h"
accel/tcg/tcg-accel-ops-mttcg.c +3 -3
@@ -24,9 +24,9 @@*/ #include "qemu/osdep.h" -#include "sysemu/tcg.h" -#include "sysemu/replay.h" -#include "sysemu/cpu-timers.h" +#include "system/tcg.h" +#include "system/replay.h" +#include "system/cpu-timers.h" #include "qemu/main-loop.h" #include "qemu/notify.h" #include "qemu/guest-random.h"
accel/tcg/tcg-accel-ops-rr.c +3 -3
@@ -25,9 +25,9 @@#include "qemu/osdep.h" #include "qemu/lockable.h" -#include "sysemu/tcg.h" -#include "sysemu/replay.h" -#include "sysemu/cpu-timers.h" +#include "system/tcg.h" +#include "system/replay.h" +#include "system/cpu-timers.h" #include "qemu/main-loop.h" #include "qemu/notify.h" #include "qemu/guest-random.h"
accel/tcg/tcg-accel-ops.c +3 -3
@@ -26,9 +26,9 @@*/ #include "qemu/osdep.h" -#include "sysemu/tcg.h" -#include "sysemu/replay.h" -#include "sysemu/cpu-timers.h" +#include "system/tcg.h" +#include "system/replay.h" +#include "system/cpu-timers.h" #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "qemu/timer.h"
accel/tcg/tcg-all.c +2 -2
@@ -24,9 +24,9 @@*/ #include "qemu/osdep.h" -#include "sysemu/tcg.h" +#include "system/tcg.h" #include "exec/replay-core.h" -#include "sysemu/cpu-timers.h" +#include "system/cpu-timers.h" #include "tcg/startup.h" #include "tcg/oversized-guest.h" #include "qapi/error.h"
accel/tcg/translate-all.c +3 -3
@@ -53,9 +53,9 @@#include "qemu/cacheinfo.h" #include "qemu/timer.h" #include "exec/log.h" -#include "sysemu/cpus.h" -#include "sysemu/cpu-timers.h" -#include "sysemu/tcg.h" +#include "system/cpus.h" +#include "system/cpu-timers.h" +#include "system/tcg.h" #include "qapi/error.h" #include "hw/core/tcg-cpu-ops.h" #include "tb-jmp-cache.h"
accel/tcg/watchpoint.c +2 -2
@@ -22,8 +22,8 @@#include "qemu/error-report.h" #include "exec/exec-all.h" #include "exec/translate-all.h" -#include "sysemu/tcg.h" -#include "sysemu/replay.h" +#include "system/tcg.h" +#include "system/replay.h" #include "hw/core/tcg-cpu-ops.h" #include "hw/core/cpu.h"
accel/xen/xen-all.c +3 -3
@@ -18,9 +18,9 @@#include "hw/xen/xen_igd.h" #include "chardev/char.h" #include "qemu/accel.h" -#include "sysemu/cpus.h" -#include "sysemu/xen.h" -#include "sysemu/runstate.h" +#include "system/cpus.h" +#include "system/xen.h" +#include "system/runstate.h" #include "migration/misc.h" #include "migration/global_state.h" #include "hw/boards.h"
audio/audio.c +3 -3
@@ -38,9 +38,9 @@#include "qemu/log.h" #include "qemu/module.h" #include "qemu/help_option.h" -#include "sysemu/sysemu.h" -#include "sysemu/replay.h" -#include "sysemu/runstate.h" +#include "system/system.h" +#include "system/replay.h" +#include "system/runstate.h" #include "ui/qemu-spice.h" #include "trace.h"
backends/cryptodev-builtin.c +1 -1
@@ -22,7 +22,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/cryptodev.h" +#include "system/cryptodev.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "standard-headers/linux/virtio_crypto.h"
backends/cryptodev-lkcf.c +1 -1
@@ -30,7 +30,7 @@#include "qemu/error-report.h" #include "qemu/queue.h" #include "qom/object.h" -#include "sysemu/cryptodev.h" +#include "system/cryptodev.h" #include "standard-headers/linux/virtio_crypto.h" #include <keyutils.h>
backends/cryptodev-vhost-user.c +2 -2
@@ -27,9 +27,9 @@#include "qemu/error-report.h" #include "hw/virtio/vhost-user.h" #include "standard-headers/linux/virtio_crypto.h" -#include "sysemu/cryptodev-vhost.h" +#include "system/cryptodev-vhost.h" #include "chardev/char-fe.h" -#include "sysemu/cryptodev-vhost-user.h" +#include "system/cryptodev-vhost-user.h" #include "qom/object.h"
backends/cryptodev-vhost.c +2 -2
@@ -24,13 +24,13 @@#include "qemu/osdep.h" #include "hw/virtio/virtio-bus.h" -#include "sysemu/cryptodev-vhost.h" +#include "system/cryptodev-vhost.h" #ifdef CONFIG_VHOST_CRYPTO #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/virtio/virtio-crypto.h" -#include "sysemu/cryptodev-vhost-user.h" +#include "system/cryptodev-vhost-user.h" uint64_t cryptodev_vhost_get_max_queues(
backends/cryptodev.c +2 -2
@@ -22,8 +22,8 @@*/ #include "qemu/osdep.h" -#include "sysemu/cryptodev.h" -#include "sysemu/stats.h" +#include "system/cryptodev.h" +#include "system/stats.h" #include "qapi/error.h" #include "qapi/qapi-commands-cryptodev.h" #include "qapi/qapi-types-stats.h"
backends/host_iommu_device.c +1 -1
@@ -10,7 +10,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/host_iommu_device.h" +#include "system/host_iommu_device.h" OBJECT_DEFINE_ABSTRACT_TYPE(HostIOMMUDevice, host_iommu_device,
backends/hostmem-epc.c +1 -1
@@ -14,7 +14,7 @@#include <sys/ioctl.h> #include "qom/object_interfaces.h" #include "qapi/error.h" -#include "sysemu/hostmem.h" +#include "system/hostmem.h" #include "hw/i386/hostmem-epc.h" static bool
backends/hostmem-file.c +1 -1
@@ -15,7 +15,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/madvise.h" -#include "sysemu/hostmem.h" +#include "system/hostmem.h" #include "qom/object_interfaces.h" #include "qom/object.h" #include "qapi/visitor.h"
backends/hostmem-memfd.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/hostmem.h" +#include "system/hostmem.h" #include "qom/object_interfaces.h" #include "qemu/memfd.h" #include "qemu/module.h"
backends/hostmem-ram.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/hostmem.h" +#include "system/hostmem.h" #include "qapi/error.h" #include "qemu/module.h" #include "qom/object_interfaces.h"
backends/hostmem-shm.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/hostmem.h" +#include "system/hostmem.h" #include "qapi/error.h" #define TYPE_MEMORY_BACKEND_SHM "memory-backend-shm"
backends/hostmem.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/hostmem.h" +#include "system/hostmem.h" #include "hw/boards.h" #include "qapi/error.h" #include "qapi/qapi-builtin-visit.h"
backends/iommufd.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/iommufd.h" +#include "system/iommufd.h" #include "qapi/error.h" #include "qemu/module.h" #include "qom/object_interfaces.h"
backends/rng-builtin.c +2 -2
@@ -6,11 +6,11 @@*/ #include "qemu/osdep.h" -#include "sysemu/rng.h" +#include "system/rng.h" #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "qom/object.h" -#include "sysemu/replay.h" +#include "system/replay.h" OBJECT_DECLARE_SIMPLE_TYPE (RngBuiltin,RNG_BUILTIN )
backends/rng-egd.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/rng.h" +#include "system/rng.h" #include "chardev/char-fe.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h"
backends/rng-random.c +2 -2
@@ -11,8 +11,8 @@*/ #include "qemu/osdep.h" -#include "sysemu/rng-random.h" -#include "sysemu/rng.h" +#include "system/rng-random.h" +#include "system/rng.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/main-loop.h"
backends/rng.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/rng.h" +#include "system/rng.h" #include "qapi/error.h" #include "qemu/module.h" #include "qom/object_interfaces.h"
backends/spdm-socket.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/spdm-socket.h" +#include "system/spdm-socket.h" #include "qapi/error.h" static bool read_bytes(const int socket, uint8_t *buffer,
backends/tpm/tpm_backend.c +2 -2
@@ -13,9 +13,9 @@*/ #include "qemu/osdep.h" -#include "sysemu/tpm_backend.h" +#include "system/tpm_backend.h" #include "qapi/error.h" -#include "sysemu/tpm.h" +#include "system/tpm.h" #include "qemu/thread.h" #include "qemu/main-loop.h" #include "qemu/module.h"
backends/tpm/tpm_emulator.c +3 -3
@@ -32,9 +32,9 @@#include "qemu/sockets.h" #include "qemu/lockable.h" #include "io/channel-socket.h" -#include "sysemu/runstate.h" -#include "sysemu/tpm_backend.h" -#include "sysemu/tpm_util.h" +#include "system/runstate.h" +#include "system/tpm_backend.h" +#include "system/tpm_util.h" #include "tpm_int.h" #include "tpm_ioctl.h" #include "migration/blocker.h"
backends/tpm/tpm_passthrough.c +2 -2
@@ -26,8 +26,8 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/sockets.h" -#include "sysemu/tpm_backend.h" -#include "sysemu/tpm_util.h" +#include "system/tpm_backend.h" +#include "system/tpm_util.h" #include "tpm_int.h" #include "qapi/clone-visitor.h" #include "qapi/qapi-visit-tpm.h"
backends/tpm/tpm_util.c +2 -2
@@ -26,8 +26,8 @@#include "tpm_int.h" #include "exec/memory.h" #include "hw/qdev-properties.h" -#include "sysemu/tpm_backend.h" -#include "sysemu/tpm_util.h" +#include "system/tpm_backend.h" +#include "system/tpm_util.h" #include "trace.h" /* tpm backend property */
backends/vhost-user.c +2 -2
@@ -15,8 +15,8 @@#include "qapi/error.h" #include "qemu/error-report.h" #include "qom/object_interfaces.h" -#include "sysemu/vhost-user-backend.h" -#include "sysemu/kvm.h" +#include "system/vhost-user-backend.h" +#include "system/kvm.h" #include "io/channel-command.h" #include "hw/virtio/virtio-bus.h"
block.c +1 -1
@@ -42,7 +42,7 @@#include "qapi/qmp/qstring.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qapi-visit-block-core.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/notify.h" #include "qemu/option.h" #include "qemu/coroutine.h"
block/accounting.c +1 -1
@@ -27,7 +27,7 @@#include "block/accounting.h" #include "block/block_int.h" #include "qemu/timer.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" static QEMUClockType clock_type =QEMU_CLOCK_REALTIME ;static const int qtest_latency_ns =NANOSECONDS_PER_SECOND /1000 ;
block/backup.c +1 -1
@@ -23,7 +23,7 @@#include "block/dirty-bitmap.h" #include "qapi/error.h" #include "qemu/cutils.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/bitmap.h" #include "qemu/error-report.h"
block/blkdebug.c +1 -1
@@ -37,7 +37,7 @@#include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" /* All APIs are thread-safe */
block/blkio.c +1 -1
@@ -18,7 +18,7 @@#include "qemu/error-report.h" #include "qapi/qmp/qdict.h" #include "qemu/module.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "exec/memory.h" /* for ram_block_discard_disable() */ #include "block/block-io.h"
block/blkreplay.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/module.h" #include "block/block-io.h" #include "block/block_int.h" -#include "sysemu/replay.h" +#include "system/replay.h" #include "qapi/error.h" typedef struct Request {
block/block-backend.c +4 -4
@@ -11,15 +11,15 @@*/ #include "qemu/osdep.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "block/block_int.h" #include "block/blockjob.h" #include "block/coroutines.h" #include "block/throttle-groups.h" #include "hw/qdev-core.h" -#include "sysemu/blockdev.h" -#include "sysemu/runstate.h" -#include "sysemu/replay.h" +#include "system/blockdev.h" +#include "system/runstate.h" +#include "system/replay.h" #include "qapi/error.h" #include "qapi/qapi-events-block.h" #include "qemu/id.h"
block/block-copy.c +1 -1
@@ -20,7 +20,7 @@#include "block/block_int-io.h" #include "block/dirty-bitmap.h" #include "block/reqlist.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/units.h" #include "qemu/co-shared-resource.h" #include "qemu/coroutine.h"
block/block-ram-registrar.c +2 -2
@@ -5,8 +5,8 @@*/ #include "qemu/osdep.h" -#include "sysemu/block-backend.h" -#include "sysemu/block-ram-registrar.h" +#include "system/block-backend.h" +#include "system/block-ram-registrar.h" #include "qapi/error.h" static void ram_block_added(RAMBlockNotifier *n, void *host, size_t size,
block/commit.c +1 -1
@@ -20,7 +20,7 @@#include "qapi/error.h" #include "qemu/ratelimit.h" #include "qemu/memalign.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" enum {/*
block/copy-before-write.c +1 -1
@@ -26,7 +26,7 @@#include "qemu/osdep.h" #include "qapi/qmp/qjson.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/cutils.h" #include "qapi/error.h" #include "block/block_int.h"
block/crypto.c +1 -1
@@ -22,7 +22,7 @@#include "block/block_int.h" #include "block/qdict.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "crypto/block.h" #include "qapi/opts-visitor.h" #include "qapi/qapi-visit-crypto.h"
block/export/export.c +2 -2
@@ -14,8 +14,8 @@#include "qemu/osdep.h" #include "block/block.h" -#include "sysemu/block-backend.h" -#include "sysemu/iothread.h" +#include "system/block-backend.h" +#include "system/iothread.h" #include "block/export.h" #include "block/fuse.h" #include "block/nbd.h"
block/export/fuse.c +1 -1
@@ -28,7 +28,7 @@#include "qapi/error.h" #include "qapi/qapi-commands-block.h" #include "qemu/main-loop.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include <fuse.h> #include <fuse_lowlevel.h>
block/io.c +2 -2
@@ -24,7 +24,7 @@#include "qemu/osdep.h" #include "trace.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "block/aio-wait.h" #include "block/blockjob.h" #include "block/blockjob_int.h"
@@ -37,7 +37,7 @@#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" -#include "sysemu/replay.h" +#include "system/replay.h" /* Maximum bounce buffer for copy-on-read and write zeroes, in bytes */ #define MAX_BOUNCE_BUFFER (32768 << BDRV_SECTOR_BITS)
block/io_uring.c +1 -1
@@ -17,7 +17,7 @@#include "qemu/coroutine.h" #include "qemu/defer-call.h" #include "qapi/error.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "trace.h" /* Only used for assertions. */
block/iscsi.c +2 -2
@@ -28,7 +28,7 @@#include <poll.h> #include <math.h> #include <arpa/inet.h> -#include "sysemu/sysemu.h" +#include "system/system.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/bitops.h"
@@ -41,7 +41,7 @@#include "qemu/module.h" #include "qemu/option.h" #include "qemu/uuid.h" -#include "sysemu/replay.h" +#include "system/replay.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qmp/qdict.h"
block/linux-aio.c +1 -1
@@ -16,7 +16,7 @@#include "qemu/coroutine.h" #include "qemu/defer-call.h" #include "qapi/error.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" /* Only used for assertions. */ #include "qemu/coroutine_int.h"
block/mirror.c +1 -1
@@ -19,7 +19,7 @@#include "block/blockjob_int.h" #include "block/block_int.h" #include "block/dirty-bitmap.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qapi/error.h" #include "qemu/ratelimit.h" #include "qemu/bitmap.h"
block/monitor/block-hmp-cmds.c +3 -3
@@ -37,8 +37,8 @@#include "qemu/osdep.h" #include "hw/boards.h" -#include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" +#include "system/block-backend.h" +#include "system/blockdev.h" #include "qapi/qapi-commands-block.h" #include "qapi/qapi-commands-block-export.h" #include "qapi/qmp/qdict.h"
@@ -49,7 +49,7 @@#include "qemu/sockets.h" #include "qemu/cutils.h" #include "qemu/error-report.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "monitor/monitor.h" #include "monitor/hmp.h" #include "block/nbd.h"
block/nfs.c +1 -1
@@ -39,7 +39,7 @@#include "qemu/module.h" #include "qemu/option.h" #include "qemu/cutils.h" -#include "sysemu/replay.h" +#include "system/replay.h" #include "qapi/qapi-visit-block-core.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
block/null.c +1 -1
@@ -18,7 +18,7 @@#include "qemu/option.h" #include "block/block-io.h" #include "block/block_int.h" -#include "sysemu/replay.h" +#include "system/replay.h" #define NULL_OPT_LATENCY "latency-ns"#define NULL_OPT_ZEROES "read-zeroes"
block/nvme.c +2 -2
@@ -26,8 +26,8 @@#include "qemu/vfio-helpers.h" #include "block/block-io.h" #include "block/block_int.h" -#include "sysemu/block-backend.h" -#include "sysemu/replay.h" +#include "system/block-backend.h" +#include "system/replay.h" #include "trace.h" #include "block/nvme.h"
block/parallels.c +1 -1
@@ -33,7 +33,7 @@#include "qapi/error.h" #include "block/block_int.h" #include "block/qdict.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/module.h" #include "qemu/option.h" #include "qapi/qmp/qdict.h"
block/qapi-system.c renamed from block/qapi-sysemu.c +2 -2
@@ -36,8 +36,8 @@#include "qapi/error.h" #include "qapi/qapi-commands-block.h" #include "qapi/qmp/qdict.h" -#include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" +#include "system/block-backend.h" +#include "system/blockdev.h" static BlockBackend *qmp_get_blk (const char *blk_name,const char *qdev_id,Error **errp)
block/qapi.c +1 -1
@@ -39,7 +39,7 @@#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qemu/qemu-print.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, BlockDriverState *bs,
block/qcow.c +1 -1
@@ -27,7 +27,7 @@#include "qemu/error-report.h" #include "block/block_int.h" #include "block/qdict.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/bswap.h"
block/qcow2-snapshot.c +1 -1
@@ -23,7 +23,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qapi/error.h" #include "qcow2.h" #include "qemu/bswap.h"
block/qcow2.c +1 -1
@@ -25,7 +25,7 @@#include "qemu/osdep.h" #include "block/qdict.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "qcow2.h"
block/qed.c +1 -1
@@ -23,7 +23,7 @@#include "qemu/memalign.h" #include "trace.h" #include "qed.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qapi/qmp/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-block-core.h"
block/rbd.c +1 -1
@@ -23,7 +23,7 @@#include "block/qdict.h" #include "crypto/secret.h" #include "qemu/cutils.h" -#include "sysemu/replay.h" +#include "system/replay.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h"
block/replication.c +1 -1
@@ -19,7 +19,7 @@#include "block/blockjob.h" #include "block/block_int.h" #include "block/block_backup.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "block/replication.h"
block/snapshot-access.c +1 -1
@@ -22,7 +22,7 @@#include "qemu/osdep.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/cutils.h" #include "block/block_int.h"
block/snapshot.c +1 -1
@@ -30,7 +30,7 @@#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/option.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" QemuOptsList internal_snapshot_opts = { .name ="snapshot" ,
block/stream.c +1 -1
@@ -18,7 +18,7 @@#include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qemu/ratelimit.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "block/copy-on-read.h" enum {
block/throttle-groups.c +2 -2
@@ -23,13 +23,13 @@*/ #include "qemu/osdep.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "block/throttle-groups.h" #include "qemu/throttle-options.h" #include "qemu/main-loop.h" #include "qemu/queue.h" #include "qemu/thread.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" #include "qapi/error.h" #include "qapi/qapi-visit-block-core.h" #include "qom/object.h"
block/vdi.c +1 -1
@@ -58,7 +58,7 @@#include "qapi/qapi-visit-block-core.h" #include "block/block_int.h" #include "block/qdict.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/bswap.h"
block/vhdx.c +1 -1
@@ -19,7 +19,7 @@#include "qapi/error.h" #include "block/block_int.h" #include "block/qdict.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/crc32c.h"
block/vmdk.c +1 -1
@@ -26,7 +26,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "block/block_int.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qapi/qmp/qdict.h" #include "qemu/error-report.h" #include "qemu/module.h"
block/vpc.c +1 -1
@@ -27,7 +27,7 @@#include "qapi/error.h" #include "block/block_int.h" #include "block/qdict.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qemu/module.h" #include "qemu/option.h" #include "migration/blocker.h"
blockdev-nbd.c +2 -2
@@ -10,8 +10,8 @@*/ #include "qemu/osdep.h" -#include "sysemu/blockdev.h" -#include "sysemu/block-backend.h" +#include "system/blockdev.h" +#include "system/block-backend.h" #include "hw/block/block.h" #include "qapi/error.h" #include "qapi/clone-visitor.h"
blockdev.c +6 -6
@@ -31,8 +31,8 @@*/ #include "qemu/osdep.h" -#include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" +#include "system/block-backend.h" +#include "system/blockdev.h" #include "hw/block/block.h" #include "block/blockjob.h" #include "block/dirty-bitmap.h"
@@ -53,12 +53,12 @@#include "qapi/qmp/qerror.h" #include "qapi/qmp/qlist.h" #include "qapi/qobject-output-visitor.h" -#include "sysemu/sysemu.h" -#include "sysemu/iothread.h" +#include "system/system.h" +#include "system/iothread.h" #include "block/block_int.h" #include "block/trace.h" -#include "sysemu/runstate.h" -#include "sysemu/replay.h" +#include "system/runstate.h" +#include "system/replay.h" #include "qemu/cutils.h" #include "qemu/help_option.h" #include "qemu/main-loop.h"
blockjob.c +1 -1
@@ -29,7 +29,7 @@#include "block/blockjob_int.h" #include "block/block_int.h" #include "block/trace.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qapi/error.h" #include "qapi/qapi-events-block-core.h" #include "qapi/qmp/qerror.h"
chardev/char-fe.c +1 -1
@@ -24,7 +24,7 @@#include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "sysemu/replay.h" +#include "system/replay.h" #include "chardev/char-fe.h" #include "chardev/char-io.h"
chardev/char-mux.c +1 -1
@@ -28,7 +28,7 @@#include "qemu/option.h" #include "qemu/bitops.h" #include "chardev/char.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qapi/qapi-commands-control.h" #include "chardev-internal.h"
chardev/char.c +1 -1
@@ -33,7 +33,7 @@#include "qapi/error.h" #include "qapi/qapi-commands-char.h" #include "qapi/qmp/qerror.h" -#include "sysemu/replay.h" +#include "system/replay.h" #include "qemu/help_option.h" #include "qemu/module.h" #include "qemu/option.h"
cpu-common.c +1 -1
@@ -21,7 +21,7 @@#include "qemu/main-loop.h" #include "exec/cpu-common.h" #include "hw/core/cpu.h" -#include "sysemu/cpus.h" +#include "system/cpus.h" #include "qemu/lockable.h" #include "trace/trace-root.h"
cpu-target.c +2 -2
@@ -34,8 +34,8 @@#include "exec/address-spaces.h" #include "exec/memory.h" #endif -#include "sysemu/cpus.h" -#include "sysemu/tcg.h" +#include "system/cpus.h" +#include "system/tcg.h" #include "exec/tswap.h" #include "exec/replay-core.h" #include "exec/cpu-common.h"
dump/dump.c +3 -3
@@ -17,9 +17,9 @@#include "qemu/bswap.h" #include "exec/target_page.h" #include "monitor/monitor.h" -#include "sysemu/dump.h" -#include "sysemu/runstate.h" -#include "sysemu/cpus.h" +#include "system/dump.h" +#include "system/runstate.h" +#include "system/cpus.h" #include "qapi/error.h" #include "qapi/qapi-commands-dump.h" #include "qapi/qapi-events-dump.h"
dump/win_dump.c +1 -1
@@ -9,7 +9,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/dump.h" +#include "system/dump.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "exec/cpu-defs.h"
event-loop-base.c +1 -1
@@ -15,7 +15,7 @@#include "qom/object_interfaces.h" #include "qapi/error.h" #include "block/thread-pool.h" -#include "sysemu/event-loop-base.h" +#include "system/event-loop-base.h" typedef struct { const char *name;
gdbstub/gdbstub.c +2 -2
@@ -41,8 +41,8 @@#endif #include "hw/core/cpu.h" -#include "sysemu/hw_accel.h" -#include "sysemu/runstate.h" +#include "system/hw_accel.h" +#include "system/runstate.h" #include "exec/replay-core.h" #include "exec/hwaddr.h"
gdbstub/syscalls.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" #include "qemu/error-report.h" #include "semihosting/semihost.h" -#include "sysemu/runstate.h" +#include "system/runstate.h" #include "gdbstub/user.h" #include "gdbstub/syscalls.h" #include "gdbstub/commands.h"
gdbstub/system.c +3 -3
@@ -19,9 +19,9 @@#include "gdbstub/commands.h" #include "exec/hwaddr.h" #include "exec/tb-flush.h" -#include "sysemu/cpus.h" -#include "sysemu/runstate.h" -#include "sysemu/replay.h" +#include "system/cpus.h" +#include "system/runstate.h" +#include "system/replay.h" #include "hw/core/cpu.h" #include "hw/cpu/cluster.h" #include "hw/boards.h"
hw/9pfs/9p-synth.c +1 -1
@@ -24,7 +24,7 @@#include "qemu/rcu.h" #include "qemu/rcu_queue.h" #include "qemu/cutils.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" /* Root node for synth file system */ static V9fsSynthNode synth_root = {
hw/9pfs/virtio-9p-device.c +1 -1
@@ -26,7 +26,7 @@#include "hw/virtio/virtio-access.h" #include "qemu/iov.h" #include "qemu/module.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" static void virtio_9p_push_and_notify (V9fsPDU *pdu) {
hw/acpi/aml-build.c +1 -1
@@ -24,7 +24,7 @@#include "hw/acpi/aml-build.h" #include "qemu/bswap.h" #include "qemu/bitops.h" -#include "sysemu/numa.h" +#include "system/numa.h" #include "hw/boards.h" #include "hw/acpi/tpm.h" #include "hw/pci/pci_host.h"
hw/acpi/core.c +1 -1
@@ -31,7 +31,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/option.h" -#include "sysemu/runstate.h" +#include "system/runstate.h" #include "trace.h" struct acpi_table_header {
hw/acpi/cpu.c +1 -1
@@ -5,7 +5,7 @@#include "qapi/error.h" #include "qapi/qapi-events-acpi.h" #include "trace.h" -#include "sysemu/numa.h" +#include "system/numa.h" #define ACPI_CPU_SELECTOR_OFFSET_WR 0#define ACPI_CPU_FLAGS_OFFSET_RW 4
hw/acpi/erst.c +1 -1
@@ -24,7 +24,7 @@#include "hw/acpi/aml-build.h" #include "hw/acpi/bios-linker-loader.h" #include "exec/address-spaces.h" -#include "sysemu/hostmem.h" +#include "system/hostmem.h" #include "hw/acpi/erst.h" #include "trace.h"
hw/acpi/generic_event_device.c +1 -1
@@ -19,7 +19,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" -#include "sysemu/runstate.h" +#include "system/runstate.h" static const uint32_t ged_supported_events[] = {ACPI_GED_MEM_HOTPLUG_EVT ,
hw/acpi/hmat.c +1 -1
@@ -26,7 +26,7 @@#include "qemu/osdep.h" #include "qemu/units.h" -#include "sysemu/numa.h" +#include "system/numa.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/hmat.h"
hw/acpi/ich9.c +2 -2
@@ -31,8 +31,8 @@#include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/core/cpu.h" -#include "sysemu/reset.h" -#include "sysemu/runstate.h" +#include "system/reset.h" +#include "system/runstate.h" #include "hw/acpi/acpi.h" #include "hw/acpi/ich9_tco.h" #include "hw/acpi/ich9_timer.h"
hw/acpi/ich9_tco.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/watchdog.h" +#include "system/watchdog.h" #include "hw/southbridge/ich9.h" #include "migration/vmstate.h"
hw/acpi/piix4.c +3 -3
@@ -28,9 +28,9 @@#include "hw/acpi/acpi.h" #include "hw/acpi/pcihp.h" #include "hw/acpi/piix4.h" -#include "sysemu/runstate.h" -#include "sysemu/sysemu.h" -#include "sysemu/xen.h" +#include "system/runstate.h" +#include "system/system.h" +#include "system/xen.h" #include "qapi/error.h" #include "qemu/range.h" #include "hw/acpi/cpu_hotplug.h"
hw/acpi/vmgenid.c +1 -1
@@ -20,7 +20,7 @@#include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" -#include "sysemu/reset.h" +#include "system/reset.h" void vmgenid_build_acpi (VmGenIdState *vms,GArray *table_data,GArray *guid,BIOSLinker *linker,const char *oem_id)
hw/arm/allwinner-a10.c +1 -1
@@ -23,7 +23,7 @@#include "hw/sysbus.h" #include "hw/arm/allwinner-a10.h" #include "hw/misc/unimp.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/boards.h" #include "hw/usb/hcd-ohci.h" #include "hw/loader.h"
hw/arm/allwinner-h3.c +1 -1
@@ -28,7 +28,7 @@#include "hw/misc/unimp.h" #include "hw/usb/hcd-ehci.h" #include "hw/loader.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/arm/allwinner-h3.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h"
hw/arm/allwinner-r40.c +1 -1
@@ -30,7 +30,7 @@#include "hw/misc/unimp.h" #include "hw/usb/hcd-ehci.h" #include "hw/loader.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/arm/allwinner-r40.h" #include "hw/misc/allwinner-r40-dramc.h" #include "target/arm/cpu-qom.h"
hw/arm/armv7m.c +1 -1
@@ -16,7 +16,7 @@#include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "elf.h" -#include "sysemu/reset.h" +#include "system/reset.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/log.h"
hw/arm/aspeed.c +3 -3
@@ -23,13 +23,13 @@#include "hw/sensor/tmp105.h" #include "hw/misc/led.h" #include "hw/qdev-properties.h" -#include "sysemu/block-backend.h" -#include "sysemu/reset.h" +#include "system/block-backend.h" +#include "system/reset.h" #include "hw/loader.h" #include "qemu/error-report.h" #include "qemu/units.h" #include "hw/qdev-clock.h" -#include "sysemu/sysemu.h" +#include "system/system.h" static struct arm_boot_info aspeed_board_binfo = { .board_id =-1 ,/* device-tree-only board */
hw/arm/aspeed_ast10x0.c +1 -1
@@ -12,7 +12,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/qdev-clock.h" #include "hw/misc/unimp.h" #include "hw/arm/aspeed_soc.h"
hw/arm/aspeed_ast2400.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/error-report.h" #include "hw/i2c/aspeed_i2c.h" #include "net/net.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "target/arm/cpu-qom.h" #define ASPEED_SOC_IOMEM_SIZE 0x00200000
hw/arm/aspeed_ast2600.c +1 -1
@@ -15,7 +15,7 @@#include "qemu/error-report.h" #include "hw/i2c/aspeed_i2c.h" #include "net/net.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "target/arm/cpu-qom.h" #define ASPEED_SOC_IOMEM_SIZE 0x00200000
hw/arm/aspeed_ast27x0.c +1 -1
@@ -18,7 +18,7 @@#include "qemu/error-report.h" #include "hw/i2c/aspeed_i2c.h" #include "net/net.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/intc/arm_gicv3.h" #include "qapi/qmp/qlist.h" #include "qemu/log.h"
hw/arm/bcm2835_peripherals.c +1 -1
@@ -15,7 +15,7 @@#include "hw/arm/bcm2835_peripherals.h" #include "hw/misc/bcm2835_mbox_defs.h" #include "hw/arm/raspi_platform.h" -#include "sysemu/sysemu.h" +#include "system/system.h" /* Peripheral base address on the VC (GPU) system bus */ #define BCM2835_VC_PERI_BASE 0x7e000000
hw/arm/boot.c +6 -6
@@ -14,15 +14,15 @@#include <libfdt.h> #include "hw/arm/boot.h" #include "hw/arm/linux-boot-if.h" -#include "sysemu/kvm.h" -#include "sysemu/tcg.h" -#include "sysemu/sysemu.h" -#include "sysemu/numa.h" +#include "system/kvm.h" +#include "system/tcg.h" +#include "system/system.h" +#include "system/numa.h" #include "hw/boards.h" -#include "sysemu/reset.h" +#include "system/reset.h" #include "hw/loader.h" #include "elf.h" -#include "sysemu/device_tree.h" +#include "system/device_tree.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/units.h"
hw/arm/digic.c +1 -1
@@ -25,7 +25,7 @@#include "qemu/module.h" #include "hw/arm/digic.h" #include "hw/qdev-properties.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #define DIGIC4_TIMER_BASE (n) (0xc0210000 + (n) * 0x100)
hw/arm/digic_boards.c +1 -1
@@ -31,7 +31,7 @@#include "hw/arm/digic.h" #include "hw/block/flash.h" #include "hw/loader.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" #include "qemu/units.h" #include "qemu/cutils.h"
hw/arm/exynos4210.c +2 -2
@@ -27,8 +27,8 @@#include "cpu.h" #include "hw/cpu/a9mpcore.h" #include "hw/irq.h" -#include "sysemu/blockdev.h" -#include "sysemu/sysemu.h" +#include "system/blockdev.h" +#include "system/system.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/loader.h"
hw/arm/fby35.c +2 -2
@@ -8,8 +8,8 @@#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "sysemu/sysemu.h" -#include "sysemu/block-backend.h" +#include "system/system.h" +#include "system/block-backend.h" #include "hw/boards.h" #include "hw/qdev-clock.h" #include "hw/arm/aspeed_soc.h"
hw/arm/fsl-imx25.c +1 -1
@@ -25,7 +25,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/fsl-imx25.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/qdev-properties.h" #include "chardev/char.h" #include "target/arm/cpu-qom.h"
hw/arm/fsl-imx31.c +1 -1
@@ -22,7 +22,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/fsl-imx31.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "exec/address-spaces.h" #include "hw/qdev-properties.h" #include "chardev/char.h"
hw/arm/fsl-imx6.c +1 -1
@@ -26,7 +26,7 @@#include "hw/usb/imx-usb-phy.h" #include "hw/boards.h" #include "hw/qdev-properties.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "chardev/char.h" #include "qemu/error-report.h" #include "qemu/module.h"
hw/arm/fsl-imx6ul.c +1 -1
@@ -22,7 +22,7 @@#include "hw/misc/unimp.h" #include "hw/usb/imx-usb-phy.h" #include "hw/boards.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "target/arm/cpu-qom.h"
hw/arm/fsl-imx7.c +1 -1
@@ -23,7 +23,7 @@#include "hw/arm/fsl-imx7.h" #include "hw/misc/unimp.h" #include "hw/boards.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "target/arm/cpu-qom.h"
hw/arm/highbank.c +2 -2
@@ -25,8 +25,8 @@#include "hw/arm/boot.h" #include "hw/loader.h" #include "net/net.h" -#include "sysemu/runstate.h" -#include "sysemu/sysemu.h" +#include "system/runstate.h" +#include "system/system.h" #include "hw/boards.h" #include "qemu/error-report.h" #include "hw/char/pl011.h"
hw/arm/imx25_pdk.c +1 -1
@@ -30,7 +30,7 @@#include "hw/arm/boot.h" #include "hw/boards.h" #include "qemu/error-report.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" #include "hw/i2c/i2c.h" #include "qemu/cutils.h"
hw/arm/integratorcp.c +2 -2
@@ -17,8 +17,8 @@#include "hw/net/smc91c111.h" #include "net/net.h" #include "exec/address-spaces.h" -#include "sysemu/runstate.h" -#include "sysemu/sysemu.h" +#include "system/runstate.h" +#include "system/system.h" #include "qemu/log.h" #include "qemu/error-report.h" #include "hw/char/pl011.h"
hw/arm/kzm.c +2 -2
@@ -23,8 +23,8 @@#include "net/net.h" #include "hw/net/lan9118.h" #include "hw/char/serial-mm.h" -#include "sysemu/qtest.h" -#include "sysemu/sysemu.h" +#include "system/qtest.h" +#include "system/system.h" #include "qemu/cutils.h" /* Memory map for Kzm Emulation Baseboard:
hw/arm/mcimx6ul-evk.c +1 -1
@@ -17,7 +17,7 @@#include "hw/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" static void mcimx6ul_evk_init (MachineState *machine) {
hw/arm/mcimx7d-sabre.c +1 -1
@@ -19,7 +19,7 @@#include "hw/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" static void mcimx7d_sabre_init (MachineState *machine) {
hw/arm/microbit.c +1 -1
@@ -12,7 +12,7 @@#include "qapi/error.h" #include "hw/boards.h" #include "hw/arm/boot.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "exec/address-spaces.h" #include "hw/arm/nrf51_soc.h"
hw/arm/mps2-tz.c +2 -2
@@ -55,8 +55,8 @@#include "hw/or-irq.h" #include "hw/boards.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" -#include "sysemu/reset.h" +#include "system/system.h" +#include "system/reset.h" #include "hw/misc/unimp.h" #include "hw/char/cmsdk-apb-uart.h" #include "hw/timer/cmsdk-apb-timer.h"
hw/arm/mps2.c +1 -1
@@ -34,7 +34,7 @@#include "hw/or-irq.h" #include "hw/boards.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/qdev-properties.h" #include "hw/misc/unimp.h" #include "hw/char/cmsdk-apb-uart.h"
hw/arm/mps3r.c +1 -1
@@ -30,7 +30,7 @@#include "qapi/qmp/qlist.h" #include "exec/address-spaces.h" #include "cpu.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/boards.h" #include "hw/or-irq.h" #include "hw/qdev-clock.h"
hw/arm/msf2-soc.c +1 -1
@@ -30,7 +30,7 @@#include "hw/arm/msf2-soc.h" #include "hw/misc/unimp.h" #include "hw/qdev-clock.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #define MSF2_TIMER_BASE 0x40004000#define MSF2_SYSREG_BASE 0x40038000
hw/arm/musca.c +1 -1
@@ -23,7 +23,7 @@#include "qemu/error-report.h" #include "qapi/error.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/arm/boot.h" #include "hw/arm/armsse.h" #include "hw/boards.h"
hw/arm/musicpal.c +4 -4
@@ -16,7 +16,7 @@#include "migration/vmstate.h" #include "hw/arm/boot.h" #include "net/net.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/boards.h" #include "hw/char/serial-mm.h" #include "qemu/timer.h"
@@ -29,9 +29,9 @@#include "hw/irq.h" #include "hw/or-irq.h" #include "hw/audio/wm8750.h" -#include "sysemu/block-backend.h" -#include "sysemu/runstate.h" -#include "sysemu/dma.h" +#include "system/block-backend.h" +#include "system/runstate.h" +#include "system/dma.h" #include "ui/pixel_ops.h" #include "qemu/cutils.h" #include "qom/object.h"
hw/arm/npcm7xx.c +1 -1
@@ -26,7 +26,7 @@#include "qapi/error.h" #include "qemu/bswap.h" #include "qemu/units.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "target/arm/cpu-qom.h" /*
hw/arm/npcm7xx_boards.c +3 -3
@@ -27,9 +27,9 @@#include "qapi/error.h" #include "qemu/datadir.h" #include "qemu/units.h" -#include "sysemu/blockdev.h" -#include "sysemu/sysemu.h" -#include "sysemu/block-backend.h" +#include "system/blockdev.h" +#include "system/system.h" +#include "system/block-backend.h" #include "qemu/error-report.h"
hw/arm/omap1.c +6 -6
@@ -29,13 +29,13 @@#include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" -#include "sysemu/blockdev.h" -#include "sysemu/sysemu.h" +#include "system/blockdev.h" +#include "system/system.h" #include "hw/arm/soc_dma.h" -#include "sysemu/qtest.h" -#include "sysemu/reset.h" -#include "sysemu/runstate.h" -#include "sysemu/rtc.h" +#include "system/qtest.h" +#include "system/reset.h" +#include "system/runstate.h" +#include "system/rtc.h" #include "qemu/range.h" #include "hw/sysbus.h" #include "qemu/cutils.h"
hw/arm/omap_sx1.c +1 -1
@@ -33,7 +33,7 @@#include "hw/boards.h" #include "hw/arm/boot.h" #include "hw/block/flash.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" #include "exec/address-spaces.h" #include "qemu/cutils.h" #include "qemu/error-report.h"
hw/arm/raspi4b.c +1 -1
@@ -15,7 +15,7 @@#include "hw/display/bcm2835_fb.h" #include "hw/registerfields.h" #include "qemu/error-report.h" -#include "sysemu/device_tree.h" +#include "system/device_tree.h" #include "hw/boards.h" #include "hw/loader.h" #include "hw/arm/boot.h"
hw/arm/realview.c +1 -1
@@ -19,7 +19,7 @@#include "hw/pci/pci.h" #include "hw/qdev-core.h" #include "net/net.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "qemu/error-report.h"
hw/arm/sabrelite.c +1 -1
@@ -17,7 +17,7 @@#include "hw/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" -#include "sysemu/qtest.h" +#include "system/qtest.h" static struct arm_boot_info sabrelite_binfo = {/* DDR memory start */
hw/arm/sbsa-ref.c +5 -5
@@ -23,11 +23,11 @@#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/units.h" -#include "sysemu/device_tree.h" -#include "sysemu/kvm.h" -#include "sysemu/numa.h" -#include "sysemu/runstate.h" -#include "sysemu/sysemu.h" +#include "system/device_tree.h" +#include "system/kvm.h" +#include "system/numa.h" +#include "system/runstate.h" +#include "system/system.h" #include "exec/hwaddr.h" #include "kvm_arm.h" #include "hw/arm/boot.h"
hw/arm/stellaris.c +1 -1
@@ -20,7 +20,7 @@#include "hw/boards.h" #include "qemu/log.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/arm/armv7m.h" #include "hw/char/pl011.h" #include "hw/input/stellaris_gamepad.h"
hw/arm/stm32f100_soc.c +1 -1
@@ -32,7 +32,7 @@#include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "hw/misc/unimp.h" -#include "sysemu/sysemu.h" +#include "system/system.h" /* stm32f100_soc implementation is derived from stm32f205_soc */
hw/arm/stm32f205_soc.c +1 -1
@@ -30,7 +30,7 @@#include "hw/arm/stm32f205_soc.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" -#include "sysemu/sysemu.h" +#include "system/system.h" /* At the moment only Timer 2 to 5 are modelled */ static const uint32_t timer_addr[STM_NUM_TIMERS ] = {0x40000000 ,0x40000400 ,
hw/arm/stm32f405_soc.c +1 -1
@@ -25,7 +25,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/arm/stm32f405_soc.h" #include "hw/qdev-clock.h" #include "hw/misc/unimp.h"
hw/arm/stm32l4x5_soc.c +1 -1
@@ -25,7 +25,7 @@#include "qemu/units.h" #include "qapi/error.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/or-irq.h" #include "hw/arm/stm32l4x5_soc.h" #include "hw/char/stm32l4x5_usart.h"
hw/arm/strongarm.c +2 -2
@@ -38,8 +38,8 @@#include "hw/arm/boot.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" -#include "sysemu/sysemu.h" -#include "sysemu/rtc.h" +#include "system/system.h" +#include "system/rtc.h" #include "hw/ssi/ssi.h" #include "qapi/error.h" #include "qemu/cutils.h"
hw/arm/versatilepb.c +1 -1
@@ -14,7 +14,7 @@#include "hw/arm/boot.h" #include "hw/net/smc91c111.h" #include "net/net.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/pci/pci.h" #include "hw/i2c/i2c.h" #include "hw/i2c/arm_sbcon_i2c.h"
hw/arm/vexpress.c +2 -2
@@ -30,11 +30,11 @@#include "hw/net/lan9118.h" #include "hw/i2c/i2c.h" #include "net/net.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/boards.h" #include "hw/loader.h" #include "hw/block/flash.h" -#include "sysemu/device_tree.h" +#include "system/device_tree.h" #include "qemu/error-report.h" #include <libfdt.h> #include "hw/char/pl011.h"
hw/arm/virt-acpi-build.c +3 -3
@@ -51,9 +51,9 @@#include "hw/intc/arm_gicv3_its_common.h" #include "hw/mem/nvdimm.h" #include "hw/platform-bus.h" -#include "sysemu/numa.h" -#include "sysemu/reset.h" -#include "sysemu/tpm.h" +#include "system/numa.h" +#include "system/reset.h" +#include "system/tpm.h" #include "migration/vmstate.h" #include "hw/acpi/ghes.h" #include "hw/acpi/viot.h"
hw/arm/virt.c +8 -8
@@ -42,14 +42,14 @@#include "hw/vfio/vfio-amd-xgbe.h" #include "hw/display/ramfb.h" #include "net/net.h" -#include "sysemu/device_tree.h" -#include "sysemu/numa.h" -#include "sysemu/runstate.h" -#include "sysemu/tpm.h" -#include "sysemu/tcg.h" -#include "sysemu/kvm.h" -#include "sysemu/hvf.h" -#include "sysemu/qtest.h" +#include "system/device_tree.h" +#include "system/numa.h" +#include "system/runstate.h" +#include "system/tpm.h" +#include "system/tcg.h" +#include "system/kvm.h" +#include "system/hvf.h" +#include "system/qtest.h" #include "hw/loader.h" #include "qapi/error.h" #include "qemu/bitops.h"
hw/arm/xen-pvh.c +1 -1
@@ -8,7 +8,7 @@#include "qemu/error-report.h" #include "qapi/qapi-commands-migration.h" #include "hw/boards.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/xen/xen-pvh-common.h" #include "hw/xen/arch_hvm.h"
hw/arm/xen-stubs.c +1 -1
@@ -8,7 +8,7 @@#include "qemu/error-report.h" #include "qapi/qapi-commands-migration.h" #include "hw/boards.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/xen/xen-hvm-common.h" #include "hw/xen/arch_hvm.h"
hw/arm/xilinx_zynq.c +2 -2
@@ -21,7 +21,7 @@#include "hw/sysbus.h" #include "hw/arm/boot.h" #include "net/net.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/boards.h" #include "hw/block/flash.h" #include "hw/loader.h"
@@ -35,7 +35,7 @@#include "hw/cpu/a9mpcore.h" #include "hw/qdev-clock.h" #include "hw/misc/unimp.h" -#include "sysemu/reset.h" +#include "system/reset.h" #include "qom/object.h" #include "exec/tswap.h" #include "target/arm/cpu-qom.h"
hw/arm/xlnx-versal-virt.c +1 -1
@@ -12,7 +12,7 @@#include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "sysemu/device_tree.h" +#include "system/device_tree.h" #include "hw/block/flash.h" #include "hw/boards.h" #include "hw/sysbus.h"
hw/arm/xlnx-versal.c +2 -2
@@ -16,8 +16,8 @@#include "qemu/module.h" #include "hw/sysbus.h" #include "net/net.h" -#include "sysemu/sysemu.h" -#include "sysemu/kvm.h" +#include "system/system.h" +#include "system/kvm.h" #include "hw/arm/boot.h" #include "kvm_arm.h" #include "hw/misc/unimp.h"
hw/arm/xlnx-zcu102.c +1 -1
@@ -22,7 +22,7 @@#include "hw/boards.h" #include "qemu/error-report.h" #include "qemu/log.h" -#include "sysemu/device_tree.h" +#include "system/device_tree.h" #include "qom/object.h" #include "net/can_emu.h" #include "audio/audio.h"
hw/arm/xlnx-zynqmp.c +2 -2
@@ -22,8 +22,8 @@#include "hw/intc/arm_gic_common.h" #include "hw/misc/unimp.h" #include "hw/boards.h" -#include "sysemu/kvm.h" -#include "sysemu/sysemu.h" +#include "system/kvm.h" +#include "system/system.h" #include "kvm_arm.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h"
hw/audio/ac97.c +1 -1
@@ -24,7 +24,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "qom/object.h" #include "ac97.h"
hw/audio/es1370.c +1 -1
@@ -32,7 +32,7 @@#include "migration/vmstate.h" #include "qemu/cutils.h" #include "qemu/module.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "qom/object.h" #include "trace.h"
hw/audio/intel-hda.c +1 -1
@@ -30,7 +30,7 @@#include "intel-hda.h" #include "migration/vmstate.h" #include "intel-hda-defs.h" -#include "sysemu/dma.h" +#include "system/dma.h" #include "qapi/error.h" #include "qom/object.h"
hw/audio/virtio-snd.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/log.h" #include "qemu/error-report.h" #include "qemu/lockable.h" -#include "sysemu/runstate.h" +#include "system/runstate.h" #include "trace.h" #include "qapi/error.h" #include "hw/audio/virtio-snd.h"
hw/avr/atmega.c +1 -1
@@ -14,7 +14,7 @@#include "qapi/error.h" #include "exec/memory.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" +#include "system/system.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qom/object.h"
hw/block/block.c +2 -2
@@ -9,8 +9,8 @@#include "qemu/osdep.h" #include "block/block_int-common.h" -#include "sysemu/blockdev.h" -#include "sysemu/block-backend.h" +#include "system/blockdev.h" +#include "system/block-backend.h" #include "hw/block/block.h" #include "qapi/error.h" #include "qapi/qapi-types-block.h"
hw/block/dataplane/xen-block.c +2 -2
@@ -27,8 +27,8 @@#include "hw/xen/xen.h" #include "hw/block/xen_blkif.h" #include "hw/xen/interface/io/ring.h" -#include "sysemu/block-backend.h" -#include "sysemu/iothread.h" +#include "system/block-backend.h" +#include "system/iothread.h" #include "xen-block.h" typedef struct XenBlockRequest {
hw/block/fdc-isa.c +3 -3
@@ -39,9 +39,9 @@#include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/block/block.h" -#include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" -#include "sysemu/sysemu.h" +#include "system/block-backend.h" +#include "system/blockdev.h" +#include "system/system.h" #include "exec/ioport.h" #include "qemu/log.h" #include "qemu/main-loop.h"
hw/block/fdc.c +3 -3
@@ -39,9 +39,9 @@#include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/block/block.h" -#include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" -#include "sysemu/sysemu.h" +#include "system/block-backend.h" +#include "system/blockdev.h" +#include "system/system.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h"
hw/block/hd-geometry.c +1 -1
@@ -31,7 +31,7 @@*/ #include "qemu/osdep.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "qapi/qapi-types-block.h" #include "qemu/bswap.h" #include "hw/block/block.h"
hw/block/m25p80.c +1 -1
@@ -23,7 +23,7 @@#include "qemu/osdep.h" #include "qemu/units.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "hw/block/block.h" #include "hw/block/flash.h" #include "hw/qdev-properties.h"
hw/block/nand.c +1 -1
@@ -23,7 +23,7 @@#include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/block/flash.h" -#include "sysemu/block-backend.h" +#include "system/block-backend.h" #include "migration/vmstate.h"
Lines of this file are not shown. View the raw message.
hw/core/cpu-system.c renamed from hw/core/cpu-sysemu.c +1 -1
Lines of this file are not shown. View the raw message.
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -1
Lines of this file are not shown. View the raw message.
target/i386/cpu-system.c renamed from target/i386/cpu-sysemu.c +1 -1
Lines of this file are not shown. View the raw message.
target/i386/sev-system-stub.c renamed from target/i386/sev-sysemu-stub.c +0 -0
target/i386/tcg/system/bpt_helper.c renamed from target/i386/tcg/sysemu/bpt_helper.c +1 -1
Lines of this file are not shown. View the raw message.
target/i386/tcg/system/excp_helper.c renamed from target/i386/tcg/sysemu/excp_helper.c +1 -1
Lines of this file are not shown. View the raw message.
target/i386/tcg/system/fpu_helper.c renamed from target/i386/tcg/sysemu/fpu_helper.c +1 -1
Lines of this file are not shown. View the raw message.
target/i386/tcg/system/misc_helper.c renamed from target/i386/tcg/sysemu/misc_helper.c +1 -1
Lines of this file are not shown. View the raw message.
target/i386/tcg/system/seg_helper.c renamed from target/i386/tcg/sysemu/seg_helper.c +1 -1
Lines of this file are not shown. View the raw message.
target/i386/tcg/system/smm_helper.c renamed from target/i386/tcg/sysemu/smm_helper.c +1 -1
Lines of this file are not shown. View the raw message.
target/i386/tcg/system/svm_helper.c renamed from target/i386/tcg/sysemu/svm_helper.c +1 -1
Lines of this file are not shown. View the raw message.
target/i386/tcg/system/tcg-cpu.c renamed from target/i386/tcg/sysemu/tcg-cpu.c +2 -2
Lines of this file are not shown. View the raw message.
target/mips/system/addr.c renamed from target/mips/sysemu/addr.c +0 -0
target/mips/system/cp0.c renamed from target/mips/sysemu/cp0.c +0 -0
target/mips/system/cp0_timer.c renamed from target/mips/sysemu/cp0_timer.c +1 -1
Lines of this file are not shown. View the raw message.
target/mips/system/machine.c renamed from target/mips/sysemu/machine.c +0 -0
target/mips/system/mips-qmp-cmds.c renamed from target/mips/sysemu/mips-qmp-cmds.c +0 -0
target/mips/system/physaddr.c renamed from target/mips/sysemu/physaddr.c +0 -0
target/mips/tcg/system/cp0_helper.c renamed from target/mips/tcg/sysemu/cp0_helper.c +0 -0
target/mips/tcg/system/lcsr_helper.c renamed from target/mips/tcg/sysemu/lcsr_helper.c +0 -0
target/mips/tcg/system/mips-semi.c renamed from target/mips/tcg/sysemu/mips-semi.c +0 -0
target/mips/tcg/system/semihosting-stub.c renamed from target/mips/tcg/sysemu/semihosting-stub.c +0 -0
target/mips/tcg/system/special_helper.c renamed from target/mips/tcg/sysemu/special_helper.c +0 -0
target/mips/tcg/system/tlb_helper.c renamed from target/mips/tcg/sysemu/tlb_helper.c +0 -0
target/s390x/cpu-system.c renamed from target/s390x/cpu-sysemu.c +9 -9
Lines of this file are not shown. View the raw message.
target/s390x/cpu_models_system.c renamed from target/s390x/cpu_models_sysemu.c +2 -2
Lines of this file are not shown. View the raw message.
scripts/codeconverter/codeconverter/test_regexps.py +2 -2
Lines of this file are not shown. View the raw message.
target/i386/tcg/system/meson.build renamed from target/i386/tcg/sysemu/meson.build +0 -0
target/mips/system/meson.build renamed from target/mips/sysemu/meson.build +0 -0
target/mips/tcg/system/meson.build renamed from target/mips/tcg/sysemu/meson.build +0 -0
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.47.1
Part of the diff is not shown here. View the raw message.
[PULL 15/59] accel/tcg: Have tlb_vaddr_to_host() use vaddr type
In reply to Philippe Mathieu-Daudéabi_ptr is expected to be used in user emulation. tlb_vaddr_to_host() uses it, but can be used in system emulation. Replace the type by 'vaddr' which is equivalent on user emulation but also works on system.
Message-Id: <[email protected]>
--- include/exec/cpu_ldst.h | 3 ++- accel/tcg/cputlb.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
include/exec/cpu_ldst.h +2 -1
@@ -67,6 +67,7 @@#endif #include "exec/memopidx.h" +#include "exec/vaddr.h" #include "exec/abi_ptr.h" #include "exec/mmu-access-type.h" #include "qemu/int128.h"
@@ -375,7 +376,7 @@ static inline void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr, return g2h(env_cpu(env), addr); }#else -void *tlb_vaddr_to_host (CPUArchState *env,abi_ptr addr, +void *tlb_vaddr_to_host (CPUArchState *env,vaddr addr,MMUAccessType access_type,int mmu_idx);#endif
accel/tcg/cputlb.c +1 -1
@@ -1504,7 +1504,7 @@ void *probe_access(CPUArchState *env, vaddr addr, int size,return host; } -void *tlb_vaddr_to_host (CPUArchState *env,abi_ptr addr, +void *tlb_vaddr_to_host (CPUArchState *env,vaddr addr,MMUAccessType access_type,int mmu_idx) {CPUTLBEntryFull *full;
Signature · 1 line
2.47.1
[PULL 08/59] hw/ppc: Explicitly create the drc container
In reply to Philippe Mathieu-DaudéFrom: Peter Xu <[email protected]>
QEMU will start to not rely on implicit creations of containers soon. Make PPC drc devices follow by explicitly create the container whenever a drc device is realized, dropping container_get() calls.
No functional change intended.
Message-ID: <[email protected]>
--- hw/ppc/spapr_drc.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)
hw/ppc/spapr_drc.c +19 -10
@@ -27,7 +27,7 @@#include "sysemu/reset.h" #include "trace.h" -#define DRC_CONTAINER_PATH "/dr-connector" +#define DRC_CONTAINER_PATH "dr-connector"#define DRC_INDEX_TYPE_SHIFT 28#define DRC_INDEX_ID_MASK ((1ULL << DRC_INDEX_TYPE_SHIFT) - 1)
@@ -514,6 +514,16 @@ static const VMStateDescription vmstate_spapr_drc = { } }; +static void drc_container_create (void ) +{ +object_property_add_new_container (object_get_root (),DRC_CONTAINER_PATH ); +} + +static Object *drc_container_get (void ) +{ +return object_resolve_path_component (object_get_root (),DRC_CONTAINER_PATH ); +} +static void drc_realize (DeviceState *d,Error **errp) {SpaprDrc *drc =SPAPR_DR_CONNECTOR (d);
@@ -529,7 +539,7 @@ static void drc_realize(DeviceState *d, Error **errp)* inaccessible by the guest, since lookups rely on this path * existing in the composition tree */ - root_container =container_get (object_get_root (),DRC_CONTAINER_PATH ); + root_container =drc_container_get (); child_name =object_get_canonical_path_component (OBJECT (drc));trace_spapr_drc_realize_child (spapr_drc_index (drc), child_name); object_property_add_alias(root_container, link_name,
@@ -543,12 +553,10 @@ static void drc_unrealize(DeviceState *d) {SpaprDrc *drc =SPAPR_DR_CONNECTOR (d); g_autofree gchar *name = g_strdup_printf("%x", spapr_drc_index(drc)); -Object *root_container;trace_spapr_drc_unrealize (spapr_drc_index (drc));vmstate_unregister (VMSTATE_IF (drc), &vmstate_spapr_drc, drc); - root_container =container_get (object_get_root (),DRC_CONTAINER_PATH ); -object_property_del (root_container, name); +object_property_del (drc_container_get (), name); } SpaprDrc *spapr_dr_connector_new(Object *owner, const char *type,
@@ -585,6 +593,8 @@ static void spapr_dr_connector_class_init(ObjectClass *k, void *data) {DeviceClass *dk =DEVICE_CLASS (k); +drc_container_create (); + dk->realize = drc_realize; dk->unrealize = drc_unrealize;/*
@@ -796,9 +806,8 @@ static const TypeInfo spapr_drc_pmem_info = {SpaprDrc *spapr_drc_by_index (uint32_t index) {Object *obj; - g_autofree gchar *name = g_strdup_printf("%s/%x", DRC_CONTAINER_PATH, - index); - obj =object_resolve_path (name,NULL ); + g_autofree gchar *name = g_strdup_printf("%x", index); + obj =object_resolve_path_component (drc_container_get (), name);return !obj ?NULL :SPAPR_DR_CONNECTOR (obj); }
@@ -860,7 +869,7 @@ int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type_mask)/* aliases for all DRConnector objects will be rooted in QOM * composition tree at DRC_CONTAINER_PATH */ - root_container =container_get (object_get_root (),DRC_CONTAINER_PATH ); + root_container =drc_container_get ();object_property_iter_init (&iter, root_container);while ((prop =object_property_iter_next (&iter))) {
@@ -953,7 +962,7 @@ void spapr_drc_reset_all(SpaprMachineState *spapr)ObjectProperty *prop;ObjectPropertyIterator iter; - drc_container =container_get (object_get_root (),DRC_CONTAINER_PATH ); + drc_container =drc_container_get (); restart:object_property_iter_init (&iter, drc_container);while ((prop =object_property_iter_next (&iter))) {
Signature · 1 line
2.47.1
[PULL 02/59] log: Add separate debug option for logging invalid memory accesses
In reply to Philippe Mathieu-DaudéFrom: BALATON Zoltan <[email protected]>
Currently -d guest_errors enables logging of different invalid actions by the guest such as misusing hardware, accessing missing features or invalid memory areas. The memory access logging can be quite verbose which obscures the other messages enabled by this debug switch so separate it by adding a new -d invalid_mem option to make it possible to control it independently of other guest error logs.
Message-ID: <1bb0d0e91ba14aca13056df3b0a774f89cbf966c.1730549443.git.balaton@eik.bme.hu>
--- include/qemu/log.h | 1 + system/memory.c | 6 +++--- system/physmem.c | 2 +- util/log.c | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-)
include/qemu/log.h +1 -0
@@ -37,6 +37,7 @@ bool qemu_log_separate(void);#define LOG_PER_THREAD (1 << 20)#define CPU_LOG_TB_VPU (1 << 21)#define LOG_TB_OP_PLUGIN (1 << 22) +#define LOG_INVALID_MEM (1 << 23)/* Lock/unlock output. */
system/memory.c +3 -3
@@ -1412,7 +1412,7 @@ bool memory_region_access_valid(MemoryRegion *mr, {if (mr->ops->valid.accepts && !mr->ops->valid.accepts (mr->opaque, addr, size, is_write, attrs)) { -qemu_log_mask (LOG_GUEST_ERROR ,"Invalid %s at addr 0x%" HWADDR_PRIX +qemu_log_mask (LOG_INVALID_MEM ,"Invalid %s at addr 0x%" HWADDR_PRIX ", size %u, region '%s', reason: rejected\n" , is_write ?"write" :"read" , addr, size,memory_region_name (mr));
@@ -1420,7 +1420,7 @@ bool memory_region_access_valid(MemoryRegion *mr, }if (!mr->ops->valid.unaligned && (addr & (size -1 ))) { -qemu_log_mask (LOG_GUEST_ERROR ,"Invalid %s at addr 0x%" HWADDR_PRIX +qemu_log_mask (LOG_INVALID_MEM ,"Invalid %s at addr 0x%" HWADDR_PRIX ", size %u, region '%s', reason: unaligned\n" , is_write ?"write" :"read" , addr, size,memory_region_name (mr));
@@ -1434,7 +1434,7 @@ bool memory_region_access_valid(MemoryRegion *mr,if (size > mr->ops->valid.max_access_size || size < mr->ops->valid.min_access_size) { - qemu_log_mask(LOG_GUEST_ERROR, "Invalid %s at addr 0x%" HWADDR_PRIX + qemu_log_mask(LOG_INVALID_MEM, "Invalid %s at addr 0x%" HWADDR_PRIX ", size %u, region '%s', reason: invalid size " "(min:%u max:%u)\n", is_write ? "write" : "read",
system/physmem.c +1 -1
@@ -2745,7 +2745,7 @@ static bool flatview_access_allowed(MemoryRegion *mr, MemTxAttrs attrs,if (memory_region_is_ram (mr)) {return true; } -qemu_log_mask (LOG_GUEST_ERROR , +qemu_log_mask (LOG_INVALID_MEM ,"Invalid access to non-RAM device at " "addr 0x%" HWADDR_PRIX ", size %" HWADDR_PRIu", " "region '%s'\n" , addr, len,memory_region_name (mr));
util/log.c +2 -0
@@ -503,6 +503,8 @@ const QEMULogItem qemu_log_items[] = { "open a separate log file per thread; filename must contain '%d'" }, {CPU_LOG_TB_VPU ,"vpu" , "include VPU registers in the 'cpu' logging" }, + { LOG_INVALID_MEM, "invalid_mem", + "log invalid memory accesses" }, { 0, NULL, NULL }, };
Signature · 1 line
2.47.1
[PULL 22/59] target/arm/mte: Restrict 'exec/ram_addr.h' to system emulation
In reply to Philippe Mathieu-Daudé"exec/ram_addr.h" contains system specific declarations. Restrict its inclusion to sysemu to avoid build errors when refactoring.
Message-Id: <[email protected]>
--- target/arm/tcg/mte_helper.c | 2 ++ 1 file changed, 2 insertions(+)
target/arm/tcg/mte_helper.c +2 -0
@@ -23,7 +23,9 @@#include "internals.h" #include "exec/exec-all.h" #include "exec/page-protection.h" +#ifndef CONFIG_USER_ONLY #include "exec/ram_addr.h" +#endif #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "hw/core/tcg-cpu-ops.h"
Signature · 1 line
2.47.1
[PULL 14/59] accel/tcg: Include missing 'exec/tswap.h' header in translator.c
In reply to Philippe Mathieu-Daudétranslator.c indirectly gets "exec/tswap.h" declarations via "exec/cpu-all.h". Include it directly to be able to remove the former from the latter, otherwise we get:
accel/tcg/translator.c:433:15: error: call to undeclared function 'tswap16'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
433 | tgt = tswap16(raw);
| ^Message-Id: <[email protected]>
--- accel/tcg/translator.c | 1 + 1 file changed, 1 insertion(+)
accel/tcg/translator.c +1 -0
@@ -15,6 +15,7 @@#include "exec/cpu_ldst.h" #include "exec/plugin-gen.h" #include "exec/cpu_ldst.h" +#include "exec/tswap.h" #include "tcg/tcg-op-common.h" #include "internal-target.h" #include "disas/disas.h"
Signature · 1 line
2.47.1
[PULL 32/59] accel/tcg: Really restrict cpu_io_recompile() to system emulation
In reply to Philippe Mathieu-DaudéCommit 38fc4b11e03 ("accel/tcg: Restrict cpu_io_recompile() to system emulation") inadvertently restricted cpu_io_recompile() to SoftMMU. Correct to restrict to system emulation.
Message-Id: <[email protected]>
--- accel/tcg/internal-target.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
accel/tcg/internal-target.h +2 -2
@@ -36,9 +36,9 @@ static inline void page_table_config_init(void) { }void page_table_config_init (void );#endif -#ifdef CONFIG_SOFTMMU +#ifndef CONFIG_USER_ONLY G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr); -#endif /* CONFIG_SOFTMMU */ +#endif /* CONFIG_USER_ONLY */ /** * tcg_req_mo:
Signature · 1 line
2.47.1
[PULL 04/59] qom: New object_property_add_new_container()
In reply to Philippe Mathieu-DaudéFrom: Peter Xu <[email protected]>
To move towards explicit creations of containers, starting that by providing a helper for creating container objects.
Message-ID: <[email protected]>
--- include/qom/object.h | 12 ++++++++++++ qom/container.c | 14 +++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-)
include/qom/object.h +12 -0
@@ -2019,6 +2019,18 @@ int object_child_foreach_recursive(Object *obj,*/ Object *container_get (Object *root,const char *path); +/** +* object_property_add_new_container: +* @obj: the parent object +* @name: the name of the parent object's property to add +* +* Add a newly created container object to a parent object. +* +* Returns: the newly created container object. Its reference count is 1, +* and the reference is owned by the parent object. +*/ +Object *object_property_add_new_container (Object *obj,const char *name); +/** * object_property_help: * @name: the name of the property
qom/container.c +11 -3
@@ -24,6 +24,16 @@ static void container_register_types(void)type_register_static (&container_info); } +Object *object_property_add_new_container (Object *obj,const char *name) +{ +Object *child =object_new (TYPE_CONTAINER ); + +object_property_add_child (obj, name, child); +object_unref (child); + +return child; +} +Object *container_get (Object *root,const char *path) {Object *obj, *child;
@@ -37,9 +47,7 @@ Object *container_get(Object *root, const char *path)for (i =1 ; parts[i] !=NULL ; i++, obj = child) { child =object_resolve_path_component (obj, parts[i]);if (!child) { - child =object_new (TYPE_CONTAINER ); -object_property_add_child (obj, parts[i], child); -object_unref (child); + child =object_property_add_new_container (obj, parts[i]); } }
Signature · 1 line
2.47.1
[PULL 12/59] system: Move 'exec/confidential-guest-support.h' to system/
In reply to Philippe Mathieu-Daudé"exec/confidential-guest-support.h" is specific to system emulation, so move it under the system/ namespace. Mechanical change doing:
$ sed -i \
-e 's,exec/confidential-guest-support.h,sysemu/confidential-guest-support.h,' \
$(git grep -l exec/confidential-guest-support.h)Message-Id: <[email protected]>
---
include/{exec => system}/confidential-guest-support.h | 6 +++---
target/i386/confidential-guest.h | 2 +-
backends/confidential-guest-support.c | 2 +-
hw/core/machine.c | 2 +-
hw/ppc/pef.c | 2 +-
hw/ppc/spapr.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 2 +-
system/vl.c | 2 +-
target/s390x/kvm/pv.c | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
rename include/{exec => system}/confidential-guest-support.h (96%)include/system/confidential-guest-support.h renamed from include/exec/confidential-guest-support.h +3 -3
@@ -18,7 +18,9 @@#ifndef QEMU_CONFIDENTIAL_GUEST_SUPPORT_H #define QEMU_CONFIDENTIAL_GUEST_SUPPORT_H -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY +#error Cannot include system/confidential-guest-support.h from user emulation +#endif #include "qom/object.h"
@@ -94,6 +96,4 @@ static inline int confidential_guest_kvm_reset(ConfidentialGuestSupport *cgs, return 0; } -#endif /* !CONFIG_USER_ONLY */ -#endif /* QEMU_CONFIDENTIAL_GUEST_SUPPORT_H */
target/i386/confidential-guest.h +1 -1
@@ -14,7 +14,7 @@#include "qom/object.h" -#include "exec/confidential-guest-support.h" +#include "system/confidential-guest-support.h" #define TYPE_X86_CONFIDENTIAL_GUEST "x86-confidential-guest"
backends/confidential-guest-support.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" -#include "exec/confidential-guest-support.h" +#include "system/confidential-guest-support.h" OBJECT_DEFINE_ABSTRACT_TYPE(ConfidentialGuestSupport, confidential_guest_support,
hw/core/machine.c +1 -1
@@ -30,7 +30,7 @@#include "hw/pci/pci_bridge.h" #include "hw/mem/nvdimm.h" #include "migration/global_state.h" -#include "exec/confidential-guest-support.h" +#include "system/confidential-guest-support.h" #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-net.h" #include "hw/virtio/virtio-iommu.h"
hw/ppc/pef.c +1 -1
@@ -14,7 +14,7 @@#include "qom/object_interfaces.h" #include "system/kvm.h" #include "migration/blocker.h" -#include "exec/confidential-guest-support.h" +#include "system/confidential-guest-support.h" #define TYPE_PEF_GUEST "pef-guest"OBJECT_DECLARE_SIMPLE_TYPE (PefGuest,PEF_GUEST )
hw/ppc/spapr.c +1 -1
@@ -75,7 +75,7 @@#include "hw/virtio/vhost-scsi-common.h" #include "exec/ram_addr.h" -#include "exec/confidential-guest-support.h" +#include "system/confidential-guest-support.h" #include "hw/usb.h" #include "qemu/config-file.h" #include "qemu/error-report.h"
hw/s390x/s390-virtio-ccw.c +1 -1
@@ -14,7 +14,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "exec/ram_addr.h" -#include "exec/confidential-guest-support.h" +#include "system/confidential-guest-support.h" #include "hw/boards.h" #include "hw/s390x/s390-virtio-hcall.h" #include "hw/s390x/sclp.h"
system/vl.c +1 -1
@@ -107,7 +107,7 @@#include "qemu/plugin.h" #include "qemu/queue.h" #include "system/arch_init.h" -#include "exec/confidential-guest-support.h" +#include "system/confidential-guest-support.h" #include "ui/qemu-spice.h" #include "qapi/string-input-visitor.h"
target/s390x/kvm/pv.c +1 -1
@@ -19,7 +19,7 @@#include "system/kvm.h" #include "system/cpus.h" #include "qom/object_interfaces.h" -#include "exec/confidential-guest-support.h" +#include "system/confidential-guest-support.h" #include "hw/s390x/ipl.h" #include "hw/s390x/sclp.h" #include "target/s390x/kvm/kvm_s390x.h"
Signature · 1 line
2.47.1
[PULL 13/59] tcg/tci: Include missing 'disas/dis-asm.h' header
In reply to Philippe Mathieu-Daudé"disas/dis-asm.h" defines bfd_vma and disassemble_info, include it in order to avoid (when refactoring other headers):
tcg/tci.c:1066:20: error: unknown type name 'bfd_vma' int print_insn_tci(bfd_vma addr, disassemble_info *info)
^
tcg/tci.c:1066:34: error: unknown type name 'disassemble_info'
int print_insn_tci(bfd_vma addr, disassemble_info *info)
^Message-Id: <[email protected]>
--- tcg/tci.c | 1 + 1 file changed, 1 insertion(+)
tcg/tci.c +1 -0
@@ -21,6 +21,7 @@#include "tcg/tcg.h" #include "tcg/helper-info.h" #include "tcg/tcg-ldst.h" +#include "disas/dis-asm.h" #include <ffi.h>
Signature · 1 line
2.47.1
[PULL 23/59] exec/ram_addr: Include missing 'exec/hwaddr.h' and 'exec/cpu-common.h'
In reply to Philippe Mathieu-Daudé'hwaddr' is defined in "exec/hwaddr.h", 'ram_addr_t' in "exec/cpu-common.h". Include these headers in order to avoid when refactoring unrelated headers:
In file included from ../../hw/s390x/s390-virtio-ccw.c:17:
include/sysemu/physmem-target.h:37:24: error: unknown type name 'hwaddr'
37 | (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client);
| ^ In file included from ../../hw/s390x/s390-virtio-ccw.c:16:
include/exec/ram_addr.h:52:36: error: unknown type name 'ram_addr_t'
52 | RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
| ^
Message-Id: <[email protected]>
--- include/exec/ram_addr.h | 3 +++ 1 file changed, 3 insertions(+)
include/exec/ram_addr.h +3 -0
@@ -28,6 +28,9 @@#include "exec/exec-all.h" #include "qemu/rcu.h" +#include "exec/hwaddr.h" +#include "exec/cpu-common.h" +extern uint64_t total_dirty_pages;/**
Signature · 1 line
2.47.1
[PULL 18/59] exec/translation-block: Include missing 'exec/vaddr.h' header
In reply to Philippe Mathieu-Daudé'vaddr' type is declared in "exec/vaddr.h". "exec/translation-block.h" uses this type without including the corresponding header. It works because this header is indirectly included, but won't work when the other headers are refactored:
include/exec/translation-block.h:56:5: error: unknown type name 'vaddr'
56 | vaddr pc;
| ^Explitly include "exec/vaddr.h" to avoid such problem in a few commits.
Message-Id: <[email protected]>
--- include/exec/translation-block.h | 1 + 1 file changed, 1 insertion(+)
include/exec/translation-block.h +1 -0
@@ -9,6 +9,7 @@#include "qemu/thread.h" #include "exec/cpu-common.h" +#include "exec/vaddr.h" #ifdef CONFIG_USER_ONLY #include "qemu/interval-tree.h" #endif
Signature · 1 line
2.47.1
[PULL 09/59] qom: Create system containers explicitly
In reply to Philippe Mathieu-DaudéFrom: Peter Xu <[email protected]>
Always explicitly create QEMU system containers upfront.
Root containers will be created when trying to fetch the root object the 1st time. They are:
/objects
/chardevs
/backend
Machine sub-containers will be created only until machine is being initialized. They are:
/machine/unattached
/machine/peripheral
/machine/peripheral-anon
Message-ID: <[email protected]>
--- hw/core/machine.c | 3 --- qom/object.c | 24 +++++++++++++++++++++++- system/vl.c | 16 ++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-)
hw/core/machine.c +0 -3
@@ -1229,9 +1229,6 @@ static void machine_initfn(Object *obj)MachineState *ms =MACHINE (obj);MachineClass *mc =MACHINE_GET_CLASS (obj); -container_get (obj,"/peripheral" ); -container_get (obj,"/peripheral-anon" ); - ms->dump_guest_core = true; ms->mem_merge = (QEMU_MADV_MERGEABLE !=QEMU_MADV_INVALID ); ms->enable_graphics = true;
qom/object.c +23 -1
@@ -1729,12 +1729,34 @@ const char *object_property_get_type(Object *obj, const char *name, Error **errpreturn prop->type; } +static const char *const root_containers[] = { +"chardevs" , +"objects" , +"backend" +}; + +static Object *object_root_initialize (void ) +{ +Object *root =object_new (TYPE_CONTAINER ); +int i; + +/* +* Create all QEMU system containers. "machine" and its sub-containers +* are only created when machine initializes (qemu_create_machine()). +*/ +for (i =0 ; i <ARRAY_SIZE (root_containers); i++) { +object_property_add_new_container (root, root_containers[i]); + } + +return root; +} +Object *object_get_root (void ) {static Object *root;if (!root) { - root =object_new (TYPE_CONTAINER ); + root =object_root_initialize (); }return root;
system/vl.c +16 -0
@@ -2113,6 +2113,21 @@ static void parse_memory_options(void)loc_pop (&loc); } +static const char *const machine_containers[] = { +"unattached" , +"peripheral" , +"peripheral-anon" +}; + +static void qemu_create_machine_containers (Object *machine) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (machine_containers); i++) { +object_property_add_new_container (machine, machine_containers[i]); + } +} +static void qemu_create_machine (QDict *qdict) {MachineClass *machine_class =select_machine (qdict, &error_fatal);
@@ -2121,6 +2136,7 @@ static void qemu_create_machine(QDict *qdict) current_machine =MACHINE (object_new_with_class (OBJECT_CLASS (machine_class)));object_property_add_child (object_get_root (),"machine" ,OBJECT (current_machine)); +qemu_create_machine_containers (OBJECT (current_machine));object_property_add_child (container_get (OBJECT (current_machine),"/unattached" ),"sysbus" ,OBJECT (sysbus_get_default ()));
Signature · 1 line
2.47.1
[PULL 28/59] system: Remove unnecessary 'exec/translate-all.h' include
In reply to Philippe Mathieu-DaudéAt this point "exec/translate-all.h" only declare tb_check_watchpoint(), which isn't used by any of cpu-target.c or system/physmem.c, so remove its inclusion.
Message-Id: <[email protected]>
--- cpu-target.c | 1 - system/physmem.c | 1 - 2 files changed, 2 deletions(-)
cpu-target.c +0 -1
@@ -41,7 +41,6 @@#include "exec/cpu-common.h" #include "exec/exec-all.h" #include "exec/tb-flush.h" -#include "exec/translate-all.h" #include "exec/log.h" #include "hw/core/accel-cpu.h" #include "trace/trace-root.h"
system/physmem.c +0 -1
@@ -61,7 +61,6 @@#include "qemu/rcu_queue.h" #include "qemu/main-loop.h" -#include "exec/translate-all.h" #include "system/replay.h" #include "exec/memory-internal.h"
Signature · 1 line
2.47.1
[PULL 10/59] target/i386/sev: Reduce system specific declarations
In reply to Philippe Mathieu-Daudé"system/confidential-guest-support.h" is not needed, remove it. Reorder #ifdef'ry to reduce declarations exposed on user emulation.
Message-Id: <[email protected]>
--- target/i386/sev.h | 29 ++++++++++++++++------------- hw/i386/pc_sysfw.c | 2 +- 2 files changed, 17 insertions(+), 14 deletions(-)
target/i386/sev.h +16 -13
@@ -18,7 +18,17 @@#include CONFIG_DEVICES /* CONFIG_SEV */ #endif -#include "exec/confidential-guest-support.h" +#if !defined(CONFIG_SEV ) || defined(CONFIG_USER_ONLY ) +#define sev_enabled () 0 +#define sev_es_enabled () 0 +#define sev_snp_enabled () 0 +#else +bool sev_enabled (void ); +bool sev_es_enabled (void ); +bool sev_snp_enabled (void ); +#endif + +#if !defined(CONFIG_USER_ONLY )#define TYPE_SEV_COMMON "sev-common"#define TYPE_SEV_GUEST "sev-guest"
@@ -45,18 +55,6 @@ typedef struct SevKernelLoaderContext {size_t cmdline_size; } SevKernelLoaderContext; -#ifdef CONFIG_SEV -bool sev_enabled (void ); -bool sev_es_enabled (void ); -bool sev_snp_enabled (void ); -#else -#define sev_enabled () 0 -#define sev_es_enabled () 0 -#define sev_snp_enabled () 0 -#endif - -uint32_t sev_get_cbit_position (void ); -uint32_t sev_get_reduced_phys_bits (void );bool sev_add_kernel_loader_hashes (SevKernelLoaderContext *ctx,Error **errp);int sev_encrypt_flash (hwaddr gpa,uint8_t *ptr,uint64_t len,Error **errp);
@@ -68,4 +66,9 @@ void sev_es_set_reset_vector(CPUState *cpu);void pc_system_parse_sev_metadata (uint8_t *flash_ptr,size_t flash_size); +#endif /* !CONFIG_USER_ONLY */ + +uint32_t sev_get_cbit_position (void ); +uint32_t sev_get_reduced_phys_bits (void ); +#endif
hw/i386/pc_sysfw.c +1 -1
@@ -36,7 +36,7 @@#include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "sysemu/kvm.h" -#include "sev.h" +#include "target/i386/sev.h" #define FLASH_SECTOR_SIZE 4096
Signature · 1 line
2.47.1
[PULL 29/59] accel/tcg: Move 'exec/translate-all.h' -> 'tb-internal.h'
In reply to Philippe Mathieu-Daudé"exec/translate-all.h" is only useful to TCG accelerator, so move it to accel/tcg/, after renaming it 'tb-internal.h'.
Message-Id: <[email protected]>
--- accel/tcg/internal-target.h | 2 +- accel/tcg/tb-internal.h | 14 ++++++++++++++ include/exec/translate-all.h | 28 ---------------------------- accel/tcg/cputlb.c | 2 +- accel/tcg/tb-maint.c | 2 +- accel/tcg/translate-all.c | 2 +- accel/tcg/user-exec.c | 1 + accel/tcg/watchpoint.c | 2 +- 8 files changed, 20 insertions(+), 33 deletions(-) create mode 100644 accel/tcg/tb-internal.h delete mode 100644 include/exec/translate-all.h
accel/tcg/internal-target.h +1 -1
@@ -10,7 +10,7 @@#define ACCEL_TCG_INTERNAL_TARGET_H #include "exec/exec-all.h" -#include "exec/translate-all.h" +#include "tb-internal.h" /* * Access to the various translations structures need to be serialised
accel/tcg/tb-internal.h new file +14 -0
@@ -0,0 +1,14 @@ +/* +* TranslationBlock internal declarations (target specific) +* +* Copyright (c) 2003 Fabrice Bellard +* +* SPDX-License-Identifier: LGPL-2.1-or-later +*/ + +#ifndef ACCEL_TCG_TB_INTERNAL_TARGET_H +#define ACCEL_TCG_TB_INTERNAL_TARGET_H + +void tb_check_watchpoint (CPUState *cpu,uintptr_t retaddr); + +#endif
include/exec/translate-all.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* -* Translated block handling -* -* Copyright (c) 2003 Fabrice Bellard -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* 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 TRANSLATE_ALL_H -#define TRANSLATE_ALL_H - -#include "exec/exec-all.h" - - -/* translate-all.c */ -void tb_check_watchpoint (CPUState *cpu,uintptr_t retaddr); - -#endif /* TRANSLATE_ALL_H */
accel/tcg/cputlb.c +1 -1
@@ -37,7 +37,7 @@#include "exec/helper-proto-common.h" #include "qemu/atomic.h" #include "qemu/atomic128.h" -#include "exec/translate-all.h" +#include "tb-internal.h" #include "trace.h" #include "tb-hash.h" #include "internal-common.h"
accel/tcg/tb-maint.c +1 -1
@@ -25,7 +25,7 @@#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/tb-flush.h" -#include "exec/translate-all.h" +#include "tb-internal.h" #include "system/tcg.h" #include "tcg/tcg.h" #include "tb-hash.h"
accel/tcg/translate-all.c +1 -1
@@ -45,7 +45,7 @@#include "exec/cputlb.h" #include "exec/page-protection.h" -#include "exec/translate-all.h" +#include "tb-internal.h" #include "exec/translator.h" #include "exec/tb-flush.h" #include "qemu/bitmap.h"
accel/tcg/user-exec.c +1 -0
@@ -33,6 +33,7 @@#include "tcg/tcg-ldst.h" #include "internal-common.h" #include "internal-target.h" +#include "tb-internal.h" __threaduintptr_t helper_retaddr;
accel/tcg/watchpoint.c +1 -1
@@ -21,8 +21,8 @@#include "qemu/main-loop.h" #include "qemu/error-report.h" #include "exec/exec-all.h" -#include "exec/translate-all.h" #include "exec/page-protection.h" +#include "tb-internal.h" #include "system/tcg.h" #include "system/replay.h" #include "hw/core/tcg-cpu-ops.h"
Signature · 1 line
2.47.1
[PULL 40/59] user: Move various declarations out of 'exec/exec-all.h'
In reply to Philippe Mathieu-DaudéMove various declarations related to user emulation from "exec/exec-all.h" to "user/cpu_loop.h".
Message-Id: <[email protected]>
--- include/exec/exec-all.h | 55 +------------------------------------ include/user/cpu_loop.h | 54 ++++++++++++++++++++++++++++++++++++ accel/tcg/user-exec.c | 1 + bsd-user/signal.c | 1 + linux-user/signal.c | 1 + target/arm/tcg/mte_helper.c | 1 + 6 files changed, 59 insertions(+), 54 deletions(-)
include/exec/exec-all.h +1 -54
@@ -22,7 +22,6 @@#include "cpu.h" #if defined(CONFIG_USER_ONLY ) -#include "exec/abi_ptr.h" #include "exec/cpu_ldst.h" #endif #include "exec/mmu-access-type.h"
@@ -518,60 +517,8 @@ static inline tb_page_addr_t get_page_addr_code(CPUArchState *env,return get_page_addr_code_hostp (env, addr,NULL ); } -#if defined(CONFIG_USER_ONLY ) +#if !defined(CONFIG_USER_ONLY ) -/** -* adjust_signal_pc: -* @pc: raw pc from the host signal ucontext_t. -* @is_write: host memory operation was write, or read-modify-write. -* -* Alter @pc as required for unwinding. Return the type of the -* guest memory access -- host reads may be for guest execution. -*/ -MMUAccessType adjust_signal_pc (uintptr_t *pc,bool is_write); - -/** -* handle_sigsegv_accerr_write: -* @cpu: the cpu context -* @old_set: the sigset_t from the signal ucontext_t -* @host_pc: the host pc, adjusted for the signal -* @host_addr: the host address of the fault -* -* Return true if the write fault has been handled, and should be re-tried. -*/ -bool handle_sigsegv_accerr_write (CPUState *cpu,sigset_t *old_set, -uintptr_t host_pc,abi_ptr guest_addr); - -/** -* cpu_loop_exit_sigsegv: -* @cpu: the cpu context -* @addr: the guest address of the fault -* @access_type: access was read/write/execute -* @maperr: true for invalid page, false for permission fault -* @ra: host pc for unwinding -* -* Use the TCGCPUOps hook to record cpu state, do guest operating system -* specific things to raise SIGSEGV, and jump to the main cpu loop. -*/ -G_NORETURN void cpu_loop_exit_sigsegv(CPUState *cpu, target_ulong addr, -MMUAccessType access_type, -bool maperr,uintptr_t ra); - -/** -* cpu_loop_exit_sigbus: -* @cpu: the cpu context -* @addr: the guest address of the alignment fault -* @access_type: access was read/write/execute -* @ra: host pc for unwinding -* -* Use the TCGCPUOps hook to record cpu state, do guest operating system -* specific things to raise SIGBUS, and jump to the main cpu loop. -*/ -G_NORETURN void cpu_loop_exit_sigbus(CPUState *cpu, target_ulong addr, -MMUAccessType access_type, -uintptr_t ra); - -#else void tlb_reset_dirty (CPUState *cpu,ram_addr_t start1,ram_addr_t length);void tlb_reset_dirty_range_all (ram_addr_t start,ram_addr_t length);
include/user/cpu_loop.h +54 -0
63 lines not on this page · raw message
accel/tcg/user-exec.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/bitops.h" #include "qemu/rcu.h" #include "exec/cpu_ldst.h" +#include "user/cpu_loop.h" #include "qemu/main-loop.h" #include "user/page-protection.h" #include "exec/page-protection.h"
bsd-user/signal.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "qemu/log.h" #include "qemu.h" +#include "user/cpu_loop.h" #include "exec/page-protection.h" #include "user/page-protection.h" #include "user/tswap-target.h"
linux-user/signal.c +1 -0
@@ -33,6 +33,7 @@#include "trace.h" #include "signal-common.h" #include "host-signal.h" +#include "user/cpu_loop.h" #include "user/page-protection.h" #include "user/safe-syscall.h" #include "tcg/tcg.h"
target/arm/tcg/mte_helper.c +1 -0
@@ -24,6 +24,7 @@#include "exec/exec-all.h" #include "exec/page-protection.h" #ifdef CONFIG_USER_ONLY +#include "user/cpu_loop.h" #include "user/page-protection.h" #else #include "exec/ram_addr.h"
Signature · 1 line
2.47.1
[PULL 46/59] exec/translation-block: Include missing 'qemu/atomic.h' header
In reply to Philippe Mathieu-DaudéWhen moving tb_cflags() in commit 88d4b5138a8 ("tcg: Make tb_cflags() usable from target-agnostic code") we forgot to include "qemu/atomic.h", which declares qatomic_read(). Explicitly include it now to avoid issue when refactoring unrelated headers.
Message-Id: <[email protected]>
--- include/exec/translation-block.h | 1 + 1 file changed, 1 insertion(+)
include/exec/translation-block.h +1 -0
@@ -7,6 +7,7 @@#ifndef EXEC_TRANSLATION_BLOCK_H #define EXEC_TRANSLATION_BLOCK_H +#include "qemu/atomic.h" #include "qemu/thread.h" #include "exec/cpu-common.h" #include "exec/vaddr.h"
Signature · 1 line
2.47.1
[PULL 51/59] accel/tcg: Un-inline translator_is_same_page()
In reply to Philippe Mathieu-DaudéRemove the single target-specific definition used in "exec/translator.h" (TARGET_PAGE_MASK) by un-inlining is_same_page().
Rename the method as translator_is_same_page() and improve its documentation.
Use it in translator_use_goto_tb().
Message-Id: <[email protected]>
--- include/exec/translator.h | 15 +++++++-------- accel/tcg/translator.c | 7 ++++++- target/i386/tcg/translate.c | 6 +++--- target/riscv/translate.c | 4 ++-- target/s390x/tcg/translate.c | 4 ++-- 5 files changed, 20 insertions(+), 16 deletions(-)
include/exec/translator.h +7 -8
@@ -267,16 +267,15 @@ bool translator_st(const DisasContextBase *db, void *dest,*/ size_t translator_st_len (const DisasContextBase *db); -#ifdef COMPILING_PER_TARGET -/* -* Return whether addr is on the same page as where disassembly started. +/** +* translator_is_same_page +* @db: disassembly context +* @addr: virtual address within TB +* +* Return whether @addr is on the same page as where disassembly started. * Translators can use this to enforce the rule that only single-insn * translation blocks are allowed to cross page boundaries. */ -static inline bool is_same_page (const DisasContextBase *db,vaddr addr) -{ -return ((addr ^ db->pc_first) &TARGET_PAGE_MASK ) ==0 ; -} -#endif +bool translator_is_same_page (const DisasContextBase *db,vaddr addr);#endif /* EXEC__TRANSLATOR_H */
accel/tcg/translator.c +6 -1
@@ -104,6 +104,11 @@ static void gen_tb_end(const TranslationBlock *tb, uint32_t cflags, } } +bool translator_is_same_page (const DisasContextBase *db,vaddr addr) +{ +return ((addr ^ db->pc_first) &TARGET_PAGE_MASK ) ==0 ; +} +bool translator_use_goto_tb (DisasContextBase *db,vaddr dest) {/* Suppress goto_tb if requested. */
@@ -112,7 +117,7 @@ bool translator_use_goto_tb(DisasContextBase *db, vaddr dest) }/* Check for the dest on the same page as the start of the TB. */ -return ((db->pc_first ^ dest) &TARGET_PAGE_MASK ) ==0 ; +return translator_is_same_page (db, dest); } void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
target/i386/tcg/translate.c +3 -3
@@ -1512,7 +1512,7 @@ static uint64_t advance_pc(CPUX86State *env, DisasContext *s, int num_bytes)/* This is a subsequent insn that crosses a page boundary. */ if (s->base.num_insns >1 && - !is_same_page (&s->base, s->pc + num_bytes -1 )) { + !translator_is_same_page (&s->base, s->pc + num_bytes -1 )) {siglongjmp (s->jmpbuf,2 ); }
@@ -2226,7 +2226,7 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num)* no extra masking to apply (data16 branch in code32, see above), * then we have also proven that the addition does not wrap. */ -if (!use_goto_tb || !is_same_page (&s->base, new_pc)) { +if (!use_goto_tb || !translator_is_same_page (&s->base, new_pc)) {tcg_gen_andi_tl (cpu_eip, cpu_eip, mask); use_goto_tb = false; }
@@ -3763,7 +3763,7 @@ static void i386_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)* chance to happen. */ dc->base.is_jmp =DISAS_EOB_NEXT ; - }else if (!is_same_page (&dc->base, dc->base.pc_next)) { + }else if (!translator_is_same_page (&dc->base, dc->base.pc_next)) { dc->base.is_jmp =DISAS_TOO_MANY ; } }
target/riscv/translate.c +2 -2
@@ -1305,7 +1305,7 @@ static void riscv_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)/* Only the first insn within a TB is allowed to cross a page boundary. */ if (ctx->base.is_jmp ==DISAS_NEXT ) { -if (ctx->itrigger || !is_same_page (&ctx->base, ctx->base.pc_next)) { +if (ctx->itrigger || !translator_is_same_page (&ctx->base, ctx->base.pc_next)) { ctx->base.is_jmp =DISAS_TOO_MANY ; }else {unsigned page_ofs = ctx->base.pc_next & ~TARGET_PAGE_MASK ;
@@ -1315,7 +1315,7 @@ static void riscv_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)translator_lduw (env, &ctx->base, ctx->base.pc_next);int len =insn_len (next_insn); -if (!is_same_page (&ctx->base, ctx->base.pc_next + len -1 )) { +if (!translator_is_same_page (&ctx->base, ctx->base.pc_next + len -1 )) { ctx->base.is_jmp =DISAS_TOO_MANY ; } }
target/s390x/tcg/translate.c +2 -2
@@ -6423,8 +6423,8 @@ static void s390x_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) dc->base.is_jmp =translate_one (env, dc);if (dc->base.is_jmp ==DISAS_NEXT ) {if (dc->ex_value || - !is_same_page (dcbase, dc->base.pc_next) || - !is_same_page (dcbase,get_next_pc (env, dc, dc->base.pc_next))) { + !translator_is_same_page (dcbase, dc->base.pc_next) || + !translator_is_same_page (dcbase,get_next_pc (env, dc, dc->base.pc_next))) { dc->base.is_jmp =DISAS_TOO_MANY ; } }
Signature · 1 line
2.47.1
[PULL 34/59] accel/tcg: Move user-related declarations out of 'exec/cpu-all.h' (2/4)
In reply to Philippe Mathieu-DaudéMove declarations related to page protection under user emulation from "exec/cpu-all.h" to "user/page-protection.h".
Message-Id: <[email protected]>
--- bsd-user/bsd-mem.h | 1 + include/exec/cpu-all.h | 55 -------------------------------- include/user/page-protection.h | 57 ++++++++++++++++++++++++++++++++++ target/arm/tcg/mte_helper.c | 4 ++- 4 files changed, 61 insertions(+), 56 deletions(-)
bsd-user/bsd-mem.h +1 -0
@@ -57,6 +57,7 @@#include "qemu-bsd.h" #include "exec/page-protection.h" +#include "user/page-protection.h" extern struct bsd_shm_regions bsd_shm_regions[];extern abi_ulong target_brk;
include/exec/cpu-all.h +0 -55
67 lines not on this page · raw message
include/user/page-protection.h +57 -0
63 lines not on this page · raw message
target/arm/tcg/mte_helper.c +3 -1
@@ -23,7 +23,9 @@#include "internals.h" #include "exec/exec-all.h" #include "exec/page-protection.h" -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY +#include "user/page-protection.h" +#else #include "exec/ram_addr.h" #endif #include "exec/cpu_ldst.h"
Signature · 1 line
2.47.1
[PULL 44/59] exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined
In reply to Philippe Mathieu-DaudéInclude "cpu.h" earlier to get the MMU_USER_IDX definition soon enough and avoid when refactoring unrelated headers:
In file included from include/exec/translator.h:271,
from ../../accel/tcg/translator.c:13:
include/exec/cpu-all.h: In function ‘cpu_mmu_index’:
include/exec/cpu-all.h:274:12: error: ‘MMU_USER_IDX’ undeclared (first use in this function)
274 | return MMU_USER_IDX;
| ^~~~~~~~~~~~ include/exec/cpu-all.h:274:12: note: each undeclared identifier is reported only once for each function it appears in
ninja: build stopped: subcommand failed.
We need to forward-declare cpu_mmu_index() to avoid on user emulation:
In file included from include/exec/cpu-all.h:263,
from include/exec/translator.h:271,
from ../../accel/tcg/translator.c:13:
../../target/sparc/cpu.h: In function ‘cpu_get_tb_cpu_state’:
../../target/sparc/cpu.h:757:13: error: implicit declaration of function ‘cpu_mmu_index’ [-Werror=implicit-function-declaration]
757 | flags = cpu_mmu_index(env_cpu(env), false);
| ^~~~~~~~~~~~~Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
include/exec/cpu-all.h +4 -1
@@ -180,8 +180,12 @@ CPUArchState *cpu_copy(CPUArchState *env); | CPU_INTERRUPT_TGT_EXT_3 \ | CPU_INTERRUPT_TGT_EXT_4) +#include "cpu.h" +#ifdef CONFIG_USER_ONLY +static inline int cpu_mmu_index (CPUState *cs,bool ifetch); +/* * Allow some level of source compatibility with softmmu. We do not * support any of the more exotic features, so only invalid pages may
@@ -271,7 +275,6 @@ static inline bool tlb_hit(uint64_t tlb_addr, vaddr addr)#endif /* !CONFIG_USER_ONLY */ /* Validate correct placement of CPUArchState. */ -#include "cpu.h" QEMU_BUILD_BUG_ON (offsetof(ArchCPU , parent_obj) !=0 );QEMU_BUILD_BUG_ON (offsetof(ArchCPU , env) !=sizeof (CPUState));
Signature · 1 line
2.47.1
[PULL 30/59] accel/tcg: Un-inline log_pc()
In reply to Philippe Mathieu-Daudélog_pc() is only used within cpu-exec.c, no need to expose it via "internal-target.h".
Message-Id: <[email protected]>
--- accel/tcg/internal-target.h | 10 ---------- accel/tcg/cpu-exec.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-)
accel/tcg/internal-target.h +0 -10
@@ -72,16 +72,6 @@ G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);bool tb_invalidate_phys_page_unwind (tb_page_addr_t addr,uintptr_t pc); -/* Return the current PC from CPU, which may be cached in TB. */ -static inline vaddr log_pc (CPUState *cpu,const TranslationBlock *tb) -{ -if (tb_cflags (tb) &CF_PCREL ) { -return cpu->cc->get_pc (cpu); - }else { -return tb->pc; - } -} -/** * tcg_req_mo: * @type: TCGBar
accel/tcg/cpu-exec.c +11 -0
@@ -21,6 +21,7 @@#include "qemu/qemu-print.h" #include "qapi/error.h" #include "qapi/type-helpers.h" +#include "hw/core/cpu.h" #include "hw/core/tcg-cpu-ops.h" #include "trace.h" #include "disas/disas.h"
@@ -434,6 +435,16 @@ const void *HELPER(lookup_tb_ptr)(CPUArchState *env)return tb->tc.ptr; } +/* Return the current PC from CPU, which may be cached in TB. */ +static vaddr log_pc (CPUState *cpu,const TranslationBlock *tb) +{ +if (tb_cflags (tb) &CF_PCREL ) { +return cpu->cc->get_pc (cpu); + }else { +return tb->pc; + } +} +/* Execute a TB, and fix up the CPU state afterwards if necessary */ /* * Disable CFI checks.
Signature · 1 line
2.47.1
[PULL 26/59] accel/tcg: Use tb_page_addr_t type in page_unprotect()
In reply to Philippe Mathieu-DaudéMatch with the page_protect() prototype, use a tb_page_addr_t argument instead of target_ulong.
Message-Id: <[email protected]>
--- include/exec/translate-all.h | 2 +- accel/tcg/user-exec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/exec/translate-all.h +1 -1
@@ -27,7 +27,7 @@ void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr);#ifdef CONFIG_USER_ONLY void page_protect (tb_page_addr_t page_addr); -int page_unprotect (target_ulong address,uintptr_t pc); +int page_unprotect (tb_page_addr_t address,uintptr_t pc);#endif #endif /* TRANSLATE_ALL_H */
accel/tcg/user-exec.c +1 -1
@@ -696,7 +696,7 @@ void page_protect(tb_page_addr_t address)* immediately exited. (We can only return 2 if the 'pc' argument is * non-zero.) */ -int page_unprotect (target_ulong address,uintptr_t pc) +int page_unprotect (tb_page_addr_t address,uintptr_t pc) {PageFlagsNode *p;bool current_tb_invalidated;
Signature · 1 line
2.47.1
[PULL 37/59] user: Forward declare target_cpu_copy_regs structure
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- linux-user/cpu_loop-common.h | 5 ++++- linux-user/aarch64/cpu_loop.c | 2 +- linux-user/alpha/cpu_loop.c | 2 +- linux-user/arm/cpu_loop.c | 2 +- linux-user/hexagon/cpu_loop.c | 2 +- linux-user/hppa/cpu_loop.c | 2 +- linux-user/i386/cpu_loop.c | 2 +- linux-user/loongarch64/cpu_loop.c | 2 +- linux-user/m68k/cpu_loop.c | 2 +- linux-user/microblaze/cpu_loop.c | 2 +- linux-user/mips/cpu_loop.c | 2 +- linux-user/openrisc/cpu_loop.c | 2 +- linux-user/ppc/cpu_loop.c | 2 +- linux-user/riscv/cpu_loop.c | 2 +- linux-user/s390x/cpu_loop.c | 2 +- linux-user/sh4/cpu_loop.c | 2 +- linux-user/sparc/cpu_loop.c | 2 +- linux-user/xtensa/cpu_loop.c | 2 +- 18 files changed, 21 insertions(+), 18 deletions(-)
linux-user/cpu_loop-common.h +4 -1
@@ -27,5 +27,8 @@ void target_exception_dump(CPUArchState *env, const char *fmt, int code);#define EXCP_DUMP (env, fmt, code) \ target_exception_dump(env, fmt, code) -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs); +typedef struct target_pt_regs target_pt_regs ; + +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs); +#endif
linux-user/aarch64/cpu_loop.c +1 -1
@@ -185,7 +185,7 @@ void cpu_loop(CPUARMState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {ARMCPU *cpu =env_archcpu (env);CPUState *cs =env_cpu (env);
linux-user/alpha/cpu_loop.c +1 -1
@@ -173,7 +173,7 @@ void cpu_loop(CPUAlphaState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {int i;
linux-user/arm/cpu_loop.c +1 -1
@@ -513,7 +513,7 @@ void cpu_loop(CPUARMState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {CPUState *cpu =env_cpu (env);TaskState *ts =get_task_state (cpu);
linux-user/hexagon/cpu_loop.c +1 -1
@@ -79,7 +79,7 @@ void cpu_loop(CPUHexagonState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) { env->gpr[HEX_REG_PC ] = regs->sepc; env->gpr[HEX_REG_SP ] = regs->sp;
linux-user/hppa/cpu_loop.c +1 -1
@@ -188,7 +188,7 @@ void cpu_loop(CPUHPPAState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {int i;for (i =1 ; i <32 ; i++) {
linux-user/i386/cpu_loop.c +1 -1
@@ -331,7 +331,7 @@ static void target_cpu_free(void *obj)g_free (obj); } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {CPUState *cpu =env_cpu (env);bool is64 = (env->features[FEAT_8000_0001_EDX ] &CPUID_EXT2_LM ) !=0 ;
linux-user/loongarch64/cpu_loop.c +1 -1
@@ -97,7 +97,7 @@ void cpu_loop(CPULoongArchState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {int i;
linux-user/m68k/cpu_loop.c +1 -1
@@ -92,7 +92,7 @@ void cpu_loop(CPUM68KState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {CPUState *cpu =env_cpu (env);TaskState *ts =get_task_state (cpu);
linux-user/microblaze/cpu_loop.c +1 -1
@@ -127,7 +127,7 @@ void cpu_loop(CPUMBState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) { env->regs[0 ] = regs->r0; env->regs[1 ] = regs->r1;
linux-user/mips/cpu_loop.c +1 -1
@@ -211,7 +211,7 @@ done_syscall: } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {CPUState *cpu =env_cpu (env);TaskState *ts =get_task_state (cpu);
linux-user/openrisc/cpu_loop.c +1 -1
@@ -83,7 +83,7 @@ void cpu_loop(CPUOpenRISCState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {int i;
linux-user/ppc/cpu_loop.c +1 -1
@@ -378,7 +378,7 @@ void cpu_loop(CPUPPCState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {int i;
linux-user/riscv/cpu_loop.c +1 -1
@@ -94,7 +94,7 @@ void cpu_loop(CPURISCVState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {CPUState *cpu =env_cpu (env);TaskState *ts =get_task_state (cpu);
linux-user/s390x/cpu_loop.c +1 -1
@@ -180,7 +180,7 @@ void cpu_loop(CPUS390XState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {int i;for (i =0 ; i <16 ; i++) {
linux-user/sh4/cpu_loop.c +1 -1
@@ -81,7 +81,7 @@ void cpu_loop(CPUSH4State *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {int i;
linux-user/sparc/cpu_loop.c +1 -1
@@ -357,7 +357,7 @@ void cpu_loop (CPUSPARCState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {int i; env->pc = regs->pc;
linux-user/xtensa/cpu_loop.c +1 -1
@@ -238,7 +238,7 @@ void cpu_loop(CPUXtensaState *env) } } -void target_cpu_copy_regs (CPUArchState *env,struct target_pt_regs *regs) +void target_cpu_copy_regs (CPUArchState *env,target_pt_regs *regs) {int i;for (i =0 ; i <16 ; ++i) {
Signature · 1 line
2.47.1
[PULL 52/59] target/xtensa: Remove tswap() calls in semihosting simcall() helper
In reply to Philippe Mathieu-DaudéIn preparation of heterogeneous emulation where cores with different endianness can run concurrently, replace the pair of cpu_memory_rw_debug() + tswap() calls by put/get_user_u32() ones, which still do the same under the hood, but simplify the code maintenance (having less sites to do endianness code conversion).
Message-Id: <[email protected]>
--- target/xtensa/xtensa-semi.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
target/xtensa/xtensa-semi.c +5 -10
@@ -30,6 +30,7 @@#include "chardev/char-fe.h" #include "exec/helper-proto.h" #include "semihosting/semihost.h" +#include "semihosting/uaccess.h" #include "qapi/error.h" #include "qemu/log.h"
@@ -323,15 +324,12 @@ void HELPER(simcall)(CPUXtensaState *env)uint32_t fd = regs[3 ];uint32_t rq = regs[4 ];uint32_t target_tv = regs[5 ]; -uint32_t target_tvv[2 ];struct timeval tv = {0 };if (target_tv) { -cpu_memory_rw_debug (cs, target_tv, - (uint8_t *)target_tvv,sizeof (target_tvv),0 ); - tv.tv_sec = (int32_t )tswap32 (target_tvv[0 ]); - tv.tv_usec = (int32_t )tswap32 (target_tvv[1 ]); +get_user_u32 (tv.tv_sec, target_tv); +get_user_u32 (tv.tv_sec, target_tv +4 ); }if (fd <3 && sim_console) {if ((fd ==1 || fd ==2 ) && rq ==SELECT_ONE_WRITE ) {
@@ -387,11 +385,8 @@ void HELPER(simcall)(CPUXtensaState *env)const char *str =semihosting_get_arg (i);int str_size =strlen (str) +1 ; - argptr =tswap32 (regs[3 ] + str_offset); - -cpu_memory_rw_debug (cs, - regs[3 ] + i *sizeof (uint32_t ), - (uint8_t *)&argptr,sizeof (argptr),1 ); +put_user_u32 (regs[3 ] + str_offset, + regs[3 ] + i *sizeof (uint32_t ));cpu_memory_rw_debug (cs, regs[3 ] + str_offset, (uint8_t *)str, str_size,1 );
Signature · 1 line
2.47.1
[PULL 03/59] qom: Add TYPE_CONTAINER macro
In reply to Philippe Mathieu-DaudéFrom: Peter Xu <[email protected]>
Provide a macro for the container type across QEMU source tree, rather than hard code it every time.
Message-ID: <[email protected]>
--- include/qom/object.h | 1 + hw/arm/stellaris.c | 2 +- qom/container.c | 4 ++-- qom/object.c | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-)
include/qom/object.h +1 -0
@@ -26,6 +26,7 @@ typedef struct InterfaceClass InterfaceClass;typedef struct InterfaceInfo InterfaceInfo ;#define TYPE_OBJECT "object" +#define TYPE_CONTAINER "container"typedef struct ObjectProperty ObjectProperty ;
hw/arm/stellaris.c +1 -1
@@ -1053,7 +1053,7 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) flash_size = (((board->dc0 &0xffff ) +1 ) <<1 ) *1024 ; sram_size = ((board->dc0 >>18 ) +1 ) *1024 ; - soc_container =object_new ("container" ); + soc_container =object_new (TYPE_CONTAINER );object_property_add_child (OBJECT (ms),"soc" , soc_container);/* Flash programming is done via the SCU, so pretend it is ROM. */
qom/container.c +2 -2
@@ -15,7 +15,7 @@#include "qemu/module.h" static const TypeInfo container_info = { - .name ="container" , + .name =TYPE_CONTAINER , .parent =TYPE_OBJECT , };
@@ -37,7 +37,7 @@ Object *container_get(Object *root, const char *path)for (i =1 ; parts[i] !=NULL ; i++, obj = child) { child =object_resolve_path_component (obj, parts[i]);if (!child) { - child =object_new ("container" ); + child =object_new (TYPE_CONTAINER );object_property_add_child (obj, parts[i], child);object_unref (child); }
qom/object.c +2 -2
@@ -1734,7 +1734,7 @@ Object *object_get_root(void)static Object *root;if (!root) { - root =object_new ("container" ); + root =object_new (TYPE_CONTAINER ); }return root;
@@ -1750,7 +1750,7 @@ Object *object_get_internal_root(void)static Object *internal_root;if (!internal_root) { - internal_root =object_new ("container" ); + internal_root =object_new (TYPE_CONTAINER ); }return internal_root;
Signature · 1 line
2.47.1
[PULL 31/59] accel/tcg: Move TranslationBlock declarations to 'tb-internal.h'
In reply to Philippe Mathieu-DaudéMove declarations related to TranslationBlock out of the generic "internal-target.h" to "tb-internal.h".
Message-Id: <[email protected]>
--- accel/tcg/internal-target.h | 32 ------------------------------ accel/tcg/tb-internal.h | 39 +++++++++++++++++++++++++++++++++++++ accel/tcg/cpu-exec.c | 1 + accel/tcg/cputlb.c | 1 + accel/tcg/tb-maint.c | 1 + accel/tcg/translate-all.c | 1 + accel/tcg/translator.c | 1 + 7 files changed, 44 insertions(+), 32 deletions(-)
accel/tcg/internal-target.h +0 -32
@@ -36,42 +36,10 @@ static inline void page_table_config_init(void) { }void page_table_config_init (void );#endif -#ifdef CONFIG_USER_ONLY -#include "user/page-protection.h" -/* -* For user-only, page_protect sets the page read-only. -* Since most execution is already on read-only pages, and we'd need to -* account for other TBs on the same page, defer undoing any page protection -* until we receive the write fault. -*/ -static inline void tb_lock_page0 (tb_page_addr_t p0) -{ -page_protect (p0); -} - -static inline void tb_lock_page1 (tb_page_addr_t p0,tb_page_addr_t p1) -{ -page_protect (p1); -} - -static inline void tb_unlock_page1 (tb_page_addr_t p0,tb_page_addr_t p1) { } -static inline void tb_unlock_pages (TranslationBlock *tb) { } -#else -void tb_lock_page0 (tb_page_addr_t ); -void tb_lock_page1 (tb_page_addr_t ,tb_page_addr_t ); -void tb_unlock_page1 (tb_page_addr_t ,tb_page_addr_t ); -void tb_unlock_pages (TranslationBlock *); -#endif -#ifdef CONFIG_SOFTMMU -void tb_invalidate_phys_range_fast (ram_addr_t ram_addr, -unsigned size, -uintptr_t retaddr); G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);#endif /* CONFIG_SOFTMMU */ -bool tb_invalidate_phys_page_unwind (tb_page_addr_t addr,uintptr_t pc); -/** * tcg_req_mo: * @type: TCGBar
accel/tcg/tb-internal.h +39 -0
@@ -9,6 +9,45 @@#ifndef ACCEL_TCG_TB_INTERNAL_TARGET_H #define ACCEL_TCG_TB_INTERNAL_TARGET_H +#include "exec/cpu-all.h" +#include "exec/exec-all.h" +#include "exec/translation-block.h" + +#ifdef CONFIG_USER_ONLY +#include "user/page-protection.h" +/* +* For user-only, page_protect sets the page read-only. +* Since most execution is already on read-only pages, and we'd need to +* account for other TBs on the same page, defer undoing any page protection +* until we receive the write fault. +*/ +static inline void tb_lock_page0 (tb_page_addr_t p0) +{ +page_protect (p0); +} + +static inline void tb_lock_page1 (tb_page_addr_t p0,tb_page_addr_t p1) +{ +page_protect (p1); +} + +static inline void tb_unlock_page1 (tb_page_addr_t p0,tb_page_addr_t p1) { } +static inline void tb_unlock_pages (TranslationBlock *tb) { } +#else +void tb_lock_page0 (tb_page_addr_t ); +void tb_lock_page1 (tb_page_addr_t ,tb_page_addr_t ); +void tb_unlock_page1 (tb_page_addr_t ,tb_page_addr_t ); +void tb_unlock_pages (TranslationBlock *); +#endif + +#ifdef CONFIG_SOFTMMU +void tb_invalidate_phys_range_fast (ram_addr_t ram_addr, +unsigned size, +uintptr_t retaddr); +#endif /* CONFIG_SOFTMMU */ + +bool tb_invalidate_phys_page_unwind (tb_page_addr_t addr,uintptr_t pc); +void tb_check_watchpoint (CPUState *cpu,uintptr_t retaddr);#endif
accel/tcg/cpu-exec.c +1 -0
@@ -41,6 +41,7 @@#include "tb-jmp-cache.h" #include "tb-hash.h" #include "tb-context.h" +#include "tb-internal.h" #include "internal-common.h" #include "internal-target.h"
accel/tcg/cputlb.c +1 -0
@@ -40,6 +40,7 @@#include "tb-internal.h" #include "trace.h" #include "tb-hash.h" +#include "tb-internal.h" #include "internal-common.h" #include "internal-target.h" #ifdef CONFIG_PLUGIN
accel/tcg/tb-maint.c +1 -0
@@ -30,6 +30,7 @@#include "tcg/tcg.h" #include "tb-hash.h" #include "tb-context.h" +#include "tb-internal.h" #include "internal-common.h" #include "internal-target.h"
accel/tcg/translate-all.c +1 -0
@@ -62,6 +62,7 @@#include "tb-jmp-cache.h" #include "tb-hash.h" #include "tb-context.h" +#include "tb-internal.h" #include "internal-common.h" #include "internal-target.h" #include "tcg/perf.h"
accel/tcg/translator.c +1 -0
@@ -19,6 +19,7 @@#include "tcg/tcg-op-common.h" #include "internal-target.h" #include "disas/disas.h" +#include "tb-internal.h" static void set_can_do_io (DisasContextBase *db,bool val) {
Signature · 1 line
2.47.1
[PULL 47/59] qemu/coroutine: Include missing 'qemu/atomic.h' header
In reply to Philippe Mathieu-DaudéCommit 944f3d5dd21 ("coroutine: Add qemu_co_mutex_assert_locked") added an inline method which uses qatomic_read(), itself declared in "qemu/atomic.h". Explicitly include it now to avoid issue when refactoring unrelated headers.
Message-Id: <[email protected]>
--- include/qemu/coroutine.h | 1 + 1 file changed, 1 insertion(+)
include/qemu/coroutine.h +1 -0
@@ -16,6 +16,7 @@#define QEMU_COROUTINE_H #include "qemu/coroutine-core.h" +#include "qemu/atomic.h" #include "qemu/queue.h" #include "qemu/timer.h"
Signature · 1 line
2.47.1
[PULL 43/59] target/sparc: Move sparc_restore_state_to_opc() to cpu.c
In reply to Philippe Mathieu-DaudéMost targets define their restore_state_to_opc() handler in cpu.c. In order to keep SPARC aligned, move sparc_restore_state_to_opc() from translate.c to cpu.c.
Message-Id: <[email protected]> [PMD: Move definitions to new target/sparc/translate.h]
--- target/sparc/cpu.h | 4 ---- target/sparc/translate.h | 17 +++++++++++++++++ target/sparc/cpu.c | 24 ++++++++++++++++++++++++ target/sparc/translate.c | 31 +------------------------------ 4 files changed, 42 insertions(+), 34 deletions(-) create mode 100644 target/sparc/translate.h
target/sparc/cpu.h +0 -4
@@ -607,12 +607,8 @@ int sparc_cpu_memory_rw_debug(CPUState *cpu, vaddr addr, uint8_t *buf, int len, bool is_write);#endif -/* translate.c */ void sparc_tcg_init (void ); -void sparc_restore_state_to_opc (CPUState *cs, -const TranslationBlock *tb, -const uint64_t *data);/* fop_helper.c */ target_ulong cpu_get_fsr (CPUSPARCState *);
target/sparc/translate.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* QEMU translation definitions for SPARC +* +* Copyright (c) 2024 Linaro, Ltd +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef SPARC_TRANSLATION_H +#define SPARC_TRANSLATION_H + +/* Dynamic PC, must exit to main loop. */ +#define DYNAMIC_PC 1 +/* Dynamic PC, one of two values according to jump_pc[T2]. */ +#define JUMP_PC 2 +/* Dynamic PC, may lookup next TB. */ +#define DYNAMIC_PC_LOOKUP 3 + +#endif
target/sparc/cpu.c +24 -0
@@ -27,6 +27,7 @@#include "qapi/visitor.h" #include "tcg/tcg.h" #include "fpu/softfloat.h" +#include "target/sparc/translate.h" //#define DEBUG_FEATURES
@@ -751,6 +752,29 @@ void cpu_get_tb_cpu_state(CPUSPARCState *env, vaddr *pc, *pflags = flags; } +static void sparc_restore_state_to_opc (CPUState *cs, +const TranslationBlock *tb, +const uint64_t *data) +{ +CPUSPARCState *env =cpu_env (cs); +target_ulong pc = data[0 ]; +target_ulong npc = data[1 ]; + + env->pc = pc; +if (npc ==DYNAMIC_PC ) { +/* dynamic NPC: already stored */ + }else if (npc &JUMP_PC ) { +/* jump PC: use 'cond' and the jump targets of the translation */ +if (env->cond) { + env->npc = npc & ~3 ; + }else { + env->npc = pc +4 ; + } + }else { + env->npc = npc; + } +} +static bool sparc_cpu_has_work (CPUState *cs) { return (cs->interrupt_request & CPU_INTERRUPT_HARD) &&
target/sparc/translate.c +1 -30
@@ -30,6 +30,7 @@#include "exec/log.h" #include "fpu/softfloat.h" #include "asi.h" +#include "target/sparc/translate.h" #define HELPER_H "helper.h"#include "exec/helper-info.c.inc"
@@ -101,13 +102,6 @@# define MAXTL_MASK 0#endif -/* Dynamic PC, must exit to main loop. */ -#define DYNAMIC_PC 1 -/* Dynamic PC, one of two values according to jump_pc[T2]. */ -#define JUMP_PC 2 -/* Dynamic PC, may lookup next TB. */ -#define DYNAMIC_PC_LOOKUP 3 -#define DISAS_EXIT DISAS_TARGET_0/* global register indexes */
@@ -5881,26 +5875,3 @@ void sparc_tcg_init(void) gregnames[i]); } } - -void sparc_restore_state_to_opc (CPUState *cs, -const TranslationBlock *tb, -const uint64_t *data) -{ -CPUSPARCState *env =cpu_env (cs); -target_ulong pc = data[0 ]; -target_ulong npc = data[1 ]; - - env->pc = pc; -if (npc ==DYNAMIC_PC ) { -/* dynamic NPC: already stored */ - }else if (npc &JUMP_PC ) { -/* jump PC: use 'cond' and the jump targets of the translation */ -if (env->cond) { - env->npc = npc & ~3 ; - }else { - env->npc = pc +4 ; - } - }else { - env->npc = npc; - } -}
Signature · 1 line
2.47.1
[PULL 21/59] target/arm/cpu: Restrict cpu_untagged_addr() to user emulation
In reply to Philippe Mathieu-DaudéMove the #endif guard where it belongs to restrict the cpu_untagged_addr() implementation to user emulation.
Message-Id: <[email protected]>
--- target/arm/cpu.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
target/arm/cpu.h +3 -2
@@ -3355,8 +3355,8 @@ extern const uint64_t pred_esz_masks[5];#define TAG_GRANULE (1 << LOG2_TAG_GRANULE)#ifdef CONFIG_USER_ONLY +#define TARGET_PAGE_DATA_SIZE (TARGET_PAGE_SIZE >> (LOG2_TAG_GRANULE + 1)) -#endif #ifdef TARGET_TAGGED_ADDRESSES /**
@@ -3382,6 +3382,7 @@ static inline target_ulong cpu_untagged_addr(CPUState *cs, target_ulong x) }return x; } -#endif +#endif /* TARGET_TAGGED_ADDRESSES */ +#endif /* CONFIG_USER_ONLY */ #endif
Signature · 1 line
2.47.1
[PULL 16/59] exec/cpu-all: Include missing 'exec/cpu-defs.h' header
In reply to Philippe Mathieu-DaudéTARGET_PAGE_BITS is defined in each target "cpu-param.h", itself included by "exec/cpu-defs.h".
Include the latter in order to avoid when refactoring:
In file included from ../../system/watchpoint.c:23:
include/exec/cpu-all.h:356:19: error: use of undeclared identifier 'TARGET_PAGE_BITS'
356 | QEMU_BUILD_BUG_ON(TLB_FLAGS_MASK & TLB_SLOW_FLAGS_MASK);
| ^Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/exec/cpu-all.h +1 -1
@@ -136,7 +136,7 @@ static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val#endif /* page related stuff */ - +#include "exec/cpu-defs.h" #ifdef TARGET_PAGE_BITS_VARY # include "exec/page-vary.h" extern const TargetPageBits target_page;
Signature · 1 line
2.47.1
[PULL 56/59] system/numa: Remove unnecessary 'exec/cpu-common.h' header
In reply to Philippe Mathieu-DaudéNothing requires definitions from "exec/cpu-common.h", do not include this header.
Message-Id: <[email protected]>
--- include/system/numa.h | 1 - 1 file changed, 1 deletion(-)
include/system/numa.h +0 -1
@@ -3,7 +3,6 @@#include "qemu/bitmap.h" #include "qapi/qapi-types-machine.h" -#include "exec/cpu-common.h" struct CPUArchId ;
Signature · 1 line
2.47.1
[PULL 38/59] user: Move 'linux-user/cpu_loop-common.h' -> 'user/cpu_loop.h'
In reply to Philippe Mathieu-Daudé"linux-user/cpu_loop-common.h" is generic enough to be used by bsd-user, so rename it as "user/cpu_loop.h".
Mechanical change running:
$ sed -i -e 's,cpu_loop-common.h,user/cpu_loop.h,' \
$(git grep -l cpu_loop-common.h)Message-Id: <[email protected]>
--- linux-user/cpu_loop-common.h => include/user/cpu_loop.h | 4 ++-- linux-user/aarch64/cpu_loop.c | 2 +- linux-user/alpha/cpu_loop.c | 2 +- linux-user/arm/cpu_loop.c | 2 +- linux-user/hexagon/cpu_loop.c | 2 +- linux-user/hppa/cpu_loop.c | 2 +- linux-user/i386/cpu_loop.c | 2 +- linux-user/loongarch64/cpu_loop.c | 2 +- linux-user/m68k/cpu_loop.c | 2 +- linux-user/main.c | 2 +- linux-user/microblaze/cpu_loop.c | 2 +- linux-user/mips/cpu_loop.c | 2 +- linux-user/openrisc/cpu_loop.c | 2 +- linux-user/ppc/cpu_loop.c | 2 +- linux-user/riscv/cpu_loop.c | 2 +- linux-user/s390x/cpu_loop.c | 2 +- linux-user/sh4/cpu_loop.c | 2 +- linux-user/sparc/cpu_loop.c | 2 +- linux-user/syscall.c | 2 +- linux-user/xtensa/cpu_loop.c | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) rename linux-user/cpu_loop-common.h => include/user/cpu_loop.h (95%)
include/user/cpu_loop.h renamed from linux-user/cpu_loop-common.h +2 -2
@@ -17,8 +17,8 @@* along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef CPU_LOOP_COMMON_H -#define CPU_LOOP_COMMON_H +#ifndef USER_CPU_LOOP_H +#define USER_CPU_LOOP_H #include "exec/log.h" #include "special-errno.h"
linux-user/aarch64/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" #include "qemu/guest-random.h" #include "semihosting/common-semi.h"
linux-user/alpha/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" void cpu_loop (CPUAlphaState *env)
linux-user/arm/cpu_loop.c +1 -1
@@ -21,7 +21,7 @@#include "qemu.h" #include "user-internals.h" #include "elf.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" #include "semihosting/common-semi.h" #include "exec/page-protection.h"
linux-user/hexagon/cpu_loop.c +1 -1
@@ -21,7 +21,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" #include "internal.h"
linux-user/hppa/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" static abi_ulong hppa_lws (CPUHPPAState *env)
linux-user/i386/cpu_loop.c +1 -1
@@ -21,7 +21,7 @@#include "qemu.h" #include "qemu/timer.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" #include "user-mmap.h"
linux-user/loongarch64/cpu_loop.c +1 -1
@@ -8,7 +8,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" void cpu_loop (CPULoongArchState *env)
linux-user/m68k/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" void cpu_loop (CPUM68KState *env)
linux-user/main.c +1 -1
@@ -50,7 +50,7 @@#include "elf.h" #include "trace/control.h" #include "target_elf.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "crypto/init.h" #include "fd-trans.h" #include "signal-common.h"
linux-user/microblaze/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" void cpu_loop (CPUMBState *env)
linux-user/mips/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" #include "elf.h" #include "internal.h"
linux-user/openrisc/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" void cpu_loop (CPUOpenRISCState *env)
linux-user/ppc/cpu_loop.c +1 -1
@@ -21,7 +21,7 @@#include "qemu.h" #include "qemu/timer.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" static inline uint64_t cpu_ppc_get_tb (CPUPPCState *env)
linux-user/riscv/cpu_loop.c +1 -1
@@ -21,7 +21,7 @@#include "qemu/error-report.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" #include "elf.h" #include "semihosting/common-semi.h"
linux-user/s390x/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h"
linux-user/sh4/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" void cpu_loop (CPUSH4State *env)
linux-user/sparc/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" #define SPARC64_STACK_BIAS 2047
linux-user/syscall.c +1 -1
@@ -143,7 +143,7 @@#include "special-errno.h" #include "qapi/error.h" #include "fd-trans.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #ifndef CLONE_IO #define CLONE_IO 0x80000000/* Clone io context */
linux-user/xtensa/cpu_loop.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" -#include "cpu_loop-common.h" +#include "user/cpu_loop.h" #include "signal-common.h" static void xtensa_rfw (CPUXtensaState *env)
Signature · 1 line
2.47.1
[PULL 41/59] target/loongarch: Declare loongarch_cpu_dump_state() locally
In reply to Philippe Mathieu-Daudéloongarch_cpu_dump_state() is not used outside of cpu.c, no need to expose its prototype.
Message-Id: <[email protected]>
--- target/loongarch/internals.h | 2 -- target/loongarch/cpu.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
target/loongarch/internals.h +0 -2
@@ -18,8 +18,6 @@void loongarch_translate_init (void ); -void loongarch_cpu_dump_state (CPUState *cpu,FILE *f,int flags); - void G_NORETURN do_raise_exception(CPULoongArchState *env,uint32_t exception,uintptr_t pc);
target/loongarch/cpu.c +1 -1
@@ -742,7 +742,7 @@ static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model)return oc; } -void loongarch_cpu_dump_state (CPUState *cs,FILE *f,int flags) +static void loongarch_cpu_dump_state (CPUState *cs,FILE *f,int flags) {CPULoongArchState *env =cpu_env (cs);int i;
Signature · 1 line
2.47.1
[PULL 25/59] accel/tcg: Declare mmap_[un]lock() in 'exec/page-protection.h'
In reply to Philippe Mathieu-DaudéMove mmap_lock(), mmap_unlock() declarations and the WITH_MMAP_LOCK_GUARD() definition to 'exec/page-protection.h'.
Message-Id: <[email protected]>
--- include/exec/exec-all.h | 17 ----------------- include/exec/page-protection.h | 24 ++++++++++++++++++++++++ accel/tcg/cpu-exec.c | 1 + accel/tcg/translate-all.c | 1 + accel/tcg/watchpoint.c | 1 + linux-user/flatload.c | 1 + target/arm/helper.c | 1 + 7 files changed, 29 insertions(+), 17 deletions(-)
include/exec/exec-all.h +0 -17
@@ -27,7 +27,6 @@#endif #include "exec/mmu-access-type.h" #include "exec/translation-block.h" -#include "qemu/clang-tsa.h" /** * cpu_loop_exit_requested:
@@ -520,18 +519,6 @@ static inline tb_page_addr_t get_page_addr_code(CPUArchState *env, }#if defined(CONFIG_USER_ONLY ) -void TSA_NO_TSA mmap_lock(void); -void TSA_NO_TSA mmap_unlock(void); -bool have_mmap_lock (void ); - -static inline void mmap_unlock_guard (void *unused) -{ -mmap_unlock (); -} - -#define WITH_MMAP_LOCK_GUARD () \ - for (int _mmap_lock_iter __attribute__((cleanup(mmap_unlock_guard))) \ - = (mmap_lock(), 0); _mmap_lock_iter == 0; _mmap_lock_iter = 1)/** * adjust_signal_pc:
@@ -585,10 +572,6 @@ G_NORETURN void cpu_loop_exit_sigbus(CPUState *cpu, target_ulong addr, uintptr_t ra);#else -static inline void mmap_lock (void ) {} -static inline void mmap_unlock (void ) {} -#define WITH_MMAP_LOCK_GUARD () -void tlb_reset_dirty (CPUState *cpu,ram_addr_t start1,ram_addr_t length);void tlb_reset_dirty_range_all (ram_addr_t start,ram_addr_t length);
include/exec/page-protection.h +24 -0
@@ -38,4 +38,28 @@*/ #define PAGE_PASSTHROUGH 0x0800 +#ifdef CONFIG_USER_ONLY + +#include "qemu/clang-tsa.h" + +void TSA_NO_TSA mmap_lock(void); +void TSA_NO_TSA mmap_unlock(void); +bool have_mmap_lock (void ); + +static inline void mmap_unlock_guard (void *unused) +{ +mmap_unlock (); +} + +#define WITH_MMAP_LOCK_GUARD () \ + for (int _mmap_lock_iter __attribute__((cleanup(mmap_unlock_guard))) \ + = (mmap_lock(), 0); _mmap_lock_iter == 0; _mmap_lock_iter = 1) +#else + +static inline void mmap_lock (void ) {} +static inline void mmap_unlock (void ) {} +#define WITH_MMAP_LOCK_GUARD () + +#endif /* !CONFIG_USER_ONLY */ +#endif
accel/tcg/cpu-exec.c +1 -0
@@ -25,6 +25,7 @@#include "trace.h" #include "disas/disas.h" #include "exec/exec-all.h" +#include "exec/page-protection.h" #include "tcg/tcg.h" #include "qemu/atomic.h" #include "qemu/rcu.h"
accel/tcg/translate-all.c +1 -0
@@ -44,6 +44,7 @@#endif #include "exec/cputlb.h" +#include "exec/page-protection.h" #include "exec/translate-all.h" #include "exec/translator.h" #include "exec/tb-flush.h"
accel/tcg/watchpoint.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/error-report.h" #include "exec/exec-all.h" #include "exec/translate-all.h" +#include "exec/page-protection.h" #include "system/tcg.h" #include "system/replay.h" #include "hw/core/tcg-cpu-ops.h"
linux-user/flatload.c +1 -0
@@ -34,6 +34,7 @@#include "qemu/osdep.h" #include "qemu.h" +#include "exec/page-protection.h" #include "user-internals.h" #include "loader.h" #include "user-mmap.h"
target/arm/helper.c +1 -0
@@ -13,6 +13,7 @@#include "internals.h" #include "cpu-features.h" #include "exec/helper-proto.h" +#include "exec/page-protection.h" #include "qemu/main-loop.h" #include "qemu/timer.h" #include "qemu/bitops.h"
Signature · 1 line
2.47.1
[PULL 42/59] target/sparc: Uninline cpu_get_tb_cpu_state()
In reply to Philippe Mathieu-DaudéFrom: Anton Johansson <[email protected]>
Required to compile accel/tcg/translate-all.c once for softmmu targets. The function gets quite big for some targets so uninlining makes sense.
Message-Id: <[email protected]>
--- target/sparc/cpu.h | 39 ++------------------------------------- target/sparc/cpu.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 37 deletions(-)
target/sparc/cpu.h +2 -37
@@ -747,43 +747,8 @@ trap_state* cpu_tsptr(CPUSPARCState* env);#define TB_FLAG_FSR_QNE (1 << 8)#define TB_FLAG_ASI_SHIFT 24 -static inline void cpu_get_tb_cpu_state (CPUSPARCState *env,vaddr *pc, -uint64_t *cs_base,uint32_t *pflags) -{ -uint32_t flags; - *pc = env->pc; - *cs_base = env->npc; - flags =cpu_mmu_index (env_cpu (env), false); -#ifndef CONFIG_USER_ONLY -if (cpu_supervisor_mode (env)) { - flags |=TB_FLAG_SUPER ; - } -#endif -#ifdef TARGET_SPARC64 -#ifndef CONFIG_USER_ONLY -if (cpu_hypervisor_mode (env)) { - flags |=TB_FLAG_HYPER ; - } -#endif -if (env->pstate &PS_AM ) { - flags |=TB_FLAG_AM_ENABLED ; - } -if ((env->pstate &PS_PEF ) && (env->fprs &FPRS_FEF )) { - flags |=TB_FLAG_FPU_ENABLED ; - } - flags |= env->asi <<TB_FLAG_ASI_SHIFT ; -#else -if (env->psref) { - flags |=TB_FLAG_FPU_ENABLED ; - } -#ifndef CONFIG_USER_ONLY -if (env->fsr_qne) { - flags |=TB_FLAG_FSR_QNE ; - } -#endif /* !CONFIG_USER_ONLY */ -#endif /* TARGET_SPARC64 */ - *pflags = flags; -} +void cpu_get_tb_cpu_state (CPUSPARCState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *pflags);static inline bool tb_fpu_enabled (int tb_flags) {
target/sparc/cpu.c +38 -0
@@ -713,6 +713,44 @@ static void sparc_cpu_synchronize_from_tb(CPUState *cs, cpu->env.npc = tb->cs_base; } +void cpu_get_tb_cpu_state (CPUSPARCState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *pflags) +{ +uint32_t flags; + *pc = env->pc; + *cs_base = env->npc; + flags =cpu_mmu_index (env_cpu (env), false); +#ifndef CONFIG_USER_ONLY +if (cpu_supervisor_mode (env)) { + flags |=TB_FLAG_SUPER ; + } +#endif +#ifdef TARGET_SPARC64 +#ifndef CONFIG_USER_ONLY +if (cpu_hypervisor_mode (env)) { + flags |=TB_FLAG_HYPER ; + } +#endif +if (env->pstate &PS_AM ) { + flags |=TB_FLAG_AM_ENABLED ; + } +if ((env->pstate &PS_PEF ) && (env->fprs &FPRS_FEF )) { + flags |=TB_FLAG_FPU_ENABLED ; + } + flags |= env->asi <<TB_FLAG_ASI_SHIFT ; +#else +if (env->psref) { + flags |=TB_FLAG_FPU_ENABLED ; + } +#ifndef CONFIG_USER_ONLY +if (env->fsr_qne) { + flags |=TB_FLAG_FSR_QNE ; + } +#endif /* !CONFIG_USER_ONLY */ +#endif /* TARGET_SPARC64 */ + *pflags = flags; +} +static bool sparc_cpu_has_work (CPUState *cs) { return (cs->interrupt_request & CPU_INTERRUPT_HARD) &&
Signature · 1 line
2.47.1
[PULL 39/59] user: Declare cpu_loop() once in 'user/cpu_loop.h'
In reply to Philippe Mathieu-DaudéDeclare cpu_loop() once in "user/cpu_loop.h".
bsd-user gets the G_NORETURN attribute.
Message-Id: <[email protected]>
--- bsd-user/aarch64/target_arch_cpu.h | 2 +- bsd-user/arm/target_arch_cpu.h | 2 +- bsd-user/i386/target_arch_cpu.h | 2 +- bsd-user/qemu.h | 2 +- bsd-user/riscv/target_arch_cpu.h | 2 +- bsd-user/x86_64/target_arch_cpu.h | 2 +- include/user/cpu_loop.h | 2 ++ linux-user/user-internals.h | 1 - 8 files changed, 8 insertions(+), 7 deletions(-)
bsd-user/aarch64/target_arch_cpu.h +1 -1
@@ -43,7 +43,7 @@ static inline void target_cpu_init(CPUARMState *env, } -static inline void target_cpu_loop (CPUARMState *env) +static inline G_NORETURN void target_cpu_loop(CPUARMState *env) {CPUState *cs =env_cpu (env);int trapnr, ec, fsc, si_code, si_signo;
bsd-user/arm/target_arch_cpu.h +1 -1
@@ -37,7 +37,7 @@ static inline void target_cpu_init(CPUARMState *env, } } -static inline void target_cpu_loop (CPUARMState *env) +static inline G_NORETURN void target_cpu_loop(CPUARMState *env) {int trapnr, si_signo, si_code;CPUState *cs =env_cpu (env);
bsd-user/i386/target_arch_cpu.h +1 -1
@@ -102,7 +102,7 @@ static inline void target_cpu_init(CPUX86State *env, env->segs[R_FS ].selector =0 ; } -static inline void target_cpu_loop (CPUX86State *env) +static inline G_NORETURN void target_cpu_loop(CPUX86State *env) {CPUState *cs =env_cpu (env);int trapnr;
bsd-user/qemu.h +1 -1
@@ -26,6 +26,7 @@#include "exec/exec-all.h" #include "user/abitypes.h" +#include "user/cpu_loop.h" #include "user/page-protection.h" extern char **environ;
@@ -187,7 +188,6 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1, abi_long arg5, abi_long arg6); void gemu_log(const char *fmt, ...) G_GNUC_PRINTF(1, 2);extern __threadCPUState *thread_cpu; -void cpu_loop (CPUArchState *env);char *target_strerror (int err);int get_osversion (void );void fork_start (void );
bsd-user/riscv/target_arch_cpu.h +1 -1
@@ -37,7 +37,7 @@ static inline void target_cpu_init(CPURISCVState *env, env->pc = regs->sepc; } -static inline void target_cpu_loop (CPURISCVState *env) +static inline G_NORETURN void target_cpu_loop(CPURISCVState *env) {CPUState *cs =env_cpu (env);int trapnr;
bsd-user/x86_64/target_arch_cpu.h +1 -1
@@ -110,7 +110,7 @@ static inline void target_cpu_init(CPUX86State *env,cpu_x86_load_seg (env,R_GS ,0 ); } -static inline void target_cpu_loop (CPUX86State *env) +static inline G_NORETURN void target_cpu_loop(CPUX86State *env) {CPUState *cs =env_cpu (env);int trapnr;
include/user/cpu_loop.h +2 -0
@@ -23,6 +23,8 @@#include "exec/log.h" #include "special-errno.h" +G_NORETURN void cpu_loop(CPUArchState *env); +void target_exception_dump (CPUArchState *env,const char *fmt,int code);#define EXCP_DUMP (env, fmt, code) \ target_exception_dump(env, fmt, code)
linux-user/user-internals.h +0 -1
@@ -65,7 +65,6 @@ abi_long do_syscall(CPUArchState *cpu_env, int num, abi_long arg1, abi_long arg5, abi_long arg6, abi_long arg7, abi_long arg8);extern __threadCPUState *thread_cpu; -G_NORETURN void cpu_loop(CPUArchState *env);abi_long get_errno (abi_long ret);const char *target_strerror (int err);int get_osversion (void );
Signature · 1 line
2.47.1
[PULL 58/59] meson: Do not define CONFIG_DEVICES on user emulation
In reply to Philippe Mathieu-DaudéCONFIG_DEVICES is not generated on user emulation, so do not define it.
Message-Id: <[email protected]>
--- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meson.build +2 -1
@@ -4110,7 +4110,7 @@ foreach target : target_dirs arch_deps = [] c_args = ['-DCOMPILING_PER_TARGET', '-DCONFIG_TARGET="@[email protected]"'.format(target), - '-DCONFIG_DEVICES="@[email protected]"'.format(target)] + ] link_args = emulator_link_args target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])]
@@ -4130,6 +4130,7 @@ foreach target : target_dirs arch_deps += hw.dependencies() endif + c_args += ['-DCONFIG_DEVICES="@[email protected]"'.format(target)] arch_srcs += config_devices_h[target] link_args += ['@block.syms', '@qemu.syms'] else
Signature · 1 line
2.47.1
[PULL 20/59] user: Introduce 'user/guest-host.h' header
In reply to Philippe Mathieu-DaudéExtract all declarations related to 'guest from/to host' address translation to a new "user/guest-host.h" header.
Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 34 +-------------- include/exec/cpu_ldst.h | 47 +-------------------- include/user/guest-host.h | 87 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 79 deletions(-) create mode 100644 include/user/guest-host.h
include/exec/cpu-all.h +1 -33
@@ -64,39 +64,7 @@/* MMU memory access macros */ -#if defined(CONFIG_USER_ONLY ) -#include "user/abitypes.h" - -/* -* If non-zero, the guest virtual address space is a contiguous subset -* of the host virtual address space, i.e. '-R reserved_va' is in effect -* either from the command-line or by default. The value is the last -* byte of the guest address space e.g. UINT32_MAX. -* -* If zero, the host and guest virtual address spaces are intermingled. -*/ -extern unsigned long reserved_va; - -/* -* Limit the guest addresses as best we can. -* -* When not using -R reserved_va, we cannot really limit the guest -* to less address space than the host. For 32-bit guests, this -* acts as a sanity check that we're not giving the guest an address -* that it cannot even represent. For 64-bit guests... the address -* might not be what the real kernel would give, but it is at least -* representable in the guest. -* -* TODO: Improve address allocation to avoid this problem, and to -* avoid setting bits at the top of guest addresses that might need -* to be used for tags. -*/ -#define GUEST_ADDR_MAX_ \ - ((MIN_CONST(TARGET_VIRT_ADDR_SPACE_BITS, TARGET_ABI_BITS) <= 32) ? \ - UINT32_MAX : ~0ul) -#define GUEST_ADDR_MAX (reserved_va ? : GUEST_ADDR_MAX_) - -#else +#if !defined(CONFIG_USER_ONLY )#include "exec/hwaddr.h"
include/exec/cpu_ldst.h +1 -46
53 lines not on this page · raw message
include/user/guest-host.h new file +87 -0
87 lines not on this page · raw message
Signature · 1 line
2.47.1
[PULL 49/59] accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h'
In reply to Philippe Mathieu-DaudéThe TranslationBlock flags are defined in 'exec/translation-block.h'. tcg_cflags_has/set() use them, it is more logical to declare them in the same place. Move them there too.
Message-Id: <[email protected]>
--- include/exec/cpu-common.h | 3 --- include/exec/translation-block.h | 3 +++ accel/tcg/cpu-exec.c | 1 + accel/tcg/tcg-accel-ops.c | 1 + accel/tcg/watchpoint.c | 1 + linux-user/mmap.c | 1 + linux-user/syscall.c | 1 + target/arm/cpu.c | 1 + target/avr/cpu.c | 1 + target/hexagon/cpu.c | 1 + target/hppa/cpu.c | 1 + target/i386/cpu.c | 1 + target/i386/helper.c | 1 + target/loongarch/cpu.c | 1 + target/microblaze/cpu.c | 1 + target/mips/tcg/exception.c | 1 + target/mips/tcg/system/special_helper.c | 1 + target/openrisc/cpu.c | 1 + target/riscv/tcg/tcg-cpu.c | 1 + target/rx/cpu.c | 1 + target/sh4/cpu.c | 1 + target/sparc/cpu.c | 1 + target/tricore/cpu.c | 1 + 23 files changed, 24 insertions(+), 3 deletions(-)
include/exec/cpu-common.h +0 -3
@@ -188,9 +188,6 @@ void list_cpus(void);#ifdef CONFIG_TCG #include "qemu/atomic.h" -bool tcg_cflags_has (CPUState *cpu,uint32_t flags); -void tcg_cflags_set (CPUState *cpu,uint32_t flags); -/** * cpu_unwind_state_data: * @cpu: the cpu context
include/exec/translation-block.h +3 -0
@@ -154,4 +154,7 @@ static inline uint32_t tb_cflags(const TranslationBlock *tb) return qatomic_read(&tb->cflags); } +bool tcg_cflags_has (CPUState *cpu,uint32_t flags); +void tcg_cflags_set (CPUState *cpu,uint32_t flags); +#endif /* EXEC_TRANSLATION_BLOCK_H */
accel/tcg/cpu-exec.c +1 -0
@@ -27,6 +27,7 @@#include "disas/disas.h" #include "exec/cpu-common.h" #include "exec/page-protection.h" +#include "exec/translation-block.h" #include "tcg/tcg.h" #include "qemu/atomic.h" #include "qemu/rcu.h"
accel/tcg/tcg-accel-ops.c +1 -0
@@ -35,6 +35,7 @@#include "exec/exec-all.h" #include "exec/hwaddr.h" #include "exec/tb-flush.h" +#include "exec/translation-block.h" #include "gdbstub/enums.h" #include "hw/core/cpu.h"
accel/tcg/watchpoint.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/error-report.h" #include "exec/exec-all.h" #include "exec/page-protection.h" +#include "exec/translation-block.h" #include "tb-internal.h" #include "system/tcg.h" #include "system/replay.h"
linux-user/mmap.c +1 -0
@@ -21,6 +21,7 @@#include "trace.h" #include "exec/log.h" #include "exec/page-protection.h" +#include "exec/translation-block.h" #include "qemu.h" #include "user/page-protection.h" #include "user-internals.h"
linux-user/syscall.c +1 -0
@@ -26,6 +26,7 @@#include "tcg/startup.h" #include "target_mman.h" #include "exec/page-protection.h" +#include "exec/translation-block.h" #include <elf.h> #include <endian.h> #include <grp.h>
target/arm/cpu.c +1 -0
@@ -28,6 +28,7 @@#include "qapi/error.h" #include "cpu.h" #ifdef CONFIG_TCG +#include "exec/translation-block.h" #include "hw/core/tcg-cpu-ops.h" #endif /* CONFIG_TCG */ #include "internals.h"
target/avr/cpu.c +1 -0
@@ -22,6 +22,7 @@#include "qapi/error.h" #include "qemu/qemu-print.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "cpu.h" #include "disas/dis-asm.h" #include "tcg/debug-assert.h"
target/hexagon/cpu.c +1 -0
@@ -20,6 +20,7 @@#include "cpu.h" #include "internal.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "qapi/error.h" #include "hw/qdev-properties.h" #include "fpu/softfloat-helpers.h"
target/hppa/cpu.c +1 -0
@@ -25,6 +25,7 @@#include "cpu.h" #include "qemu/module.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "fpu/softfloat.h" #include "tcg/tcg.h"
target/i386/cpu.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/hw-version.h" #include "cpu.h" #include "tcg/helper-tcg.h" +#include "exec/translation-block.h" #include "system/hvf.h" #include "hvf/hvf-i386.h" #include "kvm/kvm_i386.h"
target/i386/helper.c +1 -0
@@ -21,6 +21,7 @@#include "qapi/qapi-events-run-state.h" #include "cpu.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "system/runstate.h" #ifndef CONFIG_USER_ONLY #include "system/hw_accel.h"
target/loongarch/cpu.c +1 -0
@@ -15,6 +15,7 @@#include "system/kvm.h" #include "kvm/kvm_loongarch.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "cpu.h" #include "internals.h" #include "fpu/softfloat-helpers.h"
target/microblaze/cpu.c +1 -0
@@ -30,6 +30,7 @@#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "exec/gdbstub.h" +#include "exec/translation-block.h" #include "fpu/softfloat-helpers.h" #include "tcg/tcg.h"
target/mips/tcg/exception.c +1 -0
@@ -24,6 +24,7 @@#include "internal.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" target_ulong exception_resume_pc (CPUMIPSState *env) {
target/mips/tcg/system/special_helper.c +1 -0
@@ -23,6 +23,7 @@#include "cpu.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "internal.h" /* Specials */
target/openrisc/cpu.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/qemu-print.h" #include "cpu.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "fpu/softfloat-helpers.h" #include "tcg/tcg.h"
target/riscv/tcg/tcg-cpu.c +1 -0
@@ -19,6 +19,7 @@#include "qemu/osdep.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "tcg-cpu.h" #include "cpu.h" #include "internals.h"
target/rx/cpu.c +1 -0
@@ -23,6 +23,7 @@#include "migration/vmstate.h" #include "exec/exec-all.h" #include "exec/page-protection.h" +#include "exec/translation-block.h" #include "hw/loader.h" #include "fpu/softfloat.h" #include "tcg/debug-assert.h"
target/sh4/cpu.c +1 -0
@@ -25,6 +25,7 @@#include "cpu.h" #include "migration/vmstate.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "fpu/softfloat-helpers.h" #include "tcg/tcg.h"
target/sparc/cpu.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/module.h" #include "qemu/qemu-print.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "hw/qdev-properties.h" #include "qapi/visitor.h" #include "tcg/tcg.h"
target/tricore/cpu.c +1 -0
@@ -21,6 +21,7 @@#include "qapi/error.h" #include "cpu.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "qemu/error-report.h" #include "tcg/debug-assert.h"
Signature · 1 line
2.47.1
[PULL 17/59] exec/cpu-defs: Remove unnecessary headers
In reply to Philippe Mathieu-Daudé"exec/cpu-defs.h" should be kept as minimal as possible; besides these includes don't seem necessary. Remove them.
Message-Id: <[email protected]>
--- include/exec/cpu-defs.h | 8 -------- 1 file changed, 8 deletions(-)
include/exec/cpu-defs.h +0 -8
@@ -23,14 +23,6 @@#error cpu.h included from common code#endif -#include "qemu/host-utils.h" -#include "qemu/thread.h" -#ifndef CONFIG_USER_ONLY -#include "exec/hwaddr.h" -#endif -#include "exec/memattrs.h" -#include "hw/core/cpu.h" -#include "cpu-param.h" #ifndef TARGET_LONG_BITS
Signature · 1 line
2.47.1
[PULL 48/59] accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'
In reply to Philippe Mathieu-Daudécurr_cflags() is only used within accel/tcg/, move its declaration to accel/tcg/internal-common.h.
Message-Id: <[email protected]>
--- accel/tcg/internal-common.h | 3 +++ include/exec/cpu-common.h | 3 --- accel/tcg/watchpoint.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-)
accel/tcg/internal-common.h +3 -0
@@ -56,4 +56,7 @@ void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb,bool tcg_exec_realizefn (CPUState *cpu,Error **errp);void tcg_exec_unrealizefn (CPUState *cpu); +/* current cflags for hashing/comparison */ +uint32_t curr_cflags (CPUState *cpu); +#endif
include/exec/cpu-common.h +0 -3
@@ -191,9 +191,6 @@ void list_cpus(void);bool tcg_cflags_has (CPUState *cpu,uint32_t flags);void tcg_cflags_set (CPUState *cpu,uint32_t flags); -/* current cflags for hashing/comparison */ -uint32_t curr_cflags (CPUState *cpu); -/** * cpu_unwind_state_data: * @cpu: the cpu context
accel/tcg/watchpoint.c +1 -0
@@ -27,6 +27,7 @@#include "system/replay.h" #include "hw/core/tcg-cpu-ops.h" #include "hw/core/cpu.h" +#include "internal-common.h" /* * Return true if this watchpoint address matches the specified
Signature · 1 line
2.47.1
[PULL 27/59] accel/tcg: Move page_[un]protect() to 'user/page-protection.h'
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- accel/tcg/internal-target.h | 1 + include/exec/translate-all.h | 5 ----- include/user/page-protection.h | 20 ++++++++++++++++++++ accel/tcg/user-exec.c | 2 +- linux-user/elfload.c | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 include/user/page-protection.h
accel/tcg/internal-target.h +1 -0
@@ -37,6 +37,7 @@ void page_table_config_init(void);#endif #ifdef CONFIG_USER_ONLY +#include "user/page-protection.h" /* * For user-only, page_protect sets the page read-only. * Since most execution is already on read-only pages, and we'd need to
include/exec/translate-all.h +0 -5
@@ -25,9 +25,4 @@/* translate-all.c */ void tb_check_watchpoint (CPUState *cpu,uintptr_t retaddr); -#ifdef CONFIG_USER_ONLY -void page_protect (tb_page_addr_t page_addr); -int page_unprotect (tb_page_addr_t address,uintptr_t pc); -#endif -#endif /* TRANSLATE_ALL_H */
include/user/page-protection.h new file +20 -0
@@ -0,0 +1,20 @@ +/* +* QEMU page protection declarations. +* +* Copyright (c) 2003 Fabrice Bellard +* +* SPDX-License-Identifier: LGPL-2.1+ +*/ +#ifndef USER_PAGE_PROTECTION_H +#define USER_PAGE_PROTECTION_H + +#ifndef CONFIG_USER_ONLY +#error Cannot include this header from system emulation +#endif + +#include "exec/translation-block.h" + +void page_protect (tb_page_addr_t page_addr); +int page_unprotect (tb_page_addr_t address,uintptr_t pc); + +#endif
accel/tcg/user-exec.c +1 -1
@@ -25,7 +25,7 @@#include "qemu/rcu.h" #include "exec/cpu_ldst.h" #include "qemu/main-loop.h" -#include "exec/translate-all.h" +#include "user/page-protection.h" #include "exec/page-protection.h" #include "exec/helper-proto.h" #include "qemu/atomic128.h"
linux-user/elfload.c +1 -1
@@ -8,6 +8,7 @@#include "qemu.h" #include "user/tswap-target.h" +#include "user/page-protection.h" #include "exec/page-protection.h" #include "user/guest-base.h" #include "user-internals.h"
@@ -3918,7 +3919,6 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) }#ifdef USE_ELF_CORE_DUMP -#include "exec/translate-all.h" /* * Definitions to generate Intel SVR4-like core files.
Signature · 1 line
2.47.1
[PULL 35/59] accel/tcg: Move user-related declarations out of 'exec/cpu-all.h' (3/4)
In reply to Philippe Mathieu-DaudéMove declarations related to page protection under user emulation from "exec/cpu-all.h" to "user/page-protection.h".
Message-Id: <[email protected]>
--- bsd-user/qemu.h | 1 + include/exec/cpu-all.h | 12 ------------ include/user/page-protection.h | 12 ++++++++++++ linux-user/qemu.h | 1 + target/arm/tcg/sve_helper.c | 3 +++ target/hppa/op_helper.c | 3 +++ target/sparc/ldst_helper.c | 3 +++ 7 files changed, 23 insertions(+), 12 deletions(-)
bsd-user/qemu.h +1 -0
@@ -26,6 +26,7 @@#include "exec/exec-all.h" #include "user/abitypes.h" +#include "user/page-protection.h" extern char **environ;
include/exec/cpu-all.h +0 -12
@@ -130,18 +130,6 @@ extern const TargetPageBits target_page;int page_get_flags (target_ulong address); -/** -* page_check_range -* @start: first byte of range -* @len: length of range -* @flags: flags required for each page -* -* Return true if every page in [@start, @start+@len) has @flags set. -* Return false if any page is unmapped. Thus testing flags == 0 is -* equivalent to testing for flags == PAGE_VALID. -*/ -bool page_check_range (target_ulong start,target_ulong last,int flags); -#endif CPUArchState *cpu_copy (CPUArchState *env);
include/user/page-protection.h +12 -0
@@ -34,6 +34,18 @@ void page_set_flags(target_ulong start, target_ulong last, int flags);void page_reset_target_data (target_ulong start,target_ulong last); +/** +* page_check_range +* @start: first byte of range +* @len: length of range +* @flags: flags required for each page +* +* Return true if every page in [@start, @start+@len) has @flags set. +* Return false if any page is unmapped. Thus testing flags == 0 is +* equivalent to testing for flags == PAGE_VALID. +*/ +bool page_check_range (target_ulong start,target_ulong last,int flags); +/** * page_check_range_empty: * @start: first byte of range
linux-user/qemu.h +1 -0
@@ -5,6 +5,7 @@#include "exec/cpu_ldst.h" #include "user/abitypes.h" +#include "user/page-protection.h" #include "syscall_defs.h" #include "target_syscall.h"
target/arm/tcg/sve_helper.c +3 -0
@@ -29,6 +29,9 @@#include "vec_internal.h" #include "sve_ldst_internal.h" #include "hw/core/tcg-cpu-ops.h" +#ifdef CONFIG_USER_ONLY +#include "user/page-protection.h" +#endif /* Return a value for NZCV as per the ARM PredTest pseudofunction.
target/hppa/op_helper.c +3 -0
@@ -25,6 +25,9 @@#include "exec/cpu_ldst.h" #include "qemu/timer.h" #include "trace.h" +#ifdef CONFIG_USER_ONLY +#include "user/page-protection.h" +#endif G_NORETURN void HELPER(excp)(CPUHPPAState *env, int excp) {
target/sparc/ldst_helper.c +3 -0
@@ -26,6 +26,9 @@#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/cpu_ldst.h" +#ifdef CONFIG_USER_ONLY +#include "user/page-protection.h" +#endif #include "asi.h" //#define DEBUG_MMU
Signature · 1 line
2.47.1
[PULL 24/59] include: Include missing 'qemu/clang-tsa.h' header
In reply to Philippe Mathieu-DaudéThe next commit will remove "qemu/clang-tsa.h" of "exec/exec-all.h", however the following files indirectly include it:
$ git grep -L qemu/clang-tsa.h $(git grep -wl TSA_NO_TSA) block/create.c include/block/block_int-common.h tests/unit/test-bdrv-drain.c tests/unit/test-block-iothread.c util/qemu-thread-posix.c
Explicitly include it so we can process with the removal in the next commit.
Message-Id: <[email protected]>
--- include/block/block_int-common.h | 1 + block/create.c | 1 + tests/unit/test-bdrv-drain.c | 1 + tests/unit/test-block-iothread.c | 1 + util/qemu-thread-posix.c | 1 + 5 files changed, 5 insertions(+)
include/block/block_int-common.h +1 -0
@@ -28,6 +28,7 @@#include "block/block-common.h" #include "block/block-global-state.h" #include "block/snapshot.h" +#include "qemu/clang-tsa.h" #include "qemu/iov.h" #include "qemu/rcu.h" #include "qemu/stats64.h"
block/create.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "block/block_int.h" +#include "qemu/clang-tsa.h" #include "qemu/job.h" #include "qemu/main-loop.h" #include "qapi/qapi-commands-block-core.h"
tests/unit/test-bdrv-drain.c +1 -0
@@ -28,6 +28,7 @@#include "system/block-backend.h" #include "qapi/error.h" #include "qemu/main-loop.h" +#include "qemu/clang-tsa.h" #include "iothread.h" static QemuEvent done_event;
tests/unit/test-block-iothread.c +1 -0
@@ -29,6 +29,7 @@#include "system/block-backend.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" +#include "qemu/clang-tsa.h" #include "qemu/main-loop.h" #include "iothread.h"
util/qemu-thread-posix.c +1 -0
@@ -17,6 +17,7 @@#include "qemu-thread-common.h" #include "qemu/tsan.h" #include "qemu/bitmap.h" +#include "qemu/clang-tsa.h" #ifdef CONFIG_PTHREAD_SET_NAME_NP #include <pthread_np.h>
Signature · 1 line
2.47.1
[PULL 33/59] accel/tcg: Move user-related declarations out of 'exec/cpu-all.h' (1/4)
In reply to Philippe Mathieu-DaudéMove declarations related to page protection under user emulation from "exec/cpu-all.h" to "user/page-protection.h".
Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 5 ----- include/user/page-protection.h | 8 ++++++++ bsd-user/main.c | 1 + bsd-user/mmap.c | 1 + linux-user/main.c | 1 + linux-user/mmap.c | 1 + linux-user/syscall.c | 1 + 7 files changed, 13 insertions(+), 5 deletions(-)
include/exec/cpu-all.h +0 -5
@@ -127,11 +127,6 @@ extern const TargetPageBits target_page;#define TARGET_PAGE_ALIGN (addr) ROUND_UP((addr), TARGET_PAGE_SIZE)#if defined(CONFIG_USER_ONLY ) -void page_dump (FILE *f); - -typedef int (*walk_memory_regions_fn )(void *,target_ulong , -target_ulong ,unsigned long ); -int walk_memory_regions (void *,walk_memory_regions_fn );int page_get_flags (target_ulong address);
include/user/page-protection.h +8 -0
@@ -12,9 +12,17 @@#error Cannot include this header from system emulation#endif +#include "cpu-param.h" +#include "exec/target_long.h" #include "exec/translation-block.h" void page_protect (tb_page_addr_t page_addr);int page_unprotect (tb_page_addr_t address,uintptr_t pc); +typedef int (*walk_memory_regions_fn )(void *,target_ulong , +target_ulong ,unsigned long ); + +int walk_memory_regions (void *,walk_memory_regions_fn ); + +void page_dump (FILE *f);#endif
bsd-user/main.c +1 -0
@@ -38,6 +38,7 @@#include "qemu/plugin.h" #include "exec/exec-all.h" #include "user/guest-base.h" +#include "user/page-protection.h" #include "tcg/startup.h" #include "qemu/timer.h" #include "qemu/envlist.h"
bsd-user/mmap.c +1 -0
@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" #include "exec/page-protection.h" +#include "user/page-protection.h" #include "qemu.h"
linux-user/main.c +1 -0
@@ -39,6 +39,7 @@#include "qemu/module.h" #include "qemu/plugin.h" #include "user/guest-base.h" +#include "user/page-protection.h" #include "exec/exec-all.h" #include "exec/gdbstub.h" #include "gdbstub/user.h"
linux-user/mmap.c +1 -0
@@ -22,6 +22,7 @@#include "exec/log.h" #include "exec/page-protection.h" #include "qemu.h" +#include "user/page-protection.h" #include "user-internals.h" #include "user-mmap.h" #include "target_mman.h"
linux-user/syscall.c +1 -0
@@ -135,6 +135,7 @@#include "signal-common.h" #include "loader.h" #include "user-mmap.h" +#include "user/page-protection.h" #include "user/safe-syscall.h" #include "qemu/guest-random.h" #include "qemu/selfmap.h"
Signature · 1 line
2.47.1
[PULL 36/59] accel/tcg: Move user-related declarations out of 'exec/cpu-all.h' (4/4)
In reply to Philippe Mathieu-DaudéMove declarations related to page protection under user emulation from "exec/cpu-all.h" to "user/page-protection.h".
Message-Id: <[email protected]>
--- include/exec/cpu-all.h | 6 ------ include/user/page-protection.h | 2 ++ accel/tcg/tb-maint.c | 3 +++ bsd-user/signal.c | 1 + cpu-target.c | 1 + linux-user/arm/cpu_loop.c | 1 + linux-user/signal.c | 1 + target/arm/tcg/helper-a64.c | 3 +++ target/s390x/tcg/mem_helper.c | 4 +++- 9 files changed, 15 insertions(+), 7 deletions(-)
include/exec/cpu-all.h +0 -6
@@ -126,12 +126,6 @@ extern const TargetPageBits target_page;#define TARGET_PAGE_ALIGN (addr) ROUND_UP((addr), TARGET_PAGE_SIZE) -#if defined(CONFIG_USER_ONLY ) - -int page_get_flags (target_ulong address); - -#endif -CPUArchState *cpu_copy (CPUArchState *env);/* Flags for use in ENV->INTERRUPT_PENDING.
include/user/page-protection.h +2 -0
@@ -19,6 +19,8 @@void page_protect (tb_page_addr_t page_addr);int page_unprotect (tb_page_addr_t address,uintptr_t pc); +int page_get_flags (target_ulong address); +/** * page_set_flags: * @start: first byte of range
accel/tcg/tb-maint.c +3 -0
@@ -33,6 +33,9 @@#include "tb-internal.h" #include "internal-common.h" #include "internal-target.h" +#ifdef CONFIG_USER_ONLY +#include "user/page-protection.h" +#endif /* List iterators for lists of tagged pointers in TranslationBlock. */
bsd-user/signal.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/log.h" #include "qemu.h" #include "exec/page-protection.h" +#include "user/page-protection.h" #include "user/tswap-target.h" #include "gdbstub/user.h" #include "signal-common.h"
cpu-target.c +1 -0
@@ -29,6 +29,7 @@#include "migration/vmstate.h" #ifdef CONFIG_USER_ONLY #include "qemu.h" +#include "user/page-protection.h" #else #include "hw/core/sysemu-cpu-ops.h" #include "exec/address-spaces.h"
linux-user/arm/cpu_loop.c +1 -0
@@ -25,6 +25,7 @@#include "signal-common.h" #include "semihosting/common-semi.h" #include "exec/page-protection.h" +#include "user/page-protection.h" #include "target/arm/syndrome.h" #define get_user_code_u32 (x, gaddr, env) \
linux-user/signal.c +1 -0
@@ -33,6 +33,7 @@#include "trace.h" #include "signal-common.h" #include "host-signal.h" +#include "user/page-protection.h" #include "user/safe-syscall.h" #include "tcg/tcg.h"
target/arm/tcg/helper-a64.c +3 -0
@@ -34,6 +34,9 @@#include "qemu/atomic128.h" #include "fpu/softfloat.h" #include <zlib.h> /* for crc32 */ +#ifdef CONFIG_USER_ONLY +#include "user/page-protection.h" +#endif /* C2.4.7 Multiply and divide */ /* special cases for 0 and LLONG_MIN are mandated by the standard */
target/s390x/tcg/mem_helper.c +3 -1
@@ -31,7 +31,9 @@#include "qemu/int128.h" #include "qemu/atomic128.h" -#if !defined(CONFIG_USER_ONLY ) +#if defined(CONFIG_USER_ONLY ) +#include "user/page-protection.h" +#else #include "hw/s390x/storage-keys.h" #include "hw/boards.h" #endif
Signature · 1 line
2.47.1
[PULL 50/59] accel/tcg: Include missing 'exec/translation-block.h' header
In reply to Philippe Mathieu-DaudéTB compile flags, tb_page_addr_t type, tb_cflags() and few other methods are defined in "exec/translation-block.h".
All these files don't include "exec/translation-block.h" but include "exec/exec-all.h" which include it. Explicitly include "exec/translation-block.h" to be able to remove it from "exec/exec-all.h" later when it won't be necessary. Otherwise we'd get errors such:
accel/tcg/internal-target.h:59:20: error: a parameter list without types is only allowed in a function definition
59 | void tb_lock_page0(tb_page_addr_t);
| ^
accel/tcg/tb-hash.h:64:23: error: unknown type name 'tb_page_addr_t'
64 | uint32_t tb_hash_func(tb_page_addr_t phys_pc, vaddr pc,
| ^
accel/tcg/tcg-accel-ops.c:62:36: error: use of undeclared identifier 'CF_CLUSTER_SHIFT'
62 | cflags = cpu->cluster_index << CF_CLUSTER_SHIFT;
| ^
accel/tcg/watchpoint.c:102:47: error: use of undeclared identifier 'CF_NOIRQ'
102 | cpu->cflags_next_tb = 1 | CF_NOIRQ | curr_cflags(cpu);
| ^
target/i386/helper.c:536:28: error: use of undeclared identifier 'CF_PCREL'
536 | if (tcg_cflags_has(cs, CF_PCREL)) {
| ^
target/rx/cpu.c:51:21: error: incomplete definition of type 'struct TranslationBlock'
51 | cpu->env.pc = tb->pc;
| ~~^
system/physmem.c:2977:9: error: call to undeclared function 'tb_invalidate_phys_range'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
2977 | tb_invalidate_phys_range(addr, addr + length - 1);
| ^
plugins/api.c:96:12: error: call to undeclared function 'tb_cflags'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
96 | return tb_cflags(tcg_ctx->gen_tb) & CF_MEMI_ONLY;
| ^Message-Id: <[email protected]>
--- accel/tcg/internal-target.h | 1 + accel/tcg/tb-hash.h | 1 + target/arm/tcg/translate.h | 1 + cpu-target.c | 1 + linux-user/elfload.c | 1 + plugins/api.c | 1 + system/physmem.c | 1 + target/alpha/cpu.c | 1 + target/alpha/translate.c | 1 + target/arm/helper.c | 1 + target/avr/translate.c | 1 + target/hppa/translate.c | 1 + target/i386/tcg/tcg-cpu.c | 1 + target/i386/tcg/translate.c | 1 + target/m68k/translate.c | 1 + target/microblaze/translate.c | 1 + target/openrisc/translate.c | 1 + target/ppc/translate.c | 1 + target/riscv/translate.c | 1 + target/rx/translate.c | 1 + target/s390x/tcg/translate.c | 1 + target/sh4/translate.c | 1 + target/sparc/translate.c | 1 + target/tricore/translate.c | 1 + target/xtensa/translate.c | 1 + 25 files changed, 25 insertions(+)
accel/tcg/internal-target.h +1 -0
@@ -10,6 +10,7 @@#define ACCEL_TCG_INTERNAL_TARGET_H #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "tb-internal.h" /*
accel/tcg/tb-hash.h +1 -0
@@ -22,6 +22,7 @@#include "exec/cpu-defs.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "qemu/xxhash.h" #include "tb-jmp-cache.h"
target/arm/tcg/translate.h +1 -0
@@ -6,6 +6,7 @@#include "tcg/tcg-op-gvec.h" #include "exec/exec-all.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/helper-gen.h" #include "internals.h" #include "cpu-features.h"
cpu-target.c +1 -0
@@ -42,6 +42,7 @@#include "exec/cpu-common.h" #include "exec/exec-all.h" #include "exec/tb-flush.h" +#include "exec/translation-block.h" #include "exec/log.h" #include "hw/core/accel-cpu.h" #include "trace/trace-root.h"
linux-user/elfload.c +1 -0
@@ -10,6 +10,7 @@#include "user/tswap-target.h" #include "user/page-protection.h" #include "exec/page-protection.h" +#include "exec/translation-block.h" #include "user/guest-base.h" #include "user-internals.h" #include "signal-common.h"
plugins/api.c +1 -0
@@ -43,6 +43,7 @@#include "tcg/tcg.h" #include "exec/exec-all.h" #include "exec/gdbstub.h" +#include "exec/translation-block.h" #include "exec/translator.h" #include "disas/disas.h" #include "plugin.h"
system/physmem.c +1 -0
@@ -34,6 +34,7 @@#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" +#include "exec/translation-block.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "hw/boards.h"
target/alpha/cpu.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/qemu-print.h" #include "cpu.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "fpu/softfloat.h"
target/alpha/translate.c +1 -0
@@ -26,6 +26,7 @@#include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/log.h" #define HELPER_H "helper.h"
target/arm/helper.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/crc32c.h" #include "qemu/qemu-print.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include <zlib.h> /* for crc32 */ #include "hw/irq.h" #include "system/cpu-timers.h"
target/avr/translate.c +1 -0
@@ -23,6 +23,7 @@#include "tcg/tcg.h" #include "cpu.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "tcg/tcg-op.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h"
target/hppa/translate.c +1 -0
@@ -27,6 +27,7 @@#include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/log.h" #define HELPER_H "helper.h"
target/i386/tcg/tcg-cpu.c +1 -0
@@ -22,6 +22,7 @@#include "helper-tcg.h" #include "qemu/accel.h" #include "hw/core/accel-cpu.h" +#include "exec/translation-block.h" #include "tcg-cpu.h"
target/i386/tcg/translate.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/host-utils.h" #include "cpu.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" #include "exec/translator.h"
target/m68k/translate.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" +#include "exec/translation-block.h" #include "tcg/tcg-op.h" #include "qemu/log.h" #include "qemu/qemu-print.h"
target/microblaze/translate.c +1 -0
@@ -26,6 +26,7 @@#include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "qemu/qemu-print.h" #include "exec/log.h"
target/openrisc/translate.c +1 -0
@@ -26,6 +26,7 @@#include "qemu/bitops.h" #include "qemu/qemu-print.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h"
target/ppc/translate.c +1 -0
@@ -30,6 +30,7 @@#include "exec/helper-gen.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/log.h" #include "qemu/atomic128.h" #include "spr_common.h"
target/riscv/translate.c +1 -0
@@ -25,6 +25,7 @@#include "exec/helper-gen.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/log.h" #include "semihosting/semihost.h"
target/rx/translate.c +1 -0
@@ -25,6 +25,7 @@#include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/log.h" #define HELPER_H "helper.h"
target/s390x/tcg/translate.c +1 -0
@@ -40,6 +40,7 @@#include "exec/helper-gen.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/log.h" #include "qemu/atomic128.h"
target/sh4/translate.c +1 -0
@@ -23,6 +23,7 @@#include "tcg/tcg-op.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" +#include "exec/translation-block.h" #include "exec/translator.h" #include "exec/log.h" #include "qemu/qemu-print.h"
target/sparc/translate.c +1 -0
@@ -27,6 +27,7 @@#include "tcg/tcg-op-gvec.h" #include "exec/helper-gen.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/log.h" #include "fpu/softfloat.h" #include "asi.h"
target/tricore/translate.c +1 -0
@@ -30,6 +30,7 @@#include "tricore-opcodes.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/log.h" #define HELPER_H "helper.h"
target/xtensa/translate.c +1 -0
@@ -37,6 +37,7 @@#include "qemu/qemu-print.h" #include "semihosting/semihost.h" #include "exec/translator.h" +#include "exec/translation-block.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h"
Signature · 1 line
2.47.1
[PULL 54/59] target/mips: Drop left-over comment about Jazz machine
In reply to Philippe Mathieu-DaudéCommit 3803b6b427 ("target/mips: Fold jazz behaviour into mips_cpu_do_transaction_failed") removed update on TCGCPUOps and commit 119065574d ("hw/core: Constify TCGCPUOps") made it const. Remove the now irrelevant comment.
Message-Id: <[email protected]>
--- target/mips/cpu.c | 4 ---- 1 file changed, 4 deletions(-)
target/mips/cpu.c +0 -4
@@ -546,10 +546,6 @@ static const Property mips_cpu_properties[] = {#ifdef CONFIG_TCG #include "hw/core/tcg-cpu-ops.h" -/* -* NB: cannot be const, as some elements are changed for specific -* mips hardware (see hw/mips/jazz.c). -*/ static const TCGCPUOps mips_tcg_ops = { .initialize = mips_tcg_init, .synchronize_from_tb = mips_cpu_synchronize_from_tb,
Signature · 1 line
2.47.1