From: Jan Beulich Date: Fri, 3 Apr 2020 15:17:29 +0000 (+0200) Subject: x86/p2m: use available local variable in guest_physmap_add_entry() X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~431 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d917077b8d0adb78b27d4282a096d98278c52243;p=xen.git x86/p2m: use available local variable in guest_physmap_add_entry() The domain is being passed in - no need to obtain it from p2m->domain. Also drop a pointless cast and simplify expressions while touching this code anyway. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 51b9e2584d..d6e9a4d279 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -902,7 +902,7 @@ guest_physmap_add_entry(struct domain *d, gfn_t gfn, mfn_t mfn, if ( p2m_is_shared(ot) ) { /* Do an unshare to cleanly take care of all corner cases. */ - rc = mem_sharing_unshare_page(p2m->domain, gfn_x(gfn_add(gfn, i))); + rc = mem_sharing_unshare_page(d, gfn_x(gfn) + i); if ( rc ) { p2m_unlock(p2m); @@ -919,8 +919,7 @@ guest_physmap_add_entry(struct domain *d, gfn_t gfn, mfn_t mfn, * Foreign domains are okay to place an event as they * won't go to sleep. */ - (void)mem_sharing_notify_enomem(p2m->domain, - gfn_x(gfn_add(gfn, i)), false); + mem_sharing_notify_enomem(d, gfn_x(gfn) + i, false); return rc; } omfn = p2m->get_entry(p2m, gfn_add(gfn, i),