From b964e3106d2cdaa11cc4524181ff14607d110ae4 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 20 Jun 2017 14:51:53 +0200 Subject: [PATCH] memory: don't suppress P2M update in populate_physmap() 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 Acked-by: Andrew Cooper --- xen/common/memory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 12296d76c7..09d329da0f 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -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); -- 2.30.2