From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 14 May 2021 15:13:37 +0000 (-0500)
Subject: target/i386: Exit tb after wrmsr
X-Git-Tag: v6.0.1~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2258e527950fff984f1be0a71dbbae2cb14ebfc;p=thirdparty%2Fqemu.git

target/i386: Exit tb after wrmsr

At minimum, wrmsr can change efer, which affects HF_LMA.

Cc: qemu-stable@nongnu.org
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210514151342.384376-46-richard.henderson@linaro.org>
(cherry picked from commit 244843b757220c432e0e9ae8d2210218c034730d)
Signed-off-by: Michael Roth <michael.roth@amd.com>
---

diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index 880bc455612..6b713b4fff7 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -7198,6 +7198,8 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
                 gen_helper_rdmsr(cpu_env);
             } else {
                 gen_helper_wrmsr(cpu_env);
+                gen_jmp_im(s, s->pc - s->cs_base);
+                gen_eob(s);
             }
         }
         break;