qemu-char: delete send_all/recv_all helper methods
PATCH 1/1 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.
--- hw/tpm/tpm_passthrough.c | 29 ++++++++++++++++++-- include/qemu/sockets.h | 2 -- qemu-char.c | 71 ------------------------------------------------ 3 files changed, 27 insertions(+), 75 deletions(-)
hw/tpm/tpm_passthrough.c +27 -2
@@ -83,12 +83,37 @@ static void tpm_passthrough_cancel_cmd(TPMBackend *tb);static int tpm_passthrough_unix_write (int fd,const uint8_t *buf,uint32_t len) { -return send_all (fd, buf, len); +int ret, remain; + + remain = len; +while (len >0 ) { + ret =write (fd, buf, remain); +if (ret <0 ) { +if (errno !=EINTR && errno !=EAGAIN ) { +return -1 ; + } + }else if (ret ==0 ) { +break ; + }else { + buf += ret; + remain -= ret; + } + } +return len - remain; }static int tpm_passthrough_unix_read (int fd,uint8_t *buf,uint32_t len) { -return recv_all (fd, buf, len, true); +int ret; + reread: + ret =read (fd, buf, len); +if (ret <0 ) { +if (errno !=EINTR && errno !=EAGAIN ) { +return -1 ; + } + goto reread; + } +return ret; }static uint32_t tpm_passthrough_get_size_from_buffer (const uint8_t *buf)
include/qemu/sockets.h +0 -2
@@ -40,8 +40,6 @@ int socket_set_nodelay(int fd);void qemu_set_block (int fd);void qemu_set_nonblock (int fd);int socket_set_fast_reuse (int fd); -int send_all (int fd,const void *buf,int len1); -int recv_all (int fd,void *buf,int len1,bool single_read);#ifdef WIN32 /* Windows has different names for the same constants with the same values */
qemu-char.c +0 -71
77 lines not on this page · raw message
Signature · 1 line
2.5.0
Paolo Bonzini
AppliedQuoted 149 lines · Daniel P. Berrange
The
qemu-char.ccontains two helper methodssend_allandrecv_all. These are in fact declared insockets.hso ought to have been inutil/qemu-sockets.c. For added fun the impl ofrecv_allis 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_allon Win32.Signed-off-by Daniel P. Berrange <[email protected]>--- hw/tpm/tpm_passthrough.c | 29 ++++++++++++++++++-- include/qemu/sockets.h | 2 -- qemu-char.c | 71 ------------------------------------------------ 3 files changed, 27 insertions(+), 75 deletions(-)hw/tpm/tpm_passthrough.c +27
-2@@ -83,12 +83,37 @@ static void tpm_passthrough_cancel_cmd(TPMBackend *tb);static int tpm_passthrough_unix_write (int fd,const uint8_t *buf,uint32_t len) { -return send_all (fd, buf, len); +int ret, remain; + + remain = len; +while (len >0 ) { + ret =write (fd, buf, remain); +if (ret <0 ) { +if (errno !=EINTR && errno !=EAGAIN ) { +return -1 ; + } + }else if (ret ==0 ) { +break ; + }else { + buf += ret; + remain -= ret; + } + } +return len - remain; }static int tpm_passthrough_unix_read (int fd,uint8_t *buf,uint32_t len) { -return recv_all (fd, buf, len, true); +int ret; + reread: + ret =read (fd, buf, len); +if (ret <0 ) { +if (errno !=EINTR && errno !=EAGAIN ) { +return -1 ; + } + goto reread; + } +return ret; }static uint32_t tpm_passthrough_get_size_from_buffer (const uint8_t *buf)include/qemu/sockets.h +0
-2@@ -40,8 +40,6 @@ int socket_set_nodelay(int fd);void qemu_set_block (int fd);void qemu_set_nonblock (int fd);int socket_set_fast_reuse (int fd); -int send_all (int fd,const void *buf,int len1); -int recv_all (int fd,void *buf,int len1,bool single_read);#ifdef WIN32 /* Windows has different names for the same constants with the same values */ qemu-char.c +0
-64@@ -695,77 +695,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;
qemu-char.c static CharDriverState *qemu_chr_open_mux(const char *id, · line 700
Quoted 10 lines
qemu-char.c +0
-7- } - } -return len1 - len; -} - -#endif /* !_WIN32 */ - typedef struct IOWatchPoll { GSource parent;
Queued, thanks.
Paolo