diff options
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 9162b4cd3410..51f804c8fe79 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -2724,13 +2724,18 @@ static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
| 2724 | kvm_set_cr4(vcpu, kvm_register_read(vcpu, reg)); | 2724 | kvm_set_cr4(vcpu, kvm_register_read(vcpu, reg)); |
| 2725 | skip_emulated_instruction(vcpu); | 2725 | skip_emulated_instruction(vcpu); |
| 2726 | return 1; | 2726 | return 1; |
| 2727 | case 8: | 2727 | case 8: { |
| 2728 | kvm_set_cr8(vcpu, kvm_register_read(vcpu, reg)); | 2728 | u8 cr8_prev = kvm_get_cr8(vcpu); |
| 2729 | skip_emulated_instruction(vcpu); | 2729 | u8 cr8 = kvm_register_read(vcpu, reg); |
| 2730 | if (irqchip_in_kernel(vcpu->kvm)) | 2730 | kvm_set_cr8(vcpu, cr8); |
| 2731 | return 1; | 2731 | skip_emulated_instruction(vcpu); |
| 2732 | kvm_run->exit_reason = KVM_EXIT_SET_TPR; | 2732 | if (irqchip_in_kernel(vcpu->kvm)) |
| 2733 | return 0; | 2733 | return 1; |
| 2734 | if (cr8_prev <= cr8) | ||
| 2735 | return 1; | ||
| 2736 | kvm_run->exit_reason = KVM_EXIT_SET_TPR; | ||
| 2737 | return 0; | ||
| 2738 | } | ||
| 2734 | }; | 2739 | }; |
| 2735 | break; | 2740 | break; |
| 2736 | case 2: /* clts */ | 2741 | case 2: /* clts */ |