diff options
| author |   Avi Kivity <avi@redhat.com> | 2010-06-10 17:02:14 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-08-01 10:46:32 +0300 |
| commit | 49a9b07edcf4aff159c1f3d3a27e58cf38bc27cd (patch) | |
| tree | 750ff11b09e7baa3f4c811ce7c85bf7546b051ae /arch/x86/include | |
| parent | KVM: VMX: Enable XSAVE/XRSTOR for guest (diff) | |
| download | linux-dev-49a9b07edcf4aff159c1f3d3a27e58cf38bc27cd.tar.xz linux-dev-49a9b07edcf4aff159c1f3d3a27e58cf38bc27cd.zip | |
KVM: Fix mov cr0 #GP at wrong instruction
On Intel, we call skip_emulated_instruction() even if we injected a #GP,
resulting in the #GP pointing at the wrong address.
Fix by injecting the exception and skipping the instruction at the same place,
so we can do just one or the other.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/include')
| -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 91631b8b2090..b23708450210 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -597,7 +597,7 @@ int kvm_load_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector, int seg); int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason, bool has_error_code, u32 error_code); -void kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0); +int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0); void kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3); void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4); void kvm_set_cr8(struct kvm_vcpu *vcpu, unsigned long cr8); |