From: Tamas K Lengyel <tklengyel@sec.in.tum.de>
Date: Fri, 26 Sep 2014 14:29:34 +0000 (+0200)
Subject: mem_event: relax error condition on debug builds
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4310
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab239693c763ecb50278e31ffa0daf7b48cec9da;p=xen.git

mem_event: relax error condition on debug builds

A faulty tool stack can brick a debug hypervisor. Unpleasant while dev/test.

Suggested-by: Andres Lagar Cavilla <andres@lagarcavilla.org>
Signed-off-by: Tamas K Lengyel <tklengyel@sec.in.tum.de>
Acked-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/common/mem_event.c b/xen/common/mem_event.c
index a7e97670a3..a0f75b2ac3 100644
--- a/xen/common/mem_event.c
+++ b/xen/common/mem_event.c
@@ -285,7 +285,11 @@ void mem_event_put_request(struct domain *d,
     if ( current->domain != d )
     {
         req->flags |= MEM_EVENT_FLAG_FOREIGN;
-        ASSERT( !(req->flags & MEM_EVENT_FLAG_VCPU_PAUSED) );
+#ifndef NDEBUG
+        if ( !(req->flags & MEM_EVENT_FLAG_VCPU_PAUSED) )
+            gdprintk(XENLOG_G_WARNING, "d%dv%d was not paused.\n",
+                     d->domain_id, req->vcpu_id);
+#endif
     }
 
     mem_event_ring_lock(med);