| Message ID | 3a8a7eb3-4822-0234-47de-c83973b4b5eb@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86/p2m: misc page add/remove adjustments | expand |
On 01/04/2020 12:40, Jan Beulich wrote: > The domain is being passed in - no need to obtain it from p2m->domain. > Also drop a pointless cast while touching this code anyway. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> > > --- a/xen/arch/x86/mm/p2m.c > +++ b/xen/arch/x86/mm/p2m.c > @@ -905,7 +905,7 @@ guest_physmap_add_entry(struct domain *d > 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_add(gfn, i))); Same as patch 3. I'd recommend "gfn_x(gfn) + i" in preference (seeing as you're cleaning up this line anyway). Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> seeing as you didn't introduce it, but preferably with it changed. ~Andrew
--- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -905,7 +905,7 @@ guest_physmap_add_entry(struct domain *d 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_add(gfn, i))); if ( rc ) { p2m_unlock(p2m); @@ -922,8 +922,7 @@ guest_physmap_add_entry(struct domain *d * 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_add(gfn, i)), false); return rc; } omfn = p2m->get_entry(p2m, gfn_add(gfn, i),
The domain is being passed in - no need to obtain it from p2m->domain. Also drop a pointless cast while touching this code anyway. Signed-off-by: Jan Beulich <jbeulich@suse.com>