From: Andrew Cooper Date: Fri, 2 Dec 2016 18:23:02 +0000 (+0000) Subject: x86/shadow: Drop stale adjustment in the PAE second-half search X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3278 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=750c5f714b80bf467ccd2af86b7f6ff8d6e578b9;p=xen.git x86/shadow: Drop stale adjustment in the PAE second-half search This shouldn't have been present in c/s 29a57c992 "x86/emul: Rework emulator event injection". It was a leftover from a previous version of the series. This conditional has no effect on the behaviour following it, as both X86EMUL_EXCEPTION and X86EMUL_UNHANDLEABLE fall into the same "return back to guest" path. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 2696396e42..f494f7bd38 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3475,9 +3475,6 @@ static int sh_page_fault(struct vcpu *v, v->arch.paging.last_write_was_pt = 0; r = x86_emulate(&emul_ctxt.ctxt, emul_ops); - if ( r == X86EMUL_EXCEPTION && emul_ctxt.ctxt.event_pending ) - r = X86EMUL_UNHANDLEABLE; - /* * Only continue the search for the second half if there are no * exceptions or pending actions. Otherwise, give up and re-enter