diff options
| author | Paolo Bonzini | 2014-08-20 10:05:08 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-08-20 13:01:25 +0200 |
| commit | 592f085847f4ea753586dfe6ce75ba37d5992a45 (patch) | |
| tree | 6780373a2b26a9205793c75c2f5e312b29ea055a | |
| parent | KVM: x86: Clarify PMU related features bit manipulation (diff) | |
| download | kernel-qcow2-linux-592f085847f4ea753586dfe6ce75ba37d5992a45.tar.gz kernel-qcow2-linux-592f085847f4ea753586dfe6ce75ba37d5992a45.tar.xz kernel-qcow2-linux-592f085847f4ea753586dfe6ce75ba37d5992a45.zip | |
KVM: emulate: do not return X86EMUL_PROPAGATE_FAULT explicitly
Always get it through emulate_exception or emulate_ts. This
ensures that the ctxt->exception fields have been populated.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | arch/x86/kvm/emulate.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index ef297919a691..4fbf4b598f92 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1549,8 +1549,7 @@ load: ctxt->ops->set_segment(ctxt, selector, &seg_desc, base3, seg); return X86EMUL_CONTINUE; exception: - emulate_exception(ctxt, err_vec, err_code, true); - return X86EMUL_PROPAGATE_FAULT; + return emulate_exception(ctxt, err_vec, err_code, true); } static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt, @@ -2723,8 +2722,7 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt, if (!next_tss_desc.p || ((desc_limit < 0x67 && (next_tss_desc.type & 8)) || desc_limit < 0x2b)) { - emulate_ts(ctxt, tss_selector & 0xfffc); - return X86EMUL_PROPAGATE_FAULT; + return emulate_ts(ctxt, tss_selector & 0xfffc); } if (reason == TASK_SWITCH_IRET || reason == TASK_SWITCH_JMP) { @@ -3016,7 +3014,7 @@ static int em_movbe(struct x86_emulate_ctxt *ctxt) ctxt->dst.val = swab64(ctxt->src.val); break; default: - return X86EMUL_PROPAGATE_FAULT; + BUG(); } return X86EMUL_CONTINUE; } |