Home » Mailing list archives » git-commits-head » 2010 » May » 22

KVM: Use task switch from emulator.c

Previous thread: KVM: x86 emulator: Use load_segment_descriptor() instead of kvm_load_segment_descriptor() by Linux Kernel Mailing List on Friday, May 21, 2010 - 6:00 pm. (1 message)

Next thread: KVM: x86 emulator: during rep emulation decrement ECX only if emulation succeeded by Linux Kernel Mailing List on Friday, May 21, 2010 - 6:00 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: KVM: Use task switch from emulator.c
Date: Friday, May 21, 2010 - 6:00 pm

Gitweb:     http://git.kernel.org/linus/ceffb4597253b2420d2f171d8b1cdf2cd3137989
Commit:     ceffb4597253b2420d2f171d8b1cdf2cd3137989
Parent:     2e873022f511b82a5318c7af179f588f08d68cb9
Author:     Gleb Natapov <gleb@redhat.com>
AuthorDate: Thu Mar 18 15:20:19 2010 +0200
Committer:  Avi Kivity <avi@redhat.com>
CommitDate: Mon May 17 12:16:18 2010 +0300

    KVM: Use task switch from emulator.c
    
    Remove old task switch code from x86.c
    
    Signed-off-by: Gleb Natapov <gleb@redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
 arch/x86/kvm/emulate.c |    6 +-
 arch/x86/kvm/x86.c     |  561 ++----------------------------------------------
 2 files changed, 22 insertions(+), 545 deletions(-)

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 702bfff..8225ec2 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2291,6 +2291,7 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
 	u16 old_tss_sel = ops->get_segment_selector(VCPU_SREG_TR, ctxt->vcpu);
 	ulong old_tss_base =
 		get_cached_descriptor_base(ctxt, ops, VCPU_SREG_TR);
+	u32 desc_limit;
 
 	/* FIXME: old_tss_base == ~0 ? */
 
@@ -2311,7 +2312,10 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
 		}
 	}
 
-	if (!next_tss_desc.p || desc_limit_scaled(&next_tss_desc) < 0x67) {
+	desc_limit = desc_limit_scaled(&next_tss_desc);
+	if (!next_tss_desc.p ||
+	    ((desc_limit < 0x67 && (next_tss_desc.type & 8)) ||
+	     desc_limit < 0x2b)) {
 		kvm_queue_exception_e(ctxt->vcpu, TS_VECTOR,
 				      tss_selector & 0xfffc);
 		return X86EMUL_PROPAGATE_FAULT;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fbee8fb..f69854c 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4832,557 +4832,30 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
 	return 0;
 }
 
-static void seg_desct_to_kvm_desct(struct desc_struct *seg_desc, u16 selector,
-				   struct kvm_segment ...
[ message continues ]
Previous thread: KVM: x86 emulator: Use load_segment_descriptor() instead of kvm_load_segment_descriptor() by Linux Kernel Mailing List on Friday, May 21, 2010 - 6:00 pm. (1 message)

Next thread: KVM: x86 emulator: during rep emulation decrement ECX only if emulation succeeded by Linux Kernel Mailing List on Friday, May 21, 2010 - 6:00 pm. (1 message)