@samitouri / QOSamiQemu / commits / 84d1d2b79d

target/i386: mshv, emulate: move the generic x86 helpers to target/i386/emulate

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 <mohamed@unpredictable.fr> Link: https://lore.kernel.org/r/20260223233950.96076-18-mohamed@unpredictable.fr Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Mohamed Mediouni committed Feb 24, 2026 at 00:39 UTC 84d1d2b79d478e2d903e35f2dbc4c7a80a39c533
3 files changed +7 -4
target/i386/emulate/meson.build
+7
@@ -5,6 +5,13 @@ emulator_files = files(
5 'x86_mmu.c'
6 )
7
8 +emulator_helper_files = files(
9 + 'x86_helpers.c'
10 +)
11 +
12 i386_system_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: emulator_files)
13 i386_system_ss.add(when: 'CONFIG_MSHV', if_true: emulator_files)
14 i386_system_ss.add(when: 'CONFIG_WHPX', if_true: emulator_files)
15 +
16 +i386_system_ss.add(when: 'CONFIG_MSHV', if_true: emulator_helper_files)
17 +i386_system_ss.add(when: 'CONFIG_WHPX', if_true: emulator_helper_files)
target/i386/emulate/x86_helpers.c renamed
target/i386/mshv/meson.build
-4
@@ -2,11 +2,7 @@ i386_mshv_ss = ss.source_set()
2
3 i386_mshv_ss.add(files(
4 'mshv-cpu.c',
5 - 'x86.c',
5 ))
6
7 i386_system_ss.add_all(when: 'CONFIG_MSHV', if_true: i386_mshv_ss)
8
10 -i386_system_ss.add(when: 'CONFIG_WHPX', if_true: files(
11 - 'x86.c',
12 -))