diff options
author | Avi Kivity <avi@redhat.com> | 2009-01-04 16:43:42 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-03-24 05:03:00 -0400 |
commit | 9fd4a3b7a412f983696b23121413a79d2132fed6 (patch) | |
tree | 79c1ce7536982efd64fe3d1b1368620b3bb4280c /arch/x86/kvm/vmx.c | |
parent | 1872a3f411ffe95c8e92300e0986a3532db55ce9 (diff) |
KVM: VMX: don't clobber segment AR if emulating invalid state
The ususable bit is important for determining state validity; don't
clobber it.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index be9441056ff2..a6598cbaa001 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -1649,7 +1649,7 @@ static void vmx_get_segment(struct kvm_vcpu *vcpu, | |||
1649 | var->limit = vmcs_read32(sf->limit); | 1649 | var->limit = vmcs_read32(sf->limit); |
1650 | var->selector = vmcs_read16(sf->selector); | 1650 | var->selector = vmcs_read16(sf->selector); |
1651 | ar = vmcs_read32(sf->ar_bytes); | 1651 | ar = vmcs_read32(sf->ar_bytes); |
1652 | if (ar & AR_UNUSABLE_MASK) | 1652 | if ((ar & AR_UNUSABLE_MASK) && !emulate_invalid_guest_state) |
1653 | ar = 0; | 1653 | ar = 0; |
1654 | var->type = ar & 15; | 1654 | var->type = ar & 15; |
1655 | var->s = (ar >> 4) & 1; | 1655 | var->s = (ar >> 4) & 1; |