diff options
author | Avi Kivity <avi@redhat.com> | 2012-08-21 10:06:59 -0400 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-27 19:02:19 -0400 |
commit | 72fbefec26841699fee9ad0b050624aeb43d5bae (patch) | |
tree | 29225136e26d4bac235d95e24201bf9488be9a3c /arch/x86/kvm | |
parent | baa7e81e325bbb6ddebd7680ac1068859244b61d (diff) |
KVM: VMX: Fix incorrect lookup of segment S flag in fix_pmode_dataseg()
fix_pmode_dataseg() looks up S in ->base instead of ->ar_bytes.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/vmx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 4e49caf9224d..1d93079432b3 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -2693,11 +2693,11 @@ static __exit void hardware_unsetup(void) | |||
2693 | free_kvm_area(); | 2693 | free_kvm_area(); |
2694 | } | 2694 | } |
2695 | 2695 | ||
2696 | static void fix_pmode_dataseg(int seg, struct kvm_save_segment *save) | 2696 | static void fix_pmode_dataseg(int seg, struct kvm_segment *save) |
2697 | { | 2697 | { |
2698 | struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg]; | 2698 | struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg]; |
2699 | 2699 | ||
2700 | if (vmcs_readl(sf->base) == save->base && (save->base & AR_S_MASK)) { | 2700 | if (vmcs_readl(sf->base) == save->base && (save->ar_bytes & AR_S_MASK)) { |
2701 | vmcs_write16(sf->selector, save->selector); | 2701 | vmcs_write16(sf->selector, save->selector); |
2702 | vmcs_writel(sf->base, save->base); | 2702 | vmcs_writel(sf->base, save->base); |
2703 | vmcs_write32(sf->limit, save->limit); | 2703 | vmcs_write32(sf->limit, save->limit); |