mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
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>
This commit is contained in:
parent
fca1031839
commit
46f296cd3a
3 changed files with 27 additions and 75 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue