diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-27 14:27:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-27 14:27:56 -0800 |
| commit | 2ea0718884c520f85c869c3bfef57477316ea91f (patch) | |
| tree | 560be7967d411d2ce19162c6402f51983d860ee7 /drivers/kvm/kvm_main.c | |
| parent | 9c8ff4f4dac189e4111238d54c2b12e7837f4818 (diff) | |
| parent | 404fb881b82cf0cf6981832f8d31a7484e4dee81 (diff) | |
| download | kernel-crypto-2ea0718884c520f85c869c3bfef57477316ea91f.tar.gz kernel-crypto-2ea0718884c520f85c869c3bfef57477316ea91f.tar.xz kernel-crypto-2ea0718884c520f85c869c3bfef57477316ea91f.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: SVM: Fix FPU leak while emulating clts
KVM: SVM: Unload guest fpu on vcpu_put()
KVM: x86 emulator: Use emulator_write_emulated and not emulator_write_std
KVM: x86 emulator: fix the saving of of the eip value
KVM: x86 emulator: fix JMP_REL
Diffstat (limited to 'drivers/kvm/kvm_main.c')
| -rw-r--r-- | drivers/kvm/kvm_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 07ae280e8fe..47c10b8f89b 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -1188,8 +1188,7 @@ int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address) int emulate_clts(struct kvm_vcpu *vcpu) { - vcpu->cr0 &= ~X86_CR0_TS; - kvm_x86_ops->set_cr0(vcpu, vcpu->cr0); + kvm_x86_ops->set_cr0(vcpu, vcpu->cr0 & ~X86_CR0_TS); return X86EMUL_CONTINUE; } |