Commit 7c3bab18 authored by Chao Peng's avatar Chao Peng Committed by Greg Kroah-Hartman

KVM: VMX: use correct vmcs_read/write for guest segment selector/base

commit 96794e4e upstream.

Guest segment selector is 16 bit field and guest segment base is natural
width field. Fix two incorrect invocations accordingly.

Without this patch, build fails when aggressive inlining is used with ICC.
Signed-off-by: default avatarChao Peng <chao.p.peng@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 035dcc8e
...@@ -3693,7 +3693,7 @@ static void fix_rmode_seg(int seg, struct kvm_segment *save) ...@@ -3693,7 +3693,7 @@ static void fix_rmode_seg(int seg, struct kvm_segment *save)
} }
vmcs_write16(sf->selector, var.selector); vmcs_write16(sf->selector, var.selector);
vmcs_write32(sf->base, var.base); vmcs_writel(sf->base, var.base);
vmcs_write32(sf->limit, var.limit); vmcs_write32(sf->limit, var.limit);
vmcs_write32(sf->ar_bytes, vmx_segment_access_rights(&var)); vmcs_write32(sf->ar_bytes, vmx_segment_access_rights(&var));
} }
...@@ -8202,7 +8202,7 @@ static void kvm_flush_pml_buffers(struct kvm *kvm) ...@@ -8202,7 +8202,7 @@ static void kvm_flush_pml_buffers(struct kvm *kvm)
static void vmx_dump_sel(char *name, uint32_t sel) static void vmx_dump_sel(char *name, uint32_t sel)
{ {
pr_err("%s sel=0x%04x, attr=0x%05x, limit=0x%08x, base=0x%016lx\n", pr_err("%s sel=0x%04x, attr=0x%05x, limit=0x%08x, base=0x%016lx\n",
name, vmcs_read32(sel), name, vmcs_read16(sel),
vmcs_read32(sel + GUEST_ES_AR_BYTES - GUEST_ES_SELECTOR), vmcs_read32(sel + GUEST_ES_AR_BYTES - GUEST_ES_SELECTOR),
vmcs_read32(sel + GUEST_ES_LIMIT - GUEST_ES_SELECTOR), vmcs_read32(sel + GUEST_ES_LIMIT - GUEST_ES_SELECTOR),
vmcs_readl(sel + GUEST_ES_BASE - GUEST_ES_SELECTOR)); vmcs_readl(sel + GUEST_ES_BASE - GUEST_ES_SELECTOR));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment