From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 23 Jul 2013 17:06:24 +0000 (+0100)
Subject: xen: arm: panic if we cannot build dom0's p2m.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6604
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc8dbb8b4546b31e0b7d1a7d84d00e02319f245a;p=xen.git

xen: arm: panic if we cannot build dom0's p2m.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
---

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 155b4363b5..056c9dfa0c 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -121,7 +121,8 @@ static int set_memory_reg(struct domain *d, struct kernel_info *kinfo,
         device_tree_set_reg(&new_cell, address_cells, size_cells, start, size);
 
         printk("Populate P2M %#"PRIx64"->%#"PRIx64"\n", start, start + size);
-        p2m_populate_ram(d, start, start + size);
+        if ( p2m_populate_ram(d, start, start + size) < 0 )
+            panic("Failed to populate P2M\n");
         kinfo->mem.bank[kinfo->mem.nr_banks].start = start;
         kinfo->mem.bank[kinfo->mem.nr_banks].size = size;
         kinfo->mem.nr_banks++;