diff options
| author | Avi Kivity <avi@redhat.com> | 2010-11-22 16:53:23 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-01-12 10:29:55 +0100 |
| commit | 42438e364cbc1e95cacb4ca92688d54a50cf5c4d (patch) | |
| tree | f723d950ab745473d69520243438dcaf2d288e57 /arch | |
| parent | KVM: x86 emulator: make emulator memory callbacks return full exception (diff) | |
| download | linux-42438e364cbc1e95cacb4ca92688d54a50cf5c4d.tar.xz linux-42438e364cbc1e95cacb4ca92688d54a50cf5c4d.zip | |
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>
Diffstat (limited to 'arch')
| -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) 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) { emulate_exception(ctxt, UD_VECTOR, 0, false); @@ -1184,9 +1179,6 @@ static int emulate_popf(struct x86_emulate_ctxt *ctxt, *(unsigned long *)dest = (ctxt->eflags & ~change_mask) | (val & change_mask); - if (rc == X86EMUL_PROPAGATE_FAULT) - emulate_pf(ctxt); - return rc; } |