[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 29/29] tcg/i386: rdpmc: fix the the condtions
From: |
Paolo Bonzini |
Subject: |
[PULL 29/29] tcg/i386: rdpmc: fix the the condtions |
Date: |
Fri, 26 Feb 2021 09:05:26 +0100 |
From: Zheng Zhan Liang <linuxmaker@163.com>
Signed-off-by: Zheng Zhan Liang <linuxmaker@163.com>
Message-Id: <20210225054756.35962-1-linuxmaker@163.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/tcg/misc_helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/i386/tcg/misc_helper.c b/target/i386/tcg/misc_helper.c
index f02e4fd400..90b87fdef0 100644
--- a/target/i386/tcg/misc_helper.c
+++ b/target/i386/tcg/misc_helper.c
@@ -222,7 +222,8 @@ void helper_rdtscp(CPUX86State *env)
void helper_rdpmc(CPUX86State *env)
{
- if ((env->cr[4] & CR4_PCE_MASK) && ((env->hflags & HF_CPL_MASK) != 0)) {
+ if (((env->cr[4] & CR4_PCE_MASK) == 0 ) &&
+ ((env->hflags & HF_CPL_MASK) != 0)) {
raise_exception_ra(env, EXCP0D_GPF, GETPC());
}
cpu_svm_check_intercept_param(env, SVM_EXIT_RDPMC, 0, GETPC());
--
2.29.2
- [PULL 13/29] scsi: drop 'result' argument from command_complete callback, (continued)
- [PULL 13/29] scsi: drop 'result' argument from command_complete callback, Paolo Bonzini, 2021/02/26
- [PULL 18/29] qemu-options: update to show preferred boolean syntax for -netdev, Paolo Bonzini, 2021/02/26
- [PULL 12/29] scsi-disk: pass guest recoverable errors through even for rerror=stop, Paolo Bonzini, 2021/02/26
- [PULL 16/29] qemu-options: update to show preferred boolean syntax for -chardev, Paolo Bonzini, 2021/02/26
- [PULL 17/29] qemu-options: update to show preferred boolean syntax for -spice, Paolo Bonzini, 2021/02/26
- [PULL 20/29] qemu-options: update to show preferred boolean syntax for -vnc, Paolo Bonzini, 2021/02/26
- [PULL 21/29] docs: update to show preferred boolean syntax for -chardev, Paolo Bonzini, 2021/02/26
- [PULL 23/29] docs: update to show preferred boolean syntax for -cpu, Paolo Bonzini, 2021/02/26
- [PULL 28/29] chardev: do not use short form boolean options in non-QemuOpts character device descriptions, Paolo Bonzini, 2021/02/26
- [PULL 26/29] target/i386: Add bus lock debug exception support, Paolo Bonzini, 2021/02/26
- [PULL 29/29] tcg/i386: rdpmc: fix the the condtions,
Paolo Bonzini <=
- [PULL 04/29] scsi: make io_timeout configurable, Paolo Bonzini, 2021/02/26
- [PULL 08/29] scsi-disk: move scsi_handle_rw_error earlier, Paolo Bonzini, 2021/02/26
- [PULL 07/29] virtio-scsi: don't process IO on fenced dataplane, Paolo Bonzini, 2021/02/26
- [PULL 11/29] scsi-disk: pass SCSI status to scsi_handle_rw_error, Paolo Bonzini, 2021/02/26
- [PULL 09/29] scsi-disk: do not complete requests early for rerror/werror=ignore, Paolo Bonzini, 2021/02/26
- [PULL 15/29] gdbstub: use preferred boolean option syntax, Paolo Bonzini, 2021/02/26
- [PULL 14/29] char: don't fail when client is not connected, Paolo Bonzini, 2021/02/26
- [PULL 19/29] qemu-options: update to show preferred boolean syntax for -incoming, Paolo Bonzini, 2021/02/26
- [PULL 22/29] docs: update to show preferred boolean syntax for -vnc, Paolo Bonzini, 2021/02/26
- [PULL 24/29] target/i386: update to show preferred boolean syntax for -cpu, Paolo Bonzini, 2021/02/26