evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: cae929bd8d

Change-Id: Icde3175a519f3b74723ad19d43fdfe2e99b01709
This commit is contained in:
Chao Peng 2017-03-15 02:08:58 +00:00 • committed by android-build-merger
commit b0c04f1fbe
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kvm/vmx.c
View file

@ -3499,7 +3499,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));
} }
@ -7905,7 +7905,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));