diff options
| author |   Jan Kiszka <jan.kiszka@siemens.com> | 2010-04-14 15:50:57 +0200 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2010-05-17 12:17:44 +0300 |
| commit | 0760d44868f351ba30fc9a08cf1830e46aa72466 (patch) | |
| tree | 55e8a204260c2a301c8da281b52bfef15f21bc1c /arch | |
| parent | KVM: x86: get rid of mmu_only parameter in emulator_write_emulated() (diff) | |
| download | linux-dev-0760d44868f351ba30fc9a08cf1830e46aa72466.tar.xz linux-dev-0760d44868f351ba30fc9a08cf1830e46aa72466.zip | |
KVM: x86: Terminate early if task_switch_16/32 failed
Stop the switch immediately if task_switch_16/32 returned an error. Only
if that step succeeded, the switch should actually take place and update
any register states.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 083b269a83ea..aace5659bbe0 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -2402,6 +2402,8 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt, else ret = task_switch_16(ctxt, ops, tss_selector, old_tss_sel, old_tss_base, &next_tss_desc); + if (ret != X86EMUL_CONTINUE) + return ret; if (reason == TASK_SWITCH_CALL || reason == TASK_SWITCH_GATE) ctxt->eflags = ctxt->eflags | X86_EFLAGS_NT; |