From nobody Wed Nov 5 14:24:48 2025 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 1534842854615903.5023141575246; Tue, 21 Aug 2018 02:14:14 -0700 (PDT) Received: from localhost ([::1]:51692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs2jt-0001AK-FE for importer@patchew.org; Tue, 21 Aug 2018 05:14:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs2hk-0008Fl-0m for qemu-devel@nongnu.org; Tue, 21 Aug 2018 05:12:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fs2hf-0000gL-NC for qemu-devel@nongnu.org; Tue, 21 Aug 2018 05:11:58 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55394 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 1fs2hf-0000f6-AQ for qemu-devel@nongnu.org; Tue, 21 Aug 2018 05:11:55 -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 79F99400738B for ; Tue, 21 Aug 2018 09:11:54 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-184.ams2.redhat.com [10.36.116.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id D32DE2166BA1; Tue, 21 Aug 2018 09:11:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 431359B2F9; Tue, 21 Aug 2018 11:11:48 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 11:11:44 +0200 Message-Id: <20180821091148.32220-4-kraxel@redhat.com> In-Reply-To: <20180821091148.32220-1-kraxel@redhat.com> References: <20180821091148.32220-1-kraxel@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.6]); Tue, 21 Aug 2018 09:11:54 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 21 Aug 2018 09:11:54 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 3/7] 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: Bandan Das , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Bandan Das 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 Message-id: 20180720214020.22897-2-bsd@redhat.com Signed-off-by: Gerd Hoffmann --- 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.9.3