HVF doesn't use them at this point, but move them to common code as that's what they are.
Signed-off-by: Mohamed Mediouni <[email protected]> --- target/i386/emulate/meson.build | 7 +++++++ target/i386/{mshv/x86.c => emulate/x86_helpers.c} | 0 target/i386/mshv/meson.build | 4 ---- 3 files changed, 7 insertions(+), 4 deletions(-) rename target/i386/{mshv/x86.c => emulate/x86_helpers.c} (100%) diff --git a/target/i386/emulate/meson.build b/target/i386/emulate/meson.build index 1bb3516249..1fa1a8e8ec 100644 --- a/target/i386/emulate/meson.build +++ b/target/i386/emulate/meson.build @@ -5,6 +5,13 @@ emulator_files = files( 'x86_mmu.c' ) +emulator_helper_files = files( + 'x86_helpers.c' +) + i386_system_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: emulator_files) i386_system_ss.add(when: 'CONFIG_MSHV', if_true: emulator_files) i386_system_ss.add(when: 'CONFIG_WHPX', if_true: emulator_files) + +i386_system_ss.add(when: 'CONFIG_MSHV', if_true: emulator_helper_files) +i386_system_ss.add(when: 'CONFIG_WHPX', if_true: emulator_helper_files) diff --git a/target/i386/mshv/x86.c b/target/i386/emulate/x86_helpers.c similarity index 100% rename from target/i386/mshv/x86.c rename to target/i386/emulate/x86_helpers.c diff --git a/target/i386/mshv/meson.build b/target/i386/mshv/meson.build index 3fadd4598a..49f28d4a5b 100644 --- a/target/i386/mshv/meson.build +++ b/target/i386/mshv/meson.build @@ -2,11 +2,7 @@ i386_mshv_ss = ss.source_set() i386_mshv_ss.add(files( 'mshv-cpu.c', - 'x86.c', )) i386_system_ss.add_all(when: 'CONFIG_MSHV', if_true: i386_mshv_ss) -i386_system_ss.add(when: 'CONFIG_WHPX', if_true: files( - 'x86.c', -)) -- 2.50.1 (Apple Git-155)
