[Xen-changelog] [xen-unstable] xenpaging: catch xc_mem_paging_resume errors

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1307695639 -7200
# Node ID 49cb290ede16c24d777309958d8a6236bc2028d2
# Parent  e48535e70145b8b56a6149a86339896f4fee021b
xenpaging: catch xc_mem_paging_resume errors

In the unlikely event that xc_mem_paging_resume() fails, do not overwrite the
error with the return value from xc_evtchn_notify()

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---


diff -r e48535e70145 -r 49cb290ede16 tools/xenpaging/xenpaging.c
--- a/tools/xenpaging/xenpaging.c       Fri Jun 10 10:47:18 2011 +0200
+++ b/tools/xenpaging/xenpaging.c       Fri Jun 10 10:47:19 2011 +0200
@@ -442,8 +442,9 @@
     /* Tell Xen page is ready */
     ret = xc_mem_paging_resume(paging->xc_handle, paging->mem_event.domain_id,
                                rsp->gfn);
-    ret = xc_evtchn_notify(paging->mem_event.xce_handle,
-                           paging->mem_event.port);
+    if ( ret == 0 ) 
+        ret = xc_evtchn_notify(paging->mem_event.xce_handle,
+                               paging->mem_event.port);
 
  out:
     return ret;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog