| Message ID | 20221025163952.4131046-1-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Tue, 25 Oct 2022 at 12:51, Peter Maydell <peter.maydell@linaro.org> wrote: > target-arm queue: > * Implement FEAT_E0PD > * Implement FEAT_HAFDBS This commit breaks CI: i686-w64-mingw32-gcc -m32 -Ilibqemu-aarch64-softmmu.fa.p -I. -I.. -Itarget/arm -I../target/arm -I../dtc/libfdt -Iqapi -Itrace -Iui -Iui/shader -I/usr/i686-w64-mingw32/sys-root/mingw/include/pixman-1 -I/usr/i686-w64-mingw32/sys-root/mingw/include/glib-2.0 -I/usr/i686-w64-mingw32/sys-root/mingw/lib/glib-2.0/include -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -iquote . -iquote /builds/qemu-project/qemu -iquote /builds/qemu-project/qemu/include -iquote /builds/qemu-project/qemu/tcg/i386 -mms-bitfields -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-pie -no-pie -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -DNEED_CPU_H '-DCONFIG_TARGET="aarch64-softmmu-config-target.h"' '-DCONFIG_DEVICES="aarch64-softmmu-config-devices.h"' -MD -MQ libqemu-aarch64-softmmu.fa.p/target_arm_ptw.c.obj -MF libqemu-aarch64-softmmu.fa.p/target_arm_ptw.c.obj.d -o libqemu-aarch64-softmmu.fa.p/target_arm_ptw.c.obj -c ../target/arm/ptw.c ../target/arm/ptw.c: In function 'S1_ptw_translate': ../target/arm/ptw.c:269:36: error: 'PROT_WRITE' undeclared (first use in this function); did you mean 'OF_WRITE'? 269 | ptw->out_rw = full->prot & PROT_WRITE; | ^~~~~~~~~~ | OF_WRITE ../target/arm/ptw.c:269:36: note: each undeclared identifier is reported only once for each function it appears in https://gitlab.com/qemu-project/qemu/-/jobs/3230968840 Stefan
On Tue, 25 Oct 2022 at 12:51, Peter Maydell <peter.maydell@linaro.org> wrote: > target-arm queue: > * Implement FEAT_E0PD > * Implement FEAT_HAFDBS A second CI failure: arm-linux-gnueabi-gcc -Ilibqemu-aarch64-softmmu.fa.p -I. -I.. -Itarget/arm -I../target/arm -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabi/glib-2.0/include -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /builds/qemu-project/qemu/linux-headers -isystem linux-headers -iquote . -iquote /builds/qemu-project/qemu -iquote /builds/qemu-project/qemu/include -iquote /builds/qemu-project/qemu/tcg/arm -pthread -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H '-DCONFIG_TARGET="aarch64-softmmu-config-target.h"' '-DCONFIG_DEVICES="aarch64-softmmu-config-devices.h"' -MD -MQ libqemu-aarch64-softmmu.fa.p/target_arm_ptw.c.o -MF libqemu-aarch64-softmmu.fa.p/target_arm_ptw.c.o.d -o libqemu-aarch64-softmmu.fa.p/target_arm_ptw.c.o -c ../target/arm/ptw.c ../target/arm/ptw.c: In function ‘arm_casq_ptw’: ../target/arm/ptw.c:449:19: error: implicit declaration of function ‘qemu_mutex_iothread_locked’; did you mean ‘qemu_mutex_trylock’? [-Werror=implicit-function-declaration] 449 | bool locked = qemu_mutex_iothread_locked(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | qemu_mutex_trylock ../target/arm/ptw.c:449:19: error: nested extern declaration of ‘qemu_mutex_iothread_locked’ [-Werror=nested-externs] ../target/arm/ptw.c:451:8: error: implicit declaration of function ‘qemu_mutex_lock_iothread’; did you mean ‘qemu_mutex_lock__raw’? [-Werror=implicit-function-declaration] 451 | qemu_mutex_lock_iothread(); | ^~~~~~~~~~~~~~~~~~~~~~~~ | qemu_mutex_lock__raw ../target/arm/ptw.c:451:8: error: nested extern declaration of ‘qemu_mutex_lock_iothread’ [-Werror=nested-externs] ../target/arm/ptw.c:465:9: error: implicit declaration of function ‘qemu_mutex_unlock_iothread’; did you mean ‘qemu_mutex_unlock_impl’? [-Werror=implicit-function-declaration] 465 | qemu_mutex_unlock_iothread(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | qemu_mutex_unlock_impl ../target/arm/ptw.c:465:9: error: nested extern declaration of ‘qemu_mutex_unlock_iothread’ [-Werror=nested-externs] https://gitlab.com/qemu-project/qemu/-/jobs/3230968787 Stefan
On Wed, Oct 26, 2022 at 10:49:18AM -0400, Stefan Hajnoczi wrote: > On Tue, 25 Oct 2022 at 12:51, Peter Maydell <peter.maydell@linaro.org> wrote: > > target-arm queue: > > * Implement FEAT_E0PD > > * Implement FEAT_HAFDBS > > This commit breaks CI: Ah, so when this is respun, there'll be an opportunity for Peter to pull in the left-out commit from my series now that I've posted a fixed version of that. Pfiew! Count down til the soft freeze... :) Jason
On Wed, 26 Oct 2022 at 15:52, Stefan Hajnoczi <stefanha@gmail.com> wrote: > > On Tue, 25 Oct 2022 at 12:51, Peter Maydell <peter.maydell@linaro.org> wrote: > > target-arm queue: > > * Implement FEAT_E0PD > > * Implement FEAT_HAFDBS > > A second CI failure: > libqemu-aarch64-softmmu.fa.p/target_arm_ptw.c.o -MF > libqemu-aarch64-softmmu.fa.p/target_arm_ptw.c.o.d -o > libqemu-aarch64-softmmu.fa.p/target_arm_ptw.c.o -c ../target/arm/ptw.c > ../target/arm/ptw.c: In function ‘arm_casq_ptw’: > ../target/arm/ptw.c:449:19: error: implicit declaration of function > ‘qemu_mutex_iothread_locked’; did you mean ‘qemu_mutex_trylock’? > [-Werror=implicit-function-declaration] > 449 | bool locked = qemu_mutex_iothread_locked(); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > | qemu_mutex_trylock Oops, sorry about the CI failures. The windows one is an accidental use of PROT_WRITE when PAGE_WRITE was intended; this one's a missing include of main-loop.h. I'm not sure why it doesn't show up on my system -- I guess we're dragging in main-loop.h via some other header somehow. thanks -- PMM
Hi; this is the latest target-arm queue. Most of the patches here are RTH's FEAT_HAFDBS finally landing. I've also included the RNG-seed randomization patches from Jason, as well as a few more minor things. The patches include a couple of regression fixes: * the resettable patch fixes a SCSI reset regression * the 'do not re-randomize on snapshot load' patches fix record-and-replay regressions thanks -- PMM The following changes since commit e750a7ace492f0b450653d4ad368a77d6f660fb8: Merge tag 'pull-9p-20221024' of https://github.com/cschoenebeck/qemu into staging (2022-10-24 14:27:12 -0400) are available in the Git repository at: https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20221025 for you to fetch changes up to e2114f701c78f76246e4b1872639dad94a6bdd21: rx: re-randomize rng-seed on reboot (2022-10-25 17:32:24 +0100) ---------------------------------------------------------------- target-arm queue: * Implement FEAT_E0PD * Implement FEAT_HAFDBS * honor HCR_E2H and HCR_TGE in arm_excp_unmasked() * hw/arm/virt: Fix devicetree warnings about the virtio-iommu node * hw/core/resettable: fix reset level counting * hw/hyperv/hyperv.c: Use device_cold_reset() instead of device_legacy_reset() * imx: reload cmp timer outside of the reload ptimer transaction * x86: do not re-randomize RNG seed on snapshot load * m68k/virt: do not re-randomize RNG seed on snapshot load * m68k/q800: do not re-randomize RNG seed on snapshot load * arm: re-randomize rng-seed on reboot * riscv: re-randomize rng-seed on reboot * mips/boston: re-randomize rng-seed on reboot * openrisc: re-randomize rng-seed on reboot * rx: re-randomize rng-seed on reboot ---------------------------------------------------------------- Ake Koomsin (1): target/arm: honor HCR_E2H and HCR_TGE in arm_excp_unmasked() Axel Heider (1): target/imx: reload cmp timer outside of the reload ptimer transaction Damien Hedde (1): hw/core/resettable: fix reset level counting Jason A. Donenfeld (10): reset: allow registering handlers that aren't called by snapshot loading device-tree: add re-randomization helper function x86: do not re-randomize RNG seed on snapshot load arm: re-randomize rng-seed on reboot riscv: re-randomize rng-seed on reboot m68k/virt: do not re-randomize RNG seed on snapshot load m68k/q800: do not re-randomize RNG seed on snapshot load mips/boston: re-randomize rng-seed on reboot openrisc: re-randomize rng-seed on reboot rx: re-randomize rng-seed on reboot Jean-Philippe Brucker (1): hw/arm/virt: Fix devicetree warnings about the virtio-iommu node Peter Maydell (2): target/arm: Implement FEAT_E0PD hw/hyperv/hyperv.c: Use device_cold_reset() instead of device_legacy_reset() Richard Henderson (14): target/arm: Introduce regime_is_stage2 target/arm: Add ptw_idx to S1Translate target/arm: Add isar predicates for FEAT_HAFDBS target/arm: Extract HA and HD in aa64_va_parameters target/arm: Move S1_ptw_translate outside arm_ld[lq]_ptw target/arm: Add ARMFault_UnsuppAtomicUpdate target/arm: Remove loop from get_phys_addr_lpae target/arm: Fix fault reporting in get_phys_addr_lpae target/arm: Don't shift attrs in get_phys_addr_lpae target/arm: Consider GP an attribute in get_phys_addr_lpae target/arm: Tidy merging of attributes from descriptor and table target/arm: Implement FEAT_HAFDBS, access flag portion target/arm: Implement FEAT_HAFDBS, dirty bit portion target/arm: Use the max page size in a 2-stage ptw docs/devel/reset.rst | 8 +- docs/system/arm/emulation.rst | 2 + qapi/run-state.json | 6 +- include/hw/boards.h | 2 +- include/sysemu/device_tree.h | 9 + include/sysemu/reset.h | 5 +- target/arm/cpu.h | 15 ++ target/arm/internals.h | 30 +++ hw/arm/aspeed.c | 4 +- hw/arm/boot.c | 2 + hw/arm/mps2-tz.c | 4 +- hw/arm/virt.c | 5 +- hw/core/reset.c | 17 +- hw/core/resettable.c | 3 +- hw/hppa/machine.c | 4 +- hw/hyperv/hyperv.c | 2 +- hw/i386/microvm.c | 4 +- hw/i386/pc.c | 6 +- hw/i386/x86.c | 2 +- hw/m68k/q800.c | 33 ++- hw/m68k/virt.c | 20 +- hw/mips/boston.c | 3 + hw/openrisc/boot.c | 3 + hw/ppc/pegasos2.c | 4 +- hw/ppc/pnv.c | 4 +- hw/ppc/spapr.c | 4 +- hw/riscv/boot.c | 3 + hw/rx/rx-gdbsim.c | 3 + hw/s390x/s390-virtio-ccw.c | 4 +- hw/timer/imx_epit.c | 9 +- migration/savevm.c | 2 +- softmmu/device_tree.c | 21 ++ softmmu/runstate.c | 11 +- target/arm/cpu.c | 24 +- target/arm/cpu64.c | 2 + target/arm/helper.c | 31 ++- target/arm/ptw.c | 524 +++++++++++++++++++++++++++--------------- 37 files changed, 572 insertions(+), 263 deletions(-)