diff options
| author | Gleb Natapov <gleb@redhat.com> | 2010-03-18 09:20:19 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 05:16:18 -0400 |
| commit | ceffb4597253b2420d2f171d8b1cdf2cd3137989 (patch) | |
| tree | 474379bfd74cb0e3c81063f7bc24d4b51560ad46 /arch/x86/kvm/emulate.c | |
| parent | 2e873022f511b82a5318c7af179f588f08d68cb9 (diff) | |
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>
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 702bffffd27f..8225ec26efed 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, | |||
| 2291 | u16 old_tss_sel = ops->get_segment_selector(VCPU_SREG_TR, ctxt->vcpu); | 2291 | u16 old_tss_sel = ops->get_segment_selector(VCPU_SREG_TR, ctxt->vcpu); |
| 2292 | ulong old_tss_base = | 2292 | ulong old_tss_base = |
| 2293 | get_cached_descriptor_base(ctxt, ops, VCPU_SREG_TR); | 2293 | get_cached_descriptor_base(ctxt, ops, VCPU_SREG_TR); |
| 2294 | u32 desc_limit; | ||
| 2294 | 2295 | ||
| 2295 | /* FIXME: old_tss_base == ~0 ? */ | 2296 | /* FIXME: old_tss_base == ~0 ? */ |
| 2296 | 2297 | ||
| @@ -2311,7 +2312,10 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt, | |||
| 2311 | } | 2312 | } |
| 2312 | } | 2313 | } |
| 2313 | 2314 | ||
| 2314 | if (!next_tss_desc.p || desc_limit_scaled(&next_tss_desc) < 0x67) { | 2315 | desc_limit = desc_limit_scaled(&next_tss_desc); |
| 2316 | if (!next_tss_desc.p || | ||
| 2317 | ((desc_limit < 0x67 && (next_tss_desc.type & 8)) || | ||
| 2318 | desc_limit < 0x2b)) { | ||
| 2315 | kvm_queue_exception_e(ctxt->vcpu, TS_VECTOR, | 2319 | kvm_queue_exception_e(ctxt->vcpu, TS_VECTOR, |
| 2316 | tss_selector & 0xfffc); | 2320 | tss_selector & 0xfffc); |
| 2317 | return X86EMUL_PROPAGATE_FAULT; | 2321 | return X86EMUL_PROPAGATE_FAULT; |