]> xenbits.xensource.com Git - people/iwj/xen.git/commitdiff
memory: don't suppress P2M update in populate_physmap()
authorJan Beulich <jbeulich@suse.com>
Tue, 20 Jun 2017 12:51:53 +0000 (14:51 +0200)
committerJan Beulich <jbeulich@suse.com>
Tue, 20 Jun 2017 12:51:53 +0000 (14:51 +0200)
Commit d18627583d ("memory: don't hand MFN info to translated guests")
wrongly added a null-handle check there - just like stated in its
description for memory_exchange(), the array is also an input for
populate_physmap() (and hence can't reasonably be null). I have no idea
how I've managed to overlook this.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
xen/common/memory.c

index 12296d76c72a8eb8cc2b460c5ad1704b941f031b..09d329da0fd2bd798a830cfa19fccf7353d65d7f 100644 (file)
@@ -248,8 +248,7 @@ static void populate_physmap(struct memop_args *a)
 
             guest_physmap_add_page(d, _gfn(gpfn), _mfn(mfn), a->extent_order);
 
-            if ( !paging_mode_translate(d) &&
-                 !guest_handle_is_null(a->extent_list) )
+            if ( !paging_mode_translate(d) )
             {
                 for ( j = 0; j < (1U << a->extent_order); j++ )
                     set_gpfn_from_mfn(mfn + j, gpfn + j);