On 23/01/2023 3:08 pm, Jan Beulich wrote: > On 23.01.2023 15:26, Jan Beulich wrote: >> Do away with the partly mis-named "mmio" label there, which really is >> only about emulated MMIO. Move the code to the place where the sole >> "goto" was. Re-order steps slightly: Assertion first, perfc increment >> outside of the locked region, and "gpa" calculation closer to the first >> use of the variable. Also make the HVM conditional cover the entire >> if(), as p2m_mmio_dm isn't applicable to PV; specifically get_gfn() >> won't ever return this type for PV domains. >> >> Signed-off-by: Jan Beulich <jbeul...@suse.com> >> --- >> v2: New. >> >> --- a/xen/arch/x86/mm/shadow/multi.c >> +++ b/xen/arch/x86/mm/shadow/multi.c > I've sent a stale patch, I'm sorry. This further hunk is needed to keep > !HVM builds working: > > @@ -2144,8 +2144,8 @@ static int cf_check sh_page_fault( > gfn_t gfn = _gfn(0); > mfn_t gmfn, sl1mfn = _mfn(0); > shadow_l1e_t sl1e, *ptr_sl1e; > - paddr_t gpa; > #ifdef CONFIG_HVM > + paddr_t gpa; > struct sh_emulate_ctxt emul_ctxt; > const struct x86_emulate_ops *emul_ops; > int r;
Acked-by: Andrew Cooper <andrew.coop...@citrix.com>
