From: Wei Liu <wei.liu2@citrix.com>
Date: Wed, 11 Oct 2017 14:03:01 +0000 (+0100)
Subject: Revert "DEBUG PRINTFS"
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1131
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b8ed03ccf2a910323dd9bfc4ce86113551a438c;p=xen.git

Revert "DEBUG PRINTFS"

This reverts commit cf8e5f25a940928550e69b543ed67df1d73f7b09.

It is not supposed to be committed.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libs/call/linux.c b/tools/libs/call/linux.c
index 60531a0aad..3f1b691fe7 100644
--- a/tools/libs/call/linux.c
+++ b/tools/libs/call/linux.c
@@ -42,13 +42,11 @@ int osdep_xencall_open(xencall_handle *xcall)
      * Prefer the newer interface.
      */
     fd = open("/dev/xen/privcmd", O_RDWR|O_CLOEXEC);
-fprintf(stderr,"osdep_xencall_open /dev fd=%d e=%d\n",fd,errno);
 
     if ( fd == -1 && ( errno == ENOENT || errno == ENXIO || errno == ENODEV ))
     {
         /* Fallback to /proc/xen/privcmd */
         fd = open("/proc/xen/privcmd", O_RDWR|O_CLOEXEC);
-fprintf(stderr,"osdep_xencall_open /proc fd=%d e=%d\n",fd,errno);
     }
 
     if ( fd == -1 )
diff --git a/tools/libs/devicemodel/core.c b/tools/libs/devicemodel/core.c
index e93ba55a54..b66d4f9294 100644
--- a/tools/libs/devicemodel/core.c
+++ b/tools/libs/devicemodel/core.c
@@ -566,9 +566,7 @@ int xendevicemodel_shutdown(
 
 int xendevicemodel_restrict(xendevicemodel_handle *dmod, domid_t domid)
 {
-    int r = osdep_xendevicemodel_restrict(dmod, domid);
-fprintf(stderr, "xendevicemodel_restrict r=%d e=%d\n",r,errno);
-    return r;
+    return osdep_xendevicemodel_restrict(dmod, domid);
 }
 
 /*
diff --git a/tools/libs/devicemodel/linux.c b/tools/libs/devicemodel/linux.c
index 9612ca2fd9..0fdc7121f1 100644
--- a/tools/libs/devicemodel/linux.c
+++ b/tools/libs/devicemodel/linux.c
@@ -53,7 +53,6 @@ int osdep_xendevicemodel_open(xendevicemodel_handle *dmod)
         PERROR("Could not obtain handle on privileged command interface");
         return -1;
     }
-fprintf(stderr,"osdep_xendevicemodel_open fd=%d\n",fd);
 
     /*
      * Check to see if IOCTL_PRIVCMD_DM_OP is implemented as we want to
@@ -68,7 +67,6 @@ fprintf(stderr,"osdep_xendevicemodel_open fd=%d\n",fd);
         close(fd);
         fd = -1;
     }
-fprintf(stderr,"osdep_xendevicemodel_open fd=%d after IOCTL_PRIVCMD_DM_OP\n",fd);
 
 out:
     dmod->fd = fd;
@@ -121,8 +119,6 @@ int osdep_xendevicemodel_op(xendevicemodel_handle *dmod,
 int osdep_xendevicemodel_restrict(xendevicemodel_handle *dmod,
                                   domid_t domid)
 {
-fprintf(stderr, "osdep_xendevicemodel_restrict fd=%d\n",dmod->fd);
-
     if (dmod->fd < 0) {
         errno = EOPNOTSUPP;
         return -1;
diff --git a/tools/libs/evtchn/linux.c b/tools/libs/evtchn/linux.c
index c43909b1eb..a581c5d316 100644
--- a/tools/libs/evtchn/linux.c
+++ b/tools/libs/evtchn/linux.c
@@ -38,7 +38,6 @@ int osdep_evtchn_open(xenevtchn_handle *xce)
     if ( fd == -1 )
         return -1;
     xce->fd = fd;
-fprintf(stderr,"osdep_evtchn_open fd=%d\n",fd);
     return 0;
 }
 
diff --git a/tools/libs/foreignmemory/core.c b/tools/libs/foreignmemory/core.c
index 6d438a22c7..79b24d273b 100644
--- a/tools/libs/foreignmemory/core.c
+++ b/tools/libs/foreignmemory/core.c
@@ -132,9 +132,7 @@ int xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
 int xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
                               domid_t domid)
 {
-    int r = osdep_xenforeignmemory_restrict(fmem, domid);
-fprintf(stderr, "xenforeignmemory_restrict r=%d e=%d\n",r,errno);
-    return r;
+    return osdep_xenforeignmemory_restrict(fmem, domid);
 }
 
 /*
diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c
index 1f41cd6ba0..374e45aed5 100644
--- a/tools/libs/foreignmemory/linux.c
+++ b/tools/libs/foreignmemory/linux.c
@@ -40,7 +40,6 @@ int osdep_xenforeignmemory_open(xenforeignmemory_handle *fmem)
 
     /* prefer this newer interface */
     fd = open("/dev/xen/privcmd", O_RDWR|O_CLOEXEC);
-fprintf(stderr,"osdep_xenforeignmemory_open fd=%d\n",fd);
 
     if ( fd == -1 && ( errno == ENOENT || errno == ENXIO || errno == ENODEV ))
     {
@@ -275,7 +274,6 @@ int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
 int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
                                     domid_t domid)
 {
-fprintf(stderr, "osdep_xenforeignmemory_restrict\n");
     return ioctl(fmem->fd, IOCTL_PRIVCMD_RESTRICT, &domid);
 }
 
diff --git a/tools/libs/gnttab/linux.c b/tools/libs/gnttab/linux.c
index ab139f4a26..8347ddd3d9 100644
--- a/tools/libs/gnttab/linux.c
+++ b/tools/libs/gnttab/linux.c
@@ -51,7 +51,6 @@ int osdep_gnttab_open(xengnttab_handle *xgt)
     if ( fd == -1 )
         return -1;
     xgt->fd = fd;
-fprintf(stderr,"osdep_gnttab_open fd=%d\n",fd);
     return 0;
 }