diff options
author | Avi Kivity <avi@redhat.com> | 2010-11-22 10:53:23 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-01-12 04:29:55 -0500 |
commit | 42438e364cbc1e95cacb4ca92688d54a50cf5c4d (patch) | |
tree | f723d950ab745473d69520243438dcaf2d288e57 | |
parent | bcc55cba9f1fcda68412c8c3d8579c56d90b16f2 (diff) |
KVM: x86 emulator: drop dead pf injection in emulate_popf()
If rc == X86EMUL_PROPAGATE_FAULT, we would have returned earlier.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r-- | arch/x86/kvm/emulate.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 16ed6c178bb2..345aa4d3614a 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c | |||
@@ -479,11 +479,6 @@ static void emulate_gp(struct x86_emulate_ctxt *ctxt, int err) | |||
479 | emulate_exception(ctxt, GP_VECTOR, err, true); | 479 | emulate_exception(ctxt, GP_VECTOR, err, true); |
480 | } | 480 | } |
481 | 481 | ||
482 | static void emulate_pf(struct x86_emulate_ctxt *ctxt) | ||
483 | { | ||
484 | emulate_exception(ctxt, PF_VECTOR, 0, true); | ||
485 | } | ||
486 | |||
487 | static void emulate_ud(struct x86_emulate_ctxt *ctxt) | 482 | static void emulate_ud(struct x86_emulate_ctxt *ctxt) |
488 | { | 483 | { |
489 | emulate_exception(ctxt, UD_VECTOR, 0, false); | 484 | emulate_exception(ctxt, UD_VECTOR, 0, false); |
@@ -1184,9 +1179,6 @@ static int emulate_popf(struct x86_emulate_ctxt *ctxt, | |||
1184 | *(unsigned long *)dest = | 1179 | *(unsigned long *)dest = |
1185 | (ctxt->eflags & ~change_mask) | (val & change_mask); | 1180 | (ctxt->eflags & ~change_mask) | (val & change_mask); |
1186 | 1181 | ||
1187 | if (rc == X86EMUL_PROPAGATE_FAULT) | ||
1188 | emulate_pf(ctxt); | ||
1189 | |||
1190 | return rc; | 1182 | return rc; |
1191 | } | 1183 | } |
1192 | 1184 | ||