| Message ID | 1480932571-23547-2-git-send-email-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
At 10:09 +0000 on 05 Dec (1480932564), Andrew Cooper wrote: > 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. IMO this hunk was correct in 29a57c992, but it's fine to remove it now. Acked-by: Tim Deegan <tim@xen.org>
On 05/12/16 10:16, Tim Deegan wrote: > At 10:09 +0000 on 05 Dec (1480932564), Andrew Cooper wrote: >> 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. > IMO this hunk was correct in 29a57c992, but it's fine to remove it now. It wasn't necessary in 29a57c992, for the same reason it can be dropped now. Given the comment introduced earlier in 1d60efc57, I'd intended not to have any modification to this path. > > Acked-by: Tim Deegan <tim@xen.org> Thanks, ~Andrew
diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 2696396..f494f7b 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
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 <andrew.cooper3@citrix.com> --- CC: Tim Deegan <tim@xen.org> --- xen/arch/x86/mm/shadow/multi.c | 3 --- 1 file changed, 3 deletions(-)