diff options
| author | Andre Przywara <andre.przywara@amd.com> | 2010-12-21 05:12:00 -0500 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-01-12 04:30:58 -0500 |
| commit | eea1cff9ab732ea56358ff5e1bd8b99db2e8402d (patch) | |
| tree | 000abd8fa64f58602ebfc03b09e1f394c72f4ad7 /arch/x86/include/asm | |
| parent | a63512a4d711c9bd6a5d03847f45fcf88cdea0c6 (diff) | |
KVM: x86: fix CR8 handling
The handling of CR8 writes in KVM is currently somewhat cumbersome.
This patch makes it look like the other CR register handlers
and fixes a possible issue in VMX, where the RIP would be incremented
despite an injected #GP.
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/kvm_host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 4461429957a9..cb5cad2f2d46 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h | |||
| @@ -661,7 +661,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason, | |||
| 661 | int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0); | 661 | int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0); |
| 662 | int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3); | 662 | int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3); |
| 663 | int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4); | 663 | int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4); |
| 664 | void kvm_set_cr8(struct kvm_vcpu *vcpu, unsigned long cr8); | 664 | int kvm_set_cr8(struct kvm_vcpu *vcpu, unsigned long cr8); |
| 665 | int kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val); | 665 | int kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val); |
| 666 | int kvm_get_dr(struct kvm_vcpu *vcpu, int dr, unsigned long *val); | 666 | int kvm_get_dr(struct kvm_vcpu *vcpu, int dr, unsigned long *val); |
| 667 | unsigned long kvm_get_cr8(struct kvm_vcpu *vcpu); | 667 | unsigned long kvm_get_cr8(struct kvm_vcpu *vcpu); |