On Tue, 13 May 2025 at 18:39, Philippe Mathieu-Daudé <phi...@linaro.org> wrote: > > Before I respin my "single-binary: Make hw/arm/ common" [1] I'm > extracting these random cleanup patches. Some aren't necessary > anymore because now units in arm_common_ss[] can access "cpu.h", > but the patches are reviewed and simplify a bit IMO. > > Based-on: <20250512180502.2395029-1-pierrick.bouv...@linaro.org> > "single-binary: compile target/arm twice" > > [1] > https://lore.kernel.org/qemu-devel/20250403235821.9909-1-phi...@linaro.org/ > > Philippe Mathieu-Daudé (19): > target/arm/tcg-stubs: compile file once (system) > target/arm/hvf_arm: Avoid using poisoned CONFIG_HVF definition > target/arm: Only link with zlib when TCG is enabled > target/arm/cpregs: Include missing 'target/arm/cpu.h' header > hw/arm/boot: Include missing 'system/memory.h' header > target/arm/cpu-features: Include missing 'cpu.h' header > target/arm/qmp: Include missing 'cpu.h' header > target/arm/kvm: Include missing 'cpu-qom.h' header > target/arm/hvf: Include missing 'cpu-qom.h' header
Hi; I've applied these patches to target-arm.next. > hw/arm: Remove unnecessary 'cpu.h' header After this patch things fail to compile: ../../hw/arm/exynos4210.c:511:20: error: use of undeclared identifier 'ARM_AFF1_SHIFT' 511 | return (0x9 << ARM_AFF1_SHIFT) | cpu; ../../hw/arm/mps3r.c:295:14: error: use of undeclared identifier 'GTIMER_PHYS'; did you mean 'ITIMER_PROF'? 295 | [GTIMER_PHYS] = ARCH_TIMER_NS_EL1_IRQ, etc. Probably this patch needs to go later in the series. > target/arm: Restrict inclusion of 'multiprocessing.h' Starting somewhere around here the patches don't apply any more (trivial rebase conflicts, I think, but given the compile error above I didn't spend time on trying to sort them out). > target/arm: Move some definitions from 'cpu.h' to 'multiprocessing.h' > hw/arm: Include missing 'target/arm/gtimer.h' header > target/arm: Extract PSCI definitions to 'psci.h' > target/arm: Extract feature definitions to 'cpu_has_feature.h' header > target/arm: Add arm_cpu_has_feature() helper > hw/arm/realview: Replace arm_feature() -> arm_cpu_has_feature() > hw/arm/virt-acpi: Replace arm_feature() -> arm_cpu_has_feature() > target/arm: Always include full path to 'cpu.h' I'm not sure about the arm_cpu_has_feature() patches at the tail end of the series, and there seemed to be some review comments to the effect that maybe we don't need them any more? thanks -- PMM
