Add kvm.c into meson.build to compile it when kvm is configed. Meanwhile in meson.build, we set the kvm_targets to loongarch64-softmmu when the cpu is loongarch. And fix the compiling error when config is enable-kvm,disable-tcg.
Signed-off-by: Tianrui Zhao <zhaotian...@loongson.cn> Signed-off-by: xianglai li <lixiang...@loongson.cn> Reviewed-by: Richard Henderson <richard.hender...@linaro.org> --- meson.build | 2 ++ target/loongarch/meson.build | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 445f2b7c2b..0c62b4156d 100644 --- a/meson.build +++ b/meson.build @@ -114,6 +114,8 @@ elif cpu in ['riscv32'] kvm_targets = ['riscv32-softmmu'] elif cpu in ['riscv64'] kvm_targets = ['riscv64-softmmu'] +elif cpu in ['loongarch64'] + kvm_targets = ['loongarch64-softmmu'] else kvm_targets = [] endif diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build index 18e8191e2b..4a59356d0f 100644 --- a/target/loongarch/meson.build +++ b/target/loongarch/meson.build @@ -10,8 +10,10 @@ loongarch_tcg_ss.add(files( 'fpu_helper.c', 'op_helper.c', 'translate.c', - 'gdbstub.c', 'vec_helper.c', + 'tlb_helper.c', + 'iocsr_helper.c', + 'csr_helper.c', )) loongarch_tcg_ss.add(zlib) @@ -19,14 +21,13 @@ loongarch_system_ss = ss.source_set() loongarch_system_ss.add(files( 'loongarch-qmp-cmds.c', 'machine.c', - 'tlb_helper.c', 'constant_timer.c', - 'csr_helper.c', - 'iocsr_helper.c', + 'gdbstub.c', )) common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [files('disas.c'), gen]) +loongarch_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss]) target_arch += {'loongarch': loongarch_ss} -- 2.39.1