The following patches require the "arm cleanup experiment for kvm-only build" [*] series with split various user/sysemu and tcg/kvm code from the target/arm/ directory.
To be able to build the following patches waiting the series get merged, simply restrict the KVM files to the softmmu source set. [*] https://lists.gnu.org/archive/html/qemu-devel/2021-04/msg02908.html Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- target/arm/cpu.c | 2 +- target/arm/cpu64.c | 2 +- target/arm/meson.build | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index f29649ecba7..e443cfb3d96 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -35,10 +35,10 @@ #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" #include "hw/boards.h" +#include "kvm_arm.h" #endif #include "sysemu/tcg.h" #include "sysemu/hw_accel.h" -#include "kvm_arm.h" #include "disas/capstone.h" #include "fpu/softfloat.h" diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index f0a9e968c9c..08fba3ec29a 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -27,9 +27,9 @@ #include "qemu/module.h" #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" +#include "kvm_arm.h" #endif #include "sysemu/kvm.h" -#include "kvm_arm.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" diff --git a/target/arm/meson.build b/target/arm/meson.build index 09802ba1a17..6143e736079 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -35,8 +35,6 @@ )) arm_ss.add(zlib) -arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c')) - arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', 'gdbstub64.c', @@ -49,6 +47,8 @@ arm_softmmu_ss = ss.source_set() +arm_softmmu_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c')) + arm_softmmu_ss.add(when: 'TARGET_AARCH64', if_true: files( 'mte_helper.c', )) -- 2.26.3
