bitkeeper revision 1.1681 (42a4172fYhXBx6d4aXa2ofB5qVB2Ww)

xc_gnttab.c, xc_evtchn.c:
  Cleanup error message printing and error exit code path.
xc_vmx_build.c, xc_private.c, xc_plan9_build.c, xc_linux_build.c:
  Cleanup error message printing.
Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

1 files changed, 7 insertions, 6 deletions

diff --git a/tools/libxc/xc_evtchn.c b/tools/libxc/xc_evtchn.c
index 8ee2fd11ee..1c0294d83b 100644
--- a/tools/libxc/xc_evtchn.c
+++ b/tools/libxc/xc_evtchn.c
@@ -19,15 +19,16 @@ static int do_evtchn_op(int xc_handle, evtchn_op_t *op)
 
     if ( mlock(op, sizeof(*op)) != 0 )
     {
-        PERROR("Could not lock memory for Xen hypercall");
-        goto out1;
+        PERROR("do_evtchn_op: op mlock failed");
+        goto out;
     }
 
-    if ( (ret = do_xen_hypercall(xc_handle, &hypercall)) < 0 )
-        goto out2;
+    if ((ret = do_xen_hypercall(xc_handle, &hypercall)) < 0)
+        ERROR("do_evtchn_op: HYPERVISOR_event_channel_op failed: %d", ret);
 
- out2: (void)munlock(op, sizeof(*op));
- out1: return ret;
+    (void)munlock(op, sizeof(*op));
+ out:
+    return ret;
 }