Commit 42438e36 authored by Avi Kivity's avatar Avi Kivity

KVM: x86 emulator: drop dead pf injection in emulate_popf()

If rc == X86EMUL_PROPAGATE_FAULT, we would have returned earlier.
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent bcc55cba
...@@ -479,11 +479,6 @@ static void emulate_gp(struct x86_emulate_ctxt *ctxt, int err) ...@@ -479,11 +479,6 @@ static void emulate_gp(struct x86_emulate_ctxt *ctxt, int err)
emulate_exception(ctxt, GP_VECTOR, err, true); emulate_exception(ctxt, GP_VECTOR, err, true);
} }
static void emulate_pf(struct x86_emulate_ctxt *ctxt)
{
emulate_exception(ctxt, PF_VECTOR, 0, true);
}
static void emulate_ud(struct x86_emulate_ctxt *ctxt) static void emulate_ud(struct x86_emulate_ctxt *ctxt)
{ {
emulate_exception(ctxt, UD_VECTOR, 0, false); emulate_exception(ctxt, UD_VECTOR, 0, false);
...@@ -1184,9 +1179,6 @@ static int emulate_popf(struct x86_emulate_ctxt *ctxt, ...@@ -1184,9 +1179,6 @@ static int emulate_popf(struct x86_emulate_ctxt *ctxt,
*(unsigned long *)dest = *(unsigned long *)dest =
(ctxt->eflags & ~change_mask) | (val & change_mask); (ctxt->eflags & ~change_mask) | (val & change_mask);
if (rc == X86EMUL_PROPAGATE_FAULT)
emulate_pf(ctxt);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment