From nobody Mon May 6 08:23:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532122963842213.5870670530394; Fri, 20 Jul 2018 14:42:43 -0700 (PDT) Received: from localhost ([::1]:49897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgdAa-0006KQ-5O for importer@patchew.org; Fri, 20 Jul 2018 17:42:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgd8g-0005DG-G4 for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgd8d-0005mp-9P for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:38 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50032 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fgd8d-0005lI-47 for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E7450DEF0E for ; Fri, 20 Jul 2018 21:40:33 +0000 (UTC) Received: from gigantic.usersys.redhat.com (dhcp-17-169.bos.redhat.com [10.18.17.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id C90AD2156897; Fri, 20 Jul 2018 21:40:33 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2018 17:40:16 -0400 Message-Id: <20180720214020.22897-2-bsd@redhat.com> In-Reply-To: <20180720214020.22897-1-bsd@redhat.com> References: <20180720214020.22897-1-bsd@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 20 Jul 2018 21:40:33 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 20 Jul 2018 21:40:33 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'bsd@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/5] dev-mtp: add support for canceling transaction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The initiator can choose to cancel an ongoing request which is specified by bRequest=3D0x64. If such a request arrives, free up any pending state Signed-off-by: Bandan Das --- hw/usb/dev-mtp.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 1ded7ac9a3..c40b0de0bb 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -82,6 +82,7 @@ enum mtp_code { FMT_ASSOCIATION =3D 0x3001, =20 /* event codes */ + EVT_CANCEL_TRANSACTION =3D 0x4001, EVT_OBJ_ADDED =3D 0x4002, EVT_OBJ_REMOVED =3D 0x4003, EVT_OBJ_INFO_CHANGED =3D 0x4007, @@ -1551,14 +1552,35 @@ static void usb_mtp_handle_control(USBDevice *dev, = USBPacket *p, int length, uint8_t *data) { int ret; + MTPState *s =3D USB_MTP(dev); + uint16_t *event =3D (uint16_t *)data; =20 - ret =3D usb_desc_handle_control(dev, p, request, value, index, length,= data); - if (ret >=3D 0) { - return; + switch (request) { + case ClassInterfaceOutRequest | 0x64: + if (*event =3D=3D EVT_CANCEL_TRANSACTION) { + g_free(s->result); + s->result =3D NULL; + usb_mtp_data_free(s->data_in); + s->data_in =3D NULL; + if (s->write_pending) { + g_free(s->dataset.filename); + s->write_pending =3D false; + } + usb_mtp_data_free(s->data_out); + s->data_out =3D NULL; + } else { + p->status =3D USB_RET_STALL; + } + break; + default: + ret =3D usb_desc_handle_control(dev, p, request, + value, index, length, data); + if (ret >=3D 0) { + return; + } } =20 trace_usb_mtp_stall(dev->addr, "unknown control request"); - p->status =3D USB_RET_STALL; } =20 static void usb_mtp_cancel_packet(USBDevice *dev, USBPacket *p) --=20 2.14.4 From nobody Mon May 6 08:23:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532123085211547.0785070172332; Fri, 20 Jul 2018 14:44:45 -0700 (PDT) Received: from localhost ([::1]:49911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgdCe-0008B6-BJ for importer@patchew.org; Fri, 20 Jul 2018 17:44:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgd8g-0005DH-Fu for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgd8d-0005mi-9C for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:38 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34186 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fgd8d-0005lO-4S for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 16CF2FA449 for ; Fri, 20 Jul 2018 21:40:34 +0000 (UTC) Received: from gigantic.usersys.redhat.com (dhcp-17-169.bos.redhat.com [10.18.17.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDA462156897; Fri, 20 Jul 2018 21:40:33 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2018 17:40:17 -0400 Message-Id: <20180720214020.22897-3-bsd@redhat.com> In-Reply-To: <20180720214020.22897-1-bsd@redhat.com> References: <20180720214020.22897-1-bsd@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 20 Jul 2018 21:40:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 20 Jul 2018 21:40:34 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'bsd@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 2/5] dev-mtp: fix buffer allocation for writing file contents X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" usb_mtp_realloc() was being incorrectly used when allocating buffer for incoming data. Set d->length only after resizing the buffer. Signed-off-by: Bandan Das --- hw/usb/dev-mtp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index c40b0de0bb..1b72603dc5 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1721,6 +1721,7 @@ static void usb_mtp_get_data(MTPState *s, mtp_contain= er *container, MTPData *d =3D s->data_out; uint64_t dlen; uint32_t data_len =3D p->iov.size; + uint64_t total_len; =20 if (!d) { usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, 0, @@ -1729,10 +1730,11 @@ static void usb_mtp_get_data(MTPState *s, mtp_conta= iner *container, } if (d->first) { /* Total length of incoming data */ - d->length =3D cpu_to_le32(container->length) - sizeof(mtp_containe= r); + total_len =3D cpu_to_le32(container->length) - sizeof(mtp_containe= r); /* Length of data in this packet */ data_len -=3D sizeof(mtp_container); - usb_mtp_realloc(d, d->length); + usb_mtp_realloc(d, total_len); + d->length +=3D total_len; d->offset =3D 0; d->first =3D false; } --=20 2.14.4 From nobody Mon May 6 08:23:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153212296387415.78466587048456; Fri, 20 Jul 2018 14:42:43 -0700 (PDT) Received: from localhost ([::1]:49898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgdAd-0006NJ-Kr for importer@patchew.org; Fri, 20 Jul 2018 17:42:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgd8g-0005DM-GZ for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgd8d-0005mt-9s for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:38 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48090 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fgd8d-0005ln-4N for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3EEA9818F6E1 for ; Fri, 20 Jul 2018 21:40:34 +0000 (UTC) Received: from gigantic.usersys.redhat.com (dhcp-17-169.bos.redhat.com [10.18.17.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DF032156897; Fri, 20 Jul 2018 21:40:34 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2018 17:40:18 -0400 Message-Id: <20180720214020.22897-4-bsd@redhat.com> In-Reply-To: <20180720214020.22897-1-bsd@redhat.com> References: <20180720214020.22897-1-bsd@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 20 Jul 2018 21:40:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 20 Jul 2018 21:40:34 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'bsd@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 3/5] dev-mtp: retry write for incomplete transfers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For large buffers, write may not copy the full buffer. For example, on Linux, write imposes a limit of 0x7ffff000. Note that this does not fix >4G transfers but ~>2G files will transfer successfully. Signed-off-by: Bandan Das --- hw/usb/dev-mtp.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 1b72603dc5..c8f6eb4e9e 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1602,6 +1602,24 @@ static void utf16_to_str(uint8_t len, uint16_t *arr,= char *name) g_free(wstr); } =20 +/* Wrapper around write, returns 0 on failure */ +static uint64_t write_retry(int fd, void *buf, uint64_t size) +{ + uint64_t bytes_left =3D size, ret; + + while (bytes_left > 0) { + ret =3D write(fd, buf, bytes_left); + if ((ret =3D=3D -1) && (errno !=3D EINTR || errno !=3D EAG= AIN || + errno !=3D EWOULDBLOCK)) { + break; + } + bytes_left -=3D ret; + buf +=3D ret; + } + + return size - bytes_left; +} + static void usb_mtp_write_data(MTPState *s) { MTPData *d =3D s->data_out; @@ -1644,8 +1662,8 @@ static void usb_mtp_write_data(MTPState *s) goto success; } =20 - rc =3D write(d->fd, d->data, s->dataset.size); - if (rc =3D=3D -1) { + rc =3D write_retry(d->fd, d->data, s->dataset.size); + if (!rc) { usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, 0, 0, 0, 0); goto done; --=20 2.14.4 From nobody Mon May 6 08:23:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532122963956457.286013290699; Fri, 20 Jul 2018 14:42:43 -0700 (PDT) Received: from localhost ([::1]:49896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgdAZ-0006Iq-4G for importer@patchew.org; Fri, 20 Jul 2018 17:42:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgd8g-0005DJ-GX for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgd8d-0005nD-Is for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:38 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34188 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fgd8d-0005lx-8L for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 669BFFA45C for ; Fri, 20 Jul 2018 21:40:34 +0000 (UTC) Received: from gigantic.usersys.redhat.com (dhcp-17-169.bos.redhat.com [10.18.17.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 468CD2156897; Fri, 20 Jul 2018 21:40:34 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2018 17:40:19 -0400 Message-Id: <20180720214020.22897-5-bsd@redhat.com> In-Reply-To: <20180720214020.22897-1-bsd@redhat.com> References: <20180720214020.22897-1-bsd@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 20 Jul 2018 21:40:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 20 Jul 2018 21:40:34 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'bsd@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 4/5] dev-mtp: Add support for > 4GB file transfers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- hw/usb/dev-mtp.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index c8f6eb4e9e..2e3ea58da6 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -147,9 +147,12 @@ struct MTPData { uint32_t trans; uint64_t offset; uint64_t length; - uint32_t alloc; + uint64_t alloc; uint8_t *data; bool first; + /* Used for >4G file sizes */ + bool pending; + uint64_t cached_length; int fd; }; =20 @@ -1626,7 +1629,7 @@ static void usb_mtp_write_data(MTPState *s) MTPObject *parent =3D usb_mtp_object_lookup(s, s->dataset.parent_handle); char *path =3D NULL; - int rc =3D -1; + uint64_t rc; mode_t mask =3D 0644; =20 assert(d !=3D NULL); @@ -1643,7 +1646,7 @@ static void usb_mtp_write_data(MTPState *s) d->fd =3D mkdir(path, mask); goto free; } - if (s->dataset.size < d->length) { + if ((s->dataset.size !=3D 0xFFFFFFFF) && (s->dataset.size < d->len= gth)) { usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, 0, 0, 0, 0); goto done; @@ -1754,13 +1757,27 @@ static void usb_mtp_get_data(MTPState *s, mtp_conta= iner *container, usb_mtp_realloc(d, total_len); d->length +=3D total_len; d->offset =3D 0; + d->cached_length =3D total_len; d->first =3D false; + d->pending =3D false; + } + + if (d->pending) { + usb_mtp_realloc(d, d->cached_length); + d->length +=3D d->cached_length; + d->pending =3D false; } =20 if (d->length - d->offset > data_len) { dlen =3D data_len; } else { dlen =3D d->length - d->offset; + /* Check for cached data for large files */ + if ((s->dataset.size =3D=3D 0xFFFFFFFF) && (dlen < p->iov.size)) { + usb_mtp_realloc(d, p->iov.size - dlen); + d->length +=3D p->iov.size - dlen; + dlen =3D p->iov.size; + } } =20 switch (d->code) { @@ -1780,12 +1797,18 @@ static void usb_mtp_get_data(MTPState *s, mtp_conta= iner *container, case CMD_SEND_OBJECT: usb_packet_copy(p, d->data + d->offset, dlen); d->offset +=3D dlen; - if (d->offset =3D=3D d->length) { + if ((p->iov.size % 64) || !p->iov.size) { + assert((s->dataset.size =3D=3D 0xFFFFFFFF) || + (s->dataset.size =3D=3D d->length)); + usb_mtp_write_data(s); usb_mtp_data_free(s->data_out); s->data_out =3D NULL; return; } + if (d->offset =3D=3D d->length) { + d->pending =3D true; + } break; default: p->status =3D USB_RET_STALL; --=20 2.14.4 From nobody Mon May 6 08:23:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532123155971666.2537582846414; Fri, 20 Jul 2018 14:45:55 -0700 (PDT) Received: from localhost ([::1]:49923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgdDm-00013X-Gq for importer@patchew.org; Fri, 20 Jul 2018 17:45:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgd8g-0005DI-GF for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgd8d-0005ne-Rv for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:38 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48888 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fgd8d-0005m6-BD for qemu-devel@nongnu.org; Fri, 20 Jul 2018 17:40:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C5F14106CA2 for ; Fri, 20 Jul 2018 21:40:34 +0000 (UTC) Received: from gigantic.usersys.redhat.com (dhcp-17-169.bos.redhat.com [10.18.17.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D6312156897; Fri, 20 Jul 2018 21:40:34 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2018 17:40:20 -0400 Message-Id: <20180720214020.22897-6-bsd@redhat.com> In-Reply-To: <20180720214020.22897-1-bsd@redhat.com> References: <20180720214020.22897-1-bsd@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 20 Jul 2018 21:40:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 20 Jul 2018 21:40:34 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'bsd@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 5/5] dev-mtp: rename x-root to rootdir X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" x-root was renamed as such owing to the experimental nature of the property; the underlying filesystem semantics were undecided Signed-off-by: Bandan Das --- hw/usb/dev-mtp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 2e3ea58da6..3fdc4b0da1 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -2018,7 +2018,7 @@ static void usb_mtp_realize(USBDevice *dev, Error **e= rrp) QTAILQ_INIT(&s->objects); if (s->desc =3D=3D NULL) { if (s->root =3D=3D NULL) { - error_setg(errp, "usb-mtp: x-root property must be configured"= ); + error_setg(errp, "usb-mtp: rootdir property must be configured= "); return; } s->desc =3D strrchr(s->root, '/'); @@ -2047,7 +2047,7 @@ static const VMStateDescription vmstate_usb_mtp =3D { }; =20 static Property mtp_properties[] =3D { - DEFINE_PROP_STRING("x-root", MTPState, root), + DEFINE_PROP_STRING("rootdir", MTPState, root), DEFINE_PROP_STRING("desc", MTPState, desc), DEFINE_PROP_BOOL("readonly", MTPState, readonly, true), DEFINE_PROP_END_OF_LIST(), --=20 2.14.4