xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: VMX: Do not fix segment register during vcpu initialization.

Browse Source 
Segment registers will be fixed according to current emulation policy
during switching to real mode for the first time.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Gleb Natapov
2012-12-20 16:57:46 +02:00
committed by Marcelo Tosatti
parent d99e415275
commit d54d07b2ca
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/kvm/vmx.c
View File

@@ -3621,12 +3621,9 @@ static void seg_setup(int seg)
vmcs_write16(sf->selector, 0); vmcs_write16(sf->selector, 0);
vmcs_writel(sf->base, 0); vmcs_writel(sf->base, 0);
vmcs_write32(sf->limit, 0xffff); vmcs_write32(sf->limit, 0xffff);
if (enable_unrestricted_guest) { ar = 0x93;
ar = 0x93; if (seg == VCPU_SREG_CS)
if (seg == VCPU_SREG_CS) ar |= 0x08; /* code segment */
ar |= 0x08; /* code segment */
} else
ar = 0xf3;
vmcs_write32(sf->ar_bytes, ar); vmcs_write32(sf->ar_bytes, ar);
} }
@@ -3967,14 +3964,9 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)
vmx_segment_cache_clear(vmx); vmx_segment_cache_clear(vmx);
seg_setup(VCPU_SREG_CS); seg_setup(VCPU_SREG_CS);
/* if (kvm_vcpu_is_bsp(&vmx->vcpu))
* GUEST_CS_BASE should really be 0xffff0000, but VT vm86 mode
* insists on having GUEST_CS_BASE == GUEST_CS_SELECTOR << 4. Sigh.
*/
if (kvm_vcpu_is_bsp(&vmx->vcpu)) {
vmcs_write16(GUEST_CS_SELECTOR, 0xf000); vmcs_write16(GUEST_CS_SELECTOR, 0xf000);
vmcs_writel(GUEST_CS_BASE, 0x000f0000); else {
} else {
vmcs_write16(GUEST_CS_SELECTOR, vmx->vcpu.arch.sipi_vector << 8); vmcs_write16(GUEST_CS_SELECTOR, vmx->vcpu.arch.sipi_vector << 8);
vmcs_writel(GUEST_CS_BASE, vmx->vcpu.arch.sipi_vector << 12); vmcs_writel(GUEST_CS_BASE, vmx->vcpu.arch.sipi_vector << 12);
} }