]> xenbits.xensource.com Git - xen.git/commitdiff
memory: don't suppress P2M update in populate_physmap()
authorJan Beulich <jbeulich@suse.com>
Tue, 20 Jun 2017 15:07:12 +0000 (17:07 +0200)
committerJan Beulich <jbeulich@suse.com>
Tue, 20 Jun 2017 15:07:12 +0000 (17:07 +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>
Release-acked-by: Julien Grall <julien.grall@arm.com>
master commit: b964e3106d2cdaa11cc4524181ff14607d110ae4
master date: 2017-06-20 14:51:53 +0200

xen/common/memory.c

index 1105f3effc4a03313fc2ab5a2ccc68602d16873c..5e491bff34aaf2d5244bfb0a0fa39d1064efae74 100644 (file)
@@ -239,8 +239,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);