File 23589-xenpaging_catch_xc_mem_paging_resume_erro... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File 23589-xenpaging_catch_xc_mem_paging_resume_errors.patch of Package xen (Revision db46a29eba58b7202aa1204a97e352dc)

Currently displaying revision db46a29eba58b7202aa1204a97e352dc , Show latest

changeset:   23589:49cb290ede16
user:        Olaf Hering <olaf@aepfle.de>
date:        Fri Jun 10 10:47:19 2011 +0200
files:       tools/xenpaging/xenpaging.c
description:
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@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>

---
 tools/xenpaging/xenpaging.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.c
===================================================================
--- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.c
+++ xen-4.1.2-testing/tools/xenpaging/xenpaging.c
@@ -442,8 +442,9 @@ static int xenpaging_resume_page(xenpagi
     /* 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;

Places

File 23589-xenpaging_catch_xc_mem_paging_resume_errors.patch of Package xen (Revision db46a29eba58b7202aa1204a97e352dc)

Places