]> xenbits.xensource.com Git - xen.git/commitdiff
x86/mm: silence a pointless warning
authorJan Beulich <jbeulich@suse.com>
Thu, 4 May 2017 13:04:29 +0000 (15:04 +0200)
committerJan Beulich <jbeulich@suse.com>
Thu, 4 May 2017 13:04:29 +0000 (15:04 +0200)
get_page() logs a message when it fails (dom_cow is never dying or
paging_mode_external()), so better avoid the call when it's pointless
to do anyway.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: George Dunlap <george.dunlap@citrix.com>
Release-acked-by: Julien Grall <julien.grall@arm.com>
xen/arch/x86/mm/p2m.c

index 1d57e5c0550bc23fedb4e9a0c49e7a0b101726a3..ae70a920b58e16bd75bc367ee918b572fc84c31c 100644 (file)
@@ -501,9 +501,9 @@ struct page_info *get_page_from_gfn_p2m(
                 if ( fdom == NULL )
                     page = NULL;
             }
-            else if ( !get_page(page, d)
+            else if ( !get_page(page, d) &&
                       /* Page could be shared */
-                      && !get_page(page, dom_cow) )
+                      (!p2m_is_shared(*t) || !get_page(page, dom_cow)) )
                 page = NULL;
         }
         p2m_read_unlock(p2m);