motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-27 20:13:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

dev-mtp: Add support for > 4GB file transfers

Browse source 
To support larger file transfers, rely on a short packet
to detect end of the data phase and rewrite d->length to
the size received

Signed-off-by: Bandan Das <bsd@redhat.com>
Message-id: 20180720214020.22897-5-bsd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Bandan Das 2018-07-20 17:40:19 -04:00 • committed by Gerd Hoffmann
parent d33e3e4bf8
commit 3e096650a6
1 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
hw/usb/dev-mtp.c
View file

@ -147,9 +147,12 @@ struct MTPData {
uint32_t trans; uint32_t trans;
uint64_t offset; uint64_t offset;
uint64_t length; uint64_t length;
uint32_t alloc; uint64_t alloc;
uint8_t *data; uint8_t *data;
bool first; bool first;
/* Used for >4G file sizes */
bool pending;
uint64_t cached_length;
int fd; int fd;
}; };
@ -1626,7 +1629,7 @@ static void usb_mtp_write_data(MTPState *s)
MTPObject *parent = MTPObject *parent =
usb_mtp_object_lookup(s, s->dataset.parent_handle); usb_mtp_object_lookup(s, s->dataset.parent_handle);
char *path = NULL; char *path = NULL;
int rc = -1; uint64_t rc;
mode_t mask = 0644; mode_t mask = 0644;
assert(d != NULL); assert(d != NULL);
@ -1643,7 +1646,7 @@ static void usb_mtp_write_data(MTPState *s)
d->fd = mkdir(path, mask); d->fd = mkdir(path, mask);
goto free; goto free;
} }
if (s->dataset.size < d->length) { if ((s->dataset.size != 0xFFFFFFFF) && (s->dataset.size < d->length)) {
usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, usb_mtp_queue_result(s, RES_STORE_FULL, d->trans,
0, 0, 0, 0); 0, 0, 0, 0);
goto done; goto done;
@ -1754,13 +1757,27 @@ static void usb_mtp_get_data(MTPState *s, mtp_container *container,
usb_mtp_realloc(d, total_len); usb_mtp_realloc(d, total_len);
d->length += total_len; d->length += total_len;
d->offset = 0; d->offset = 0;
d->cached_length = total_len;
d->first = false; d->first = false;
d->pending = false;
}
if (d->pending) {
usb_mtp_realloc(d, d->cached_length);
d->length += d->cached_length;
d->pending = false;
} }
if (d->length - d->offset > data_len) { if (d->length - d->offset > data_len) {
dlen = data_len; dlen = data_len;
} else { } else {
dlen = d->length - d->offset; dlen = d->length - d->offset;
/* Check for cached data for large files */
if ((s->dataset.size == 0xFFFFFFFF) && (dlen < p->iov.size)) {
usb_mtp_realloc(d, p->iov.size - dlen);
d->length += p->iov.size - dlen;
dlen = p->iov.size;
}
} }
switch (d->code) { switch (d->code) {
@ -1780,12 +1797,18 @@ static void usb_mtp_get_data(MTPState *s, mtp_container *container,
case CMD_SEND_OBJECT: case CMD_SEND_OBJECT:
usb_packet_copy(p, d->data + d->offset, dlen); usb_packet_copy(p, d->data + d->offset, dlen);
d->offset += dlen; d->offset += dlen;
if (d->offset == d->length) { if ((p->iov.size % 64) || !p->iov.size) {
assert((s->dataset.size == 0xFFFFFFFF) ||
(s->dataset.size == d->length));
usb_mtp_write_data(s); usb_mtp_write_data(s);
usb_mtp_data_free(s->data_out); usb_mtp_data_free(s->data_out);
s->data_out = NULL; s->data_out = NULL;
return; return;
} }
if (d->offset == d->length) {
d->pending = true;
}
break; break;
default: default:
p->status = USB_RET_STALL; p->status = USB_RET_STALL;