diff options
| author | Avi Kivity <avi@redhat.com> | 2010-06-10 17:02:16 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-08-01 10:46:35 +0300 |
| commit | 2390218b6aa2eb3784b0a82fa811c19097dc793a (patch) | |
| tree | facf41c6ed5c3d2eafa939e7ab9209cc1594cddb /arch/x86/kvm/mmu.c | |
| parent | a83b29c6ad6d6497e569edbc29e556a384cebddd (diff) | |
| download | lwn-2390218b6aa2eb3784b0a82fa811c19097dc793a.tar.gz lwn-2390218b6aa2eb3784b0a82fa811c19097dc793a.zip | |
KVM: Fix mov cr3 #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/kvm/mmu.c')
| -rw-r--r-- | arch/x86/kvm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 4706a936e36f..aa98fca03ed7 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -3203,7 +3203,7 @@ static int kvm_pv_mmu_write(struct kvm_vcpu *vcpu, static int kvm_pv_mmu_flush_tlb(struct kvm_vcpu *vcpu) { - kvm_set_cr3(vcpu, vcpu->arch.cr3); + (void)kvm_set_cr3(vcpu, vcpu->arch.cr3); return 1; } |