From c6f804844093292aaab2bcc9433a5e3953c188c8 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 20 Aug 2008 15:07:31 +0300 Subject: [PATCH] --- yaml --- r: 115279 b: refs/heads/master c: 5706be0dafd6f42852f85fbae292301dcad4ccec h: refs/heads/master i: 115277: 88bb9b8beee1dda41a4335035fc3b0b447542478 115275: ead3c96128498fcab0612c9baea8cbb5ae107546 115271: ec2f5246ba975a1d7a97b8e4fecfcf33f846e102 115263: 34a9d92f67d47abf5c9032a1ecfe68c87e497fed v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18241f39e52b..b562475deed5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26815a648e1ec2b338a63a2bc301dcf449b93e5a +refs/heads/master: 5706be0dafd6f42852f85fbae292301dcad4ccec diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index 9840f37925a2..6aa305ace79f 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -2239,6 +2239,7 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu) fx_init(&vmx->vcpu); + seg_setup(VCPU_SREG_CS); /* * GUEST_CS_BASE should really be 0xffff0000, but VT vm86 mode * insists on having GUEST_CS_BASE == GUEST_CS_SELECTOR << 4. Sigh. @@ -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_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_ES);