hw/misc: Move some arm-related files from specific_ss into softmmu_ss
PATCH v2 1/1 hw/misc: Move some arm-related files from specific_ss into softmmu_ss
The header arget/arm/kvm-consts.h checks CONFIG_KVM which is marked as poisoned in common code, so the files that include this header have to be added to specific_ss and recompiled for each, qemu-system-arm and qemu-system-aarch64. However, since the kvm headers are only optionally used in kvm-constants.h for some sanity checks, we can additionally check the NEED_CPU_H macro first to avoid the poisoned CONFIG_KVM macro, so kvm-constants.h can also be used from "common" files (without the sanity checks - which should be OK since they are still done from other target-specific files instead). This way, and by adjusting some other include statements in the related files here and there, we can move some files from specific_ss into softmmu_ss, so that they only need to be compiled once during the build process.
---
v2: Use NEED_CPU_H wrapper in kvm-consts.h instead of avoiding to include it
include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 2 +- target/arm/kvm-consts.h | 8 ++++---- hw/misc/imx6_src.c | 2 +- hw/misc/iotkit-sysctl.c | 1 - hw/misc/meson.build | 11 +++++------ 5 files changed, 11 insertions(+), 13 deletions(-)
include/hw/misc/xlnx-zynqmp-apu-ctrl.h +1 -1
@@ -13,7 +13,7 @@#include "hw/sysbus.h" #include "hw/register.h" -#include "target/arm/cpu.h" +#include "target/arm/cpu-qom.h" #define TYPE_XLNX_ZYNQMP_APU_CTRL "xlnx.apu-ctrl"OBJECT_DECLARE_SIMPLE_TYPE (XlnxZynqMPAPUCtrl,XLNX_ZYNQMP_APU_CTRL )
target/arm/kvm-consts.h +4 -4
@@ -14,16 +14,16 @@#ifndef ARM_KVM_CONSTS_H #define ARM_KVM_CONSTS_H +#ifdef NEED_CPU_H #ifdef CONFIG_KVM #include <linux/kvm.h> #include <linux/psci.h> -#define MISMATCH_CHECK (X ,Y ) QEMU_BUILD_BUG_ON(X != Y) +#endif +#endif -#else - +#ifndef MISMATCH_CHECK #define MISMATCH_CHECK (X ,Y ) QEMU_BUILD_BUG_ON(0) -#endif #define CP_REG_SIZE_SHIFT 52
hw/misc/imx6_src.c +1 -1
@@ -15,7 +15,7 @@#include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" -#include "arm-powerctl.h" +#include "target/arm/arm-powerctl.h" #include "hw/core/cpu.h" #ifndef DEBUG_IMX6_SRC
hw/misc/iotkit-sysctl.c +0 -1
@@ -30,7 +30,6 @@#include "hw/qdev-properties.h" #include "hw/arm/armsse-version.h" #include "target/arm/arm-powerctl.h" -#include "target/arm/cpu.h" REG32(SECDBGSTAT, 0x0)REG32 (SECDBGSET ,0x4 )
hw/misc/meson.build +5 -6
@@ -51,6 +51,7 @@ softmmu_ss.add(when: 'CONFIG_IMX', if_true: files( 'imx25_ccm.c', 'imx31_ccm.c', 'imx6_ccm.c', + 'imx6_src.c', 'imx6ul_ccm.c', 'imx7_ccm.c', 'imx7_gpr.c',
@@ -84,8 +85,8 @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files( )) softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c')) softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c')) -specific_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-crf.c')) -specific_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-apu-ctrl.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-crf.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-apu-ctrl.c')) specific_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-crl.c')) softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files( 'xlnx-versal-xramc.c',
@@ -101,6 +102,7 @@ softmmu_ss.add(when: 'CONFIG_TZ_MPC', if_true: files('tz-mpc.c')) softmmu_ss.add(when: 'CONFIG_TZ_MSC', if_true: files('tz-msc.c')) softmmu_ss.add(when: 'CONFIG_TZ_PPC', if_true: files('tz-ppc.c')) softmmu_ss.add(when: 'CONFIG_IOTKIT_SECCTL', if_true: files('iotkit-secctl.c')) +softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysctl.c')) softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c')) softmmu_ss.add(when: 'CONFIG_ARMSSE_CPU_PWRCTRL', if_true: files('armsse-cpu-pwrctrl.c')) softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c'))
@@ -126,15 +128,12 @@ softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c')) specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c')) -specific_ss.add(when: 'CONFIG_IMX', if_true: files('imx6_src.c')) -specific_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysctl.c')) - specific_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c')) specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'mips_cpc.c')) specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c')) -specific_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa_ec.c')) +softmmu_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa_ec.c')) # HPPA devices softmmu_ss.add(when: 'CONFIG_LASI', if_true: files('lasi.c'))
Signature · 1 line
2.31.1
Quoted 1 line · Thomas Huth
The header
arget/arm/kvm-consts.hchecksCONFIG_KVMwhich is marked as
typo "target"
Quoted 11 lines
poisoned in common code, so the files that include this header have to be added to
specific_ssand recompiled for each, qemu-system-arm and qemu-system-aarch64. However, since the kvm headers are only optionally used inkvm-constants.hfor some sanity checks, we can additionally check theNEED_CPU_Hmacro first to avoid the poisonedCONFIG_KVMmacro, sokvm-constants.hcan also be used from "common" files (without the sanity checks - which should be OK since they are still done from other target-specific files instead). This way, and by adjusting some other include statements in the related files here and there, we can move some files fromspecific_ssintosoftmmu_ss, so that they only need to be compiled once during the build process.
Cool!
Quoted 10 lines
Signed-off-by Thomas Huth <[email protected]>---
v2: UseNEED_CPU_Hwrapper inkvm-consts.hinstead of avoiding to include itinclude/hw/misc/xlnx-zynqmp-apu-ctrl.h | 2 +- target/arm/kvm-consts.h | 8 ++++---- hw/misc/imx6_src.c | 2 +- hw/misc/iotkit-sysctl.c | 1 - hw/misc/meson.build | 11 +++++------ 5 files changed, 11 insertions(+), 13 deletions(-)
Peter Maydell
AppliedQuoted 18 lines · Philippe Mathieu-Daudé
Quoted 1 line · Thomas Huth
The header
arget/arm/kvm-consts.hchecksCONFIG_KVMwhich is marked astypo "target"
Quoted 11 lines
poisoned in common code, so the files that include this header have to be added to
specific_ssand recompiled for each, qemu-system-arm and qemu-system-aarch64. However, since the kvm headers are only optionally used inkvm-constants.hfor some sanity checks, we can additionally check theNEED_CPU_Hmacro first to avoid the poisonedCONFIG_KVMmacro, sokvm-constants.hcan also be used from "common" files (without the sanity checks - which should be OK since they are still done from other target-specific files instead). This way, and by adjusting some other include statements in the related files here and there, we can move some files fromspecific_ssintosoftmmu_ss, so that they only need to be compiled once during the build process.
Quoted 3 lines
Cool!
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Applied to target-arm-for-8.0 with the commit message typo fixed.
thanks
-- PMM