[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] usb: mtp: reply INCOMPLETE_TRANSFER on read er
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 10/10] usb: mtp: reply INCOMPLETE_TRANSFER on read errors |
Date: |
Mon, 5 May 2014 13:12:39 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Peter Wu <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
hw/usb/dev-mtp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 62428d8..943f930 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -50,6 +50,7 @@ enum mtp_code {
RES_INVALID_TRANSACTION_ID = 0x2004,
RES_OPERATION_NOT_SUPPORTED = 0x2005,
RES_PARAMETER_NOT_SUPPORTED = 0x2006,
+ RES_INCOMPLETE_TRANSFER = 0x2007,
RES_INVALID_STORAGE_ID = 0x2008,
RES_INVALID_OBJECT_HANDLE = 0x2009,
RES_SPEC_BY_FORMAT_UNSUPPORTED = 0x2014,
@@ -946,7 +947,8 @@ static void usb_mtp_handle_data(USBDevice *dev, USBPacket
*p)
}
rc = read(d->fd, d->data, dlen);
if (rc != dlen) {
- fprintf(stderr, "%s: TODO: handle read error\n", __func__);
+ memset(d->data, 0, dlen);
+ s->result->code = RES_INCOMPLETE_TRANSFER;
}
usb_packet_copy(p, d->data, dlen);
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] usb patch queue, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 02/10] usb: mtp: replace debug printfs with trace points, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 06/10] usb: mtp: fix error path memory leak, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 01/10] usb-ohci: Add vmstate descriptor, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 03/10] usb: mtp: fix usb_mtp_add_u64, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 07/10] usb: mtp: avoid empty description string, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 09/10] usb: mtp: fix possible buffer overflow, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 08/10] usb: mtp: drop data-out hexdump, Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 04/10] usb: mtp: fix version (is decimal not bcd), Gerd Hoffmann, 2014/05/05
- [Qemu-devel] [PULL 10/10] usb: mtp: reply INCOMPLETE_TRANSFER on read errors,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 05/10] usb: mtp: fix serial (must be exact 32 chars), Gerd Hoffmann, 2014/05/05
- Re: [Qemu-devel] [PULL 00/10] usb patch queue, Peter Maydell, 2014/05/07