diff options
| author |  Chao Peng <chao.p.peng@linux.intel.com>
| 2017-02-21 03:50:01 -0500 |
|---|---|---|
| committer |  Paolo Bonzini <pbonzini@redhat.com>
| 2017-02-21 12:45:49 +0100 |
| commit | 96794e4ed4d758272c486e1529e431efb7045265 (patch) | |
| tree | 18a5c8d9a7ef8366b38587394f62732b7549f4f1 /arch | |
| parent | x86/kvm/vmx: Defer TR reload after VM exit (diff) | |
| download | linux-96794e4ed4d758272c486e1529e431efb7045265.tar.gz linux-96794e4ed4d758272c486e1529e431efb7045265.tar.bz2 linux-96794e4ed4d758272c486e1529e431efb7045265.zip | |
KVM: VMX: use correct vmcs_read/write for guest segment selector/base
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.
Cc: stable@vger.kernel.org
Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch')
| -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 acf6013a0caf..ef4ba71dbb66 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3905,7 +3905,7 @@ static void fix_rmode_seg(int seg, struct kvm_segment *save) } 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->ar_bytes, vmx_segment_access_rights(&var)); } @@ -8270,7 +8270,7 @@ static void kvm_flush_pml_buffers(struct kvm *kvm) 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", - name, vmcs_read32(sel), + name, vmcs_read16(sel), vmcs_read32(sel + GUEST_ES_AR_BYTES - GUEST_ES_SELECTOR), vmcs_read32(sel + GUEST_ES_LIMIT - GUEST_ES_SELECTOR), vmcs_readl(sel + GUEST_ES_BASE - GUEST_ES_SELECTOR)); |