diff options
author | Gleb Natapov <gleb@redhat.com> | 2011-02-21 12:07:58 +0200 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-03-17 13:08:31 -0300 |
commit | a8ba6c2622036101d0c6a195f97546bcb1a056ab (patch) | |
tree | 11979981ad9f49b379cadfe02c9718b9deec1f27 /arch/x86/kvm | |
parent | a3b5ba49a8c58d9a578e016523b047467a41e047 (diff) | |
download | linux-stable-a8ba6c2622036101d0c6a195f97546bcb1a056ab.tar.gz linux-stable-a8ba6c2622036101d0c6a195f97546bcb1a056ab.tar.bz2 linux-stable-a8ba6c2622036101d0c6a195f97546bcb1a056ab.zip |
KVM: VMX: update live TR selector if it changes in real mode
When rmode.vm86 is active TR descriptor is updated with vm86 task values,
but selector is left intact. vmx_set_segment() makes sure that if TR
register is written into while vm86 is active the new values are saved
for use after vm86 is deactivated, but since selector is not updated on
vm86 activation/deactivation new value is lost. Fix this by writing new
selector into vmcs immediately.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/vmx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index a61ed93a1f25..dafb67eddd60 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2138,6 +2138,7 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu, u32 ar; if (vmx->rmode.vm86_active && seg == VCPU_SREG_TR) { + vmcs_write16(sf->selector, var->selector); vmx->rmode.tr.selector = var->selector; vmx->rmode.tr.base = var->base; vmx->rmode.tr.limit = var->limit; |