28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
|
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>
|
||
|
|
|
||
|
|
---
|
||
|
|
tools/xenpaging/xenpaging.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
Index: xen-4.1.1-testing/tools/xenpaging/xenpaging.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.1.1-testing.orig/tools/xenpaging/xenpaging.c
|
||
|
|
+++ xen-4.1.1-testing/tools/xenpaging/xenpaging.c
|
||
|
|
@@ -405,8 +405,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;
|