From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 14 Apr 2014 10:50:56 +0000 (+0200)
Subject: x86/nested HAP: don't BUG() on legitimate error
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5212
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ca73aaf51eba14256794bf045c2eb01e88e1324;p=xen.git

x86/nested HAP: don't BUG() on legitimate error

p2m_set_entry() can fail without there being a bug in the code - crash
the domain rather than the host in that case.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/arch/x86/mm/hap/nested_hap.c b/xen/arch/x86/mm/hap/nested_hap.c
index 5c41725f1d..9d8bfc884e 100644
--- a/xen/arch/x86/mm/hap/nested_hap.c
+++ b/xen/arch/x86/mm/hap/nested_hap.c
@@ -134,7 +134,7 @@ nestedhap_fix_p2m(struct vcpu *v, struct p2m_domain *p2m,
         gdprintk(XENLOG_ERR,
                  "failed to set entry for %#"PRIx64" -> %#"PRIx64" rc:%d\n",
                  L2_gpa, L0_gpa, rc);
-        BUG();
+        domain_crash(p2m->domain);
     }
 }