]> Pileus Git - ~andy/linux/commitdiff
KVM: VMX: Fix incorrect lookup of segment S flag in fix_pmode_dataseg()
authorAvi Kivity <avi@redhat.com>
Tue, 21 Aug 2012 14:06:59 +0000 (17:06 +0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Mon, 27 Aug 2012 23:02:19 +0000 (20:02 -0300)
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>
arch/x86/kvm/vmx.c

index 4e49caf9224dcc51f8bb15bdedd86527447c4d35..1d93079432b33cd7b06f3d4b14f51ca8ea089f2e 100644 (file)
@@ -2693,11 +2693,11 @@ static __exit void hardware_unsetup(void)
        free_kvm_area();
 }
 
-static void fix_pmode_dataseg(int seg, struct kvm_save_segment *save)
+static void fix_pmode_dataseg(int seg, struct kvm_segment *save)
 {
        struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
 
-       if (vmcs_readl(sf->base) == save->base && (save->base & AR_S_MASK)) {
+       if (vmcs_readl(sf->base) == save->base && (save->ar_bytes & AR_S_MASK)) {
                vmcs_write16(sf->selector, save->selector);
                vmcs_writel(sf->base, save->base);
                vmcs_write32(sf->limit, save->limit);