On 02/10/21 14:52, Philippe Mathieu-Daudé wrote:
SEV is x86-specific, no need to add its stub to other
architectures. Move the stub file to target/i386/kvm/.
Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
---
{accel => target/i386}/kvm/sev-stub.c | 0
accel/kvm/meson.build | 1 -
target/i386/kvm/meson.build | 2 ++
3 files changed, 2 insertions(+), 1 deletion(-)
rename {accel => target/i386}/kvm/sev-stub.c (100%)
diff --git a/accel/kvm/sev-stub.c b/target/i386/kvm/sev-stub.c
similarity index 100%
rename from accel/kvm/sev-stub.c
rename to target/i386/kvm/sev-stub.c
diff --git a/accel/kvm/meson.build b/accel/kvm/meson.build
index 8d219bea507..397a1fe1fd1 100644
--- a/accel/kvm/meson.build
+++ b/accel/kvm/meson.build
@@ -3,6 +3,5 @@
'kvm-all.c',
'kvm-accel-ops.c',
))
-kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c'))
specific_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss)
diff --git a/target/i386/kvm/meson.build b/target/i386/kvm/meson.build
index b1c76957c76..736df8b72e3 100644
--- a/target/i386/kvm/meson.build
+++ b/target/i386/kvm/meson.build
@@ -7,6 +7,8 @@
'kvm-cpu.c',
))
+i386_softmmu_kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c'))
+
i386_softmmu_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_false: files('hyperv-stub.c'))
i386_softmmu_ss.add_all(when: 'CONFIG_KVM', if_true: i386_softmmu_kvm_ss)
Reviewed-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>