eb86ba78e5
- Fix stable issues found in upstream: hmp-Fix-loadvm-to-resume-the-VM-on-succe.patch hw-block-nvme-align-with-existing-style.patch hw-nvme-fix-missing-check-for-PMR-capabi.patch hw-nvme-fix-pin-based-interrupt-behavior.patch linux-user-aarch64-Enable-hwcap-for-RND-.patch qemu-config-load-modules-when-instantiat.patch qemu-config-parse-configuration-files-to.patch qemu-config-use-qemu_opts_from_qdict.patch runstate-Initialize-Error-to-NULL.patch target-i386-Exit-tb-after-wrmsr.patch tcg-Allocate-sufficient-storage-in-temp_.patch tcg-sparc-Fix-temp_allocate_frame-vs-spa.patch vhost-vdpa-don-t-initialize-backend_feat.patch vl-allow-not-specifying-size-in-m-when-u.patch vl-Fix-an-assert-failure-in-error-path.patch vl-plug-object-back-into-readconfig.patch vl-plumb-keyval-based-options-into-readc.patch x86-acpi-use-offset-instead-of-pointer-w.patch - Update qemu-supportconfig plugin - Fix an update-alternative warning when removing qemu-skiboot package bsc#1178678 OBS-URL: https://build.opensuse.org/request/show/903710 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=660
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From: Richard Henderson <richard.henderson@linaro.org>
|
|
Date: Fri, 14 May 2021 10:13:37 -0500
|
|
Subject: target/i386: Exit tb after wrmsr
|
|
|
|
Git-commit: 244843b757220c432e0e9ae8d2210218c034730d
|
|
|
|
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>
|
|
Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
|
|
---
|
|
target/i386/tcg/translate.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
|
|
index 880bc455612aa9757a065723206e..6b713b4fff7c466bd864d4af5792 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;
|