From: Mohamed Mediouni Date: Mon, 23 Feb 2026 23:39:39 +0000 (+0100) Subject: target/i386: mshv, emulate: move the generic x86 helpers to target/i386/emulate X-Git-Tag: v11.0.0-rc0~43^2~84 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84d1d2b79d478e2d903e35f2dbc4c7a80a39c533;p=thirdparty%2Fqemu.git 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 Link: https://lore.kernel.org/r/20260223233950.96076-18-mohamed@unpredictable.fr Signed-off-by: Paolo Bonzini --- diff --git a/target/i386/emulate/meson.build b/target/i386/emulate/meson.build index 1bb35162498..1fa1a8e8ec8 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 3fadd4598a5..49f28d4a5b9 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', -))