Commit 5706be0d authored by Avi Kivity's avatar Avi Kivity

KVM: VMX: Change cs reset state to be a data segment

Real mode cs is a data segment, not a code segment.
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 26815a64
...@@ -2239,6 +2239,7 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu) ...@@ -2239,6 +2239,7 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)
fx_init(&vmx->vcpu); fx_init(&vmx->vcpu);
seg_setup(VCPU_SREG_CS);
/* /*
* GUEST_CS_BASE should really be 0xffff0000, but VT vm86 mode * GUEST_CS_BASE should really be 0xffff0000, but VT vm86 mode
* insists on having GUEST_CS_BASE == GUEST_CS_SELECTOR << 4. Sigh. * insists on having GUEST_CS_BASE == GUEST_CS_SELECTOR << 4. Sigh.
...@@ -2250,8 +2251,6 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu) ...@@ -2250,8 +2251,6 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)
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);
} }
vmcs_write32(GUEST_CS_LIMIT, 0xffff);
vmcs_write32(GUEST_CS_AR_BYTES, 0x9b);
seg_setup(VCPU_SREG_DS); seg_setup(VCPU_SREG_DS);
seg_setup(VCPU_SREG_ES); seg_setup(VCPU_SREG_ES);
......
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