aboutsummaryrefslogtreecommitdiff
path: root/qemu-char.c
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2015-12-23 13:59:04 +0000
committerPaolo Bonzini <pbonzini@redhat.com>2016-01-15 18:58:01 +0100
commit46f296cd3a3ebc3d30e2dbc1da7c4882e3d35ce5 (patch)
tree9c834b82207256d09d1f2aa5d904b4d58d4a090c /qemu-char.c
parentfca10318390dd3c2e9c9e90fbcdff0fe50188dbf (diff)
downloadqemu-46f296cd3a3ebc3d30e2dbc1da7c4882e3d35ce5.zip
qemu-46f296cd3a3ebc3d30e2dbc1da7c4882e3d35ce5.tar.gz
qemu-46f296cd3a3ebc3d30e2dbc1da7c4882e3d35ce5.tar.bz2
qemu-char: delete send_all/recv_all helper methods
The qemu-char.c contains two helper methods send_all and recv_all. These are in fact declared in sockets.h so ought to have been in util/qemu-sockets.c. For added fun the impl of recv_all is completely missing on Win32. Fortunately there is only a single caller of these methods, the TPM passthrough code, which is only ever compiled on Linux. With only a single caller these helpers are not compelling enough to keep so inline them in the TPM code, avoiding the need to fix the missing recv_all on Win32. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-Id: <1450879144-17111-1-git-send-email-berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qemu-char.c')
-rw-r--r--qemu-char.c71
1 files changed, 0 insertions, 71 deletions
diff --git a/qemu-char.c b/qemu-char.c
index 00a7526..d7be185 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -696,77 +696,6 @@ static CharDriverState *qemu_chr_open_mux(const char *id,
}
-#ifdef _WIN32
-int send_all(int fd, const void *buf, int len1)
-{
- int ret, len;
-
- len = len1;
- while (len > 0) {
- ret = send(fd, buf, len, 0);
- if (ret < 0) {
- errno = WSAGetLastError();
- if (errno != WSAEWOULDBLOCK) {
- return -1;
- }
- } else if (ret == 0) {
- break;
- } else {
- buf += ret;
- len -= ret;
- }
- }
- return len1 - len;
-}
-
-#else
-
-int send_all(int fd, const void *_buf, int len1)
-{
- int ret, len;
- const uint8_t *buf = _buf;
-
- len = len1;
- while (len > 0) {
- ret = write(fd, buf, len);
- if (ret < 0) {
- if (errno != EINTR && errno != EAGAIN)
- return -1;
- } else if (ret == 0) {
- break;
- } else {
- buf += ret;
- len -= ret;
- }
- }
- return len1 - len;
-}
-
-int recv_all(int fd, void *_buf, int len1, bool single_read)
-{
- int ret, len;
- uint8_t *buf = _buf;
-
- len = len1;
- while ((len > 0) && (ret = read(fd, buf, len)) != 0) {
- if (ret < 0) {
- if (errno != EINTR && errno != EAGAIN) {
- return -1;
- }
- continue;
- } else {
- if (single_read) {
- return ret;
- }
- buf += ret;
- len -= ret;
- }
- }
- return len1 - len;
-}
-
-#endif /* !_WIN32 */
-
typedef struct IOWatchPoll
{
GSource parent;