diff options
author | Olaf Hering <olaf@aepfle.de> | 2012-04-17 18:18:49 +0100 |
---|---|---|
committer | Olaf Hering <olaf@aepfle.de> | 2012-04-17 18:18:49 +0100 |
commit | 75f1b60ed083fd1d9bf3feb7c79c2883d884ad78 (patch) | |
tree | a64313dfb655f1a857fd9f75e27faf70b2e4c9d0 /tools/libvchan | |
parent | 55fb80266efe5583fe34ac62a93cee55bd30a44b (diff) | |
download | xen-75f1b60ed083fd1d9bf3feb7c79c2883d884ad78.tar.gz xen-75f1b60ed083fd1d9bf3feb7c79c2883d884ad78.tar.bz2 xen-75f1b60ed083fd1d9bf3feb7c79c2883d884ad78.zip |
tools/libvchan: Remove unwanted debugging code
-O2 -Wall -Werror triggers these warnings:
io.c: In function 'do_send':
io.c:196: warning: ignoring return value of 'writev', declared with attribute warn_unused_result
io.c: In function 'do_recv':
io.c:287: warning: ignoring return value of 'writev', declared with attribute warn_unused_result
writev to -1 will always fail, silence the warning by removing the offending
(disabled) debug code.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libvchan')
-rw-r--r-- | tools/libvchan/io.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 1b2e94a6e7..3c8d236e52 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -49,11 +49,6 @@ #define PAGE_SIZE 4096 #endif -// allow vchan data to be easily observed in strace by doing a -// writev() to FD -1 with the data being read/written. -#ifndef VCHAN_DEBUG -#define VCHAN_DEBUG 0 -#endif static inline uint32_t rd_prod(struct libxenvchan *ctrl) { @@ -186,15 +181,6 @@ static int do_send(struct libxenvchan *ctrl, const void *data, size_t size) { int real_idx = wr_prod(ctrl) & (wr_ring_size(ctrl) - 1); int avail_contig = wr_ring_size(ctrl) - real_idx; - if (VCHAN_DEBUG) { - char metainfo[32]; - struct iovec iov[2]; - iov[0].iov_base = metainfo; - iov[0].iov_len = snprintf(metainfo, 32, "vchan@%p wr", ctrl); - iov[1].iov_base = (void *)data; - iov[1].iov_len = size; - writev(-1, iov, 2); - } if (avail_contig > size) avail_contig = size; xen_mb(); /* read indexes /then/ write data */ @@ -277,15 +263,6 @@ static int do_recv(struct libxenvchan *ctrl, void *data, size_t size) } xen_mb(); /* consume /then/ notify */ rd_cons(ctrl) += size; - if (VCHAN_DEBUG) { - char metainfo[32]; - struct iovec iov[2]; - iov[0].iov_base = metainfo; - iov[0].iov_len = snprintf(metainfo, 32, "vchan@%p rd", ctrl); - iov[1].iov_base = data; - iov[1].iov_len = size; - writev(-1, iov, 2); - } if (send_notify(ctrl, VCHAN_NOTIFY_READ)) return -1; return size; |