===== tools/libxc/xc_evtchn.c 1.8 vs edited =====
--- 1.8/tools/libxc/xc_evtchn.c	2004-10-31 17:17:48 +09:00
+++ edited/tools/libxc/xc_evtchn.c	2005-06-05 08:55:20 +09:00
@@ -20,14 +20,15 @@
     if ( mlock(op, sizeof(*op)) != 0 )
     {
         PERROR("Could not lock memory for Xen hypercall");
-        goto out1;
+        goto out;
     }
 
-    if ( (ret = do_xen_hypercall(xc_handle, &hypercall)) < 0 )
-        goto out2;
+    if ((ret = do_xen_hypercall(xc_handle, &hypercall)) < 0)
+            fprintf(stderr, "Channel operation failed.\n");
 
- out2: (void)munlock(op, sizeof(*op));
- out1: return ret;
+    (void)munlock(op, sizeof(*op));
+out: 
+    return ret;
 }
 
 
===== tools/libxc/xc_gnttab.c 1.1 vs edited =====
--- 1.1/tools/libxc/xc_gnttab.c	2005-03-04 11:00:09 +09:00
+++ edited/tools/libxc/xc_gnttab.c	2005-06-05 08:53:41 +09:00
@@ -27,17 +27,15 @@
     if ( mlock(op, sizeof(*op)) != 0 )
     {
         PERROR("Could not lock memory for Xen hypercall");
-        goto out1;
+        goto out;
     }
 
     if ( (ret = do_xen_hypercall(xc_handle, &hypercall)) < 0 )
-    {
-        printf("do_gnttab_op: hypercall returned error %d\n", ret);
-        goto out2;
-    }
+        fprintf(stderr, "do_gnttab_op: hypercall returned error %d\n", ret);
 
- out2: (void)munlock(op, sizeof(*op));
- out1: return ret;
+    (void)munlock(op, sizeof(*op));
+out: 
+    return ret;
 }