diff mbox series

target/i386: Check for USER_ONLY definition instead of SOFTMMU one

Message ID 20231004082239.27251-1-philmd@linaro.org
State Accepted
Commit 1da389c5dba3efca5de6b983cf788054880de432
Headers show
Series target/i386: Check for USER_ONLY definition instead of SOFTMMU one | expand

Commit Message

Philippe Mathieu-Daudé Oct. 4, 2023, 8:22 a.m. UTC 
Since we *might* have user emulation with softmmu,
replace the system emulation check by !user emulation one.

(target/ was cleaned from invalid CONFIG_SOFTMMU uses at
commit cab35c73be, but these files were merged few days
after, thus missed the cleanup.)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
Ideally we'd restrict CONFIG_SOFTMMU to tcg meson source sets,
and #poison it for the rest of the code base.
---
 target/i386/cpu.c             | 2 +-
 target/i386/tcg/misc_helper.c | 2 +-
 target/i386/tcg/translate.c   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

Comments

Paolo Bonzini Oct. 4, 2023, 1:18 p.m. UTC | #1 
Queued, thanks.

Paolo
diff mbox series

Patch

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ed72883bf3..af872c2f4b 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -718,7 +718,7 @@  void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1,
           CPUID_7_0_EBX_HLE
           CPUID_7_0_EBX_INVPCID, CPUID_7_0_EBX_RTM */
 
-#if defined CONFIG_SOFTMMU || defined CONFIG_LINUX
+#if !defined CONFIG_USER_ONLY || defined CONFIG_LINUX
 #define TCG_7_0_ECX_RDPID CPUID_7_0_ECX_RDPID
 #else
 #define TCG_7_0_ECX_RDPID 0
diff --git a/target/i386/tcg/misc_helper.c b/target/i386/tcg/misc_helper.c
index 868f36ab7f..babff06186 100644
--- a/target/i386/tcg/misc_helper.c
+++ b/target/i386/tcg/misc_helper.c
@@ -134,7 +134,7 @@  void helper_wrpkru(CPUX86State *env, uint32_t ecx, uint64_t val)
 
 target_ulong HELPER(rdpid)(CPUX86State *env)
 {
-#if defined CONFIG_SOFTMMU
+#if !defined CONFIG_USER_ONLY
     return env->tsc_aux;
 #elif defined CONFIG_LINUX && defined CONFIG_GETCPU
     unsigned cpu, node;
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index 72635b87d3..aa4cdf45b4 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -178,10 +178,10 @@  typedef struct DisasContext {
 #else
 #define CODE64(S) (((S)->flags & HF_CS64_MASK) != 0)
 #endif
-#if defined(CONFIG_SOFTMMU) && !defined(TARGET_X86_64)
-#define LMA(S)    false
-#else
+#if defined(CONFIG_USER_ONLY) || defined(TARGET_X86_64)
 #define LMA(S)    (((S)->flags & HF_LMA_MASK) != 0)
+#else
+#define LMA(S)    false
 #endif
 
 #ifdef TARGET_X86_64