[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/8] usb-mtp: replace the homebrew write with qemu_wr
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 8/8] usb-mtp: replace the homebrew write with qemu_write_full |
Date: |
Wed, 30 Jan 2019 08:34:26 +0100 |
From: Bandan Das <address@hidden>
qemu_write_full takes care of partial blocking writes,
as in cases of larger file sizes
Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Bandan Das <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-mtp.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 2ca25c9da5..f1d20fa1b9 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -1632,24 +1632,16 @@ static char *utf16_to_str(uint8_t len, uint16_t *arr)
/* Wrapper around write, returns 0 on failure */
static uint64_t write_retry(int fd, void *buf, uint64_t size, off_t offset)
{
- uint64_t bytes_left = size, ret;
+ uint64_t ret = 0;
if (lseek(fd, offset, SEEK_SET) < 0) {
goto done;
}
- while (bytes_left > 0) {
- ret = write(fd, buf, bytes_left);
- if ((ret == -1) && (errno != EINTR || errno != EAGAIN ||
- errno != EWOULDBLOCK)) {
- break;
- }
- bytes_left -= ret;
- buf += ret;
- }
+ ret = qemu_write_full(fd, buf, size);
done:
- return size - bytes_left;
+ return ret;
}
static void usb_mtp_update_object(MTPObject *parent, char *name)
--
2.9.3
- [Qemu-devel] [PULL 0/8] Usb 20190130 patches, Gerd Hoffmann, 2019/01/30
- [Qemu-devel] [PULL 2/8] usb: dev-mtp: close fd in usb_mtp_object_readdir(), Gerd Hoffmann, 2019/01/30
- [Qemu-devel] [PULL 7/8] usb-mtp: breakup MTP write into smaller chunks, Gerd Hoffmann, 2019/01/30
- [Qemu-devel] [PULL 6/8] usb-mtp: Reallocate buffer in multiples of MTP_WRITE_BUF_SZ, Gerd Hoffmann, 2019/01/30
- [Qemu-devel] [PULL 1/8] usb: assign unique serial numbers to hid devices, Gerd Hoffmann, 2019/01/30
- [Qemu-devel] [PULL 8/8] usb-mtp: replace the homebrew write with qemu_write_full,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 4/8] usb: XHCI shall not halt isochronous endpoints, Gerd Hoffmann, 2019/01/30
- [Qemu-devel] [PULL 5/8] usb: implement XHCI underrun/overrun events, Gerd Hoffmann, 2019/01/30
- [Qemu-devel] [PULL 3/8] hw/usb: Fix LGPL information in the file headers, Gerd Hoffmann, 2019/01/30
- Re: [Qemu-devel] [PULL 0/8] Usb 20190130 patches, Peter Maydell, 2019/01/31
- Re: [Qemu-devel] [PULL 0/8] Usb 20190130 patches, no-reply, 2019/01/31