800917b5a2
- Update to Xen 4.1.2_rc2 c/s 23152 - bnc#716695 - domUs using tap devices will not start updated multi-xvdp.patch - Upstream patches from Jan 23803-intel-pmu-models.patch 23800-x86_64-guest-addr-range.patch 23795-intel-ich10-quirk.patch 23804-x86-IPI-counts.patch - bnc#706106 - Inconsistent reporting of VM names during migration xend-migration-domname-fix.patch - bnc#712823 - L3:Xen guest does not start reliable when rebooted xend-vcpu-affinity-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=143
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.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
|
|
@@ -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;
|