*: Use fprintf between qemu_log_trylock/unlock

[qemu.git] / target / i386 / meson.build

diff --git a/target/i386/meson.build b/target/i386/meson.build
index e0b71ade56c044de99a9db5281afe8e34a3fc06d..ae38dc956354414740b026c4b2305c6cad108fd7 100644 (file)
--- a/target/i386/meson.build
+++ b/target/i386/meson.build
@@ -4,22 +4,13 @@ i386_ss.add(files(
   'gdbstub.c',
   'helper.c',
   'xsave_helper.c',
   'gdbstub.c',
   'helper.c',
   'xsave_helper.c',

+  'cpu-dump.c',

 ))
 ))

-i386_ss.add(when: 'CONFIG_TCG', if_true: files(
-  'bpt_helper.c',
-  'cc_helper.c',
-  'excp_helper.c',
-  'fpu_helper.c',
-  'int_helper.c',
-  'mem_helper.c',
-  'misc_helper.c',
-  'mpx_helper.c',
-  'seg_helper.c',
-  'smm_helper.c',
-  'svm_helper.c',
-  'translate.c'), if_false: files('tcg-stub.c'))
-i386_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
-i386_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('sev-stub.c'))
+i386_ss.add(when: 'CONFIG_SEV', if_true: files('host-cpu.c'))
+
+# x86 cpu type
+i386_ss.add(when: 'CONFIG_KVM', if_true: files('host-cpu.c'))
+i386_ss.add(when: 'CONFIG_HVF', if_true: files('host-cpu.c'))

 
 i386_softmmu_ss = ss.source_set()
 i386_softmmu_ss.add(files(
 
 i386_softmmu_ss = ss.source_set()
 i386_softmmu_ss.add(files(


@@ -27,14 +18,19 @@ i386_softmmu_ss.add(files(
   'arch_memory_mapping.c',
   'machine.c',
   'monitor.c',
   'arch_memory_mapping.c',
   'machine.c',
   'monitor.c',

+  'cpu-sysemu.c',

 ))
 ))

-i386_softmmu_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_false: files('hyperv-stub.c'))
-i386_softmmu_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
-i386_softmmu_ss.add(when: 'CONFIG_WHPX', if_true: files('whpx-all.c'))
-i386_softmmu_ss.add(when: ['CONFIG_POSIX', 'CONFIG_HAX'], if_true: files('hax-all.c', 'hax-mem.c', 'hax-posix.c'))
-i386_softmmu_ss.add(when: ['CONFIG_WIN32', 'CONFIG_HAX'], if_true: files('hax-all.c', 'hax-mem.c', 'hax-windows.c'))
+i386_softmmu_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('sev-sysemu-stub.c'))
+
+i386_user_ss = ss.source_set()

 
 

+subdir('kvm')
+subdir('hax')
+subdir('whpx')
+subdir('nvmm')

 subdir('hvf')
 subdir('hvf')

+subdir('tcg')

 
 target_arch += {'i386': i386_ss}
 target_softmmu_arch += {'i386': i386_softmmu_ss}
 
 target_arch += {'i386': i386_ss}
 target_softmmu_arch += {'i386': i386_softmmu_ss}

+target_user_arch += {'i386': i386_user_ss}