From patchwork Thu Nov 1 16:15:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 196269 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3B9A82C0361 for ; Fri, 2 Nov 2012 03:13:46 +1100 (EST) Received: from localhost ([::1]:39654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTxOq-0007Hl-7F for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2012 12:13:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTxOX-00074B-07 for qemu-devel@nongnu.org; Thu, 01 Nov 2012 12:13:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTxOV-00050x-Kd for qemu-devel@nongnu.org; Thu, 01 Nov 2012 12:13:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTxOV-00050h-C3 for qemu-devel@nongnu.org; Thu, 01 Nov 2012 12:13:23 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA1GDMca006867 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 1 Nov 2012 12:13:22 -0400 Received: from shalem.localdomain.com (vpn1-7-209.ams2.redhat.com [10.36.7.209]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA1GDHnI008217; Thu, 1 Nov 2012 12:13:21 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Thu, 1 Nov 2012 17:15:02 +0100 Message-Id: <1351786506-17329-3-git-send-email-hdegoede@redhat.com> In-Reply-To: <1351786506-17329-1-git-send-email-hdegoede@redhat.com> References: <1351786506-17329-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/6] usb-redir: Allow packets to have both data and an error-status X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Hans de Goede --- hw/usb/redirect.c | 56 ++++++++++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 1fadc70..d9236c5 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -531,22 +531,16 @@ static void usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p, isop->status, isop->len, dev->endpoint[EP2I(ep)].bufpq_size); status = isop->status; - if (status != usb_redir_success) { - bufp_free(dev, isop, ep); - p->status = USB_RET_IOERROR; - return; - } - len = isop->len; if (len > p->iov.size) { ERROR("received iso data is larger then packet ep %02X (%d > %d)\n", ep, len, (int)p->iov.size); - bufp_free(dev, isop, ep); - p->status = USB_RET_BABBLE; - return; + len = p->iov.size; + status = usb_redir_babble; } usb_packet_copy(p, isop->data, len); bufp_free(dev, isop, ep); + usbredir_handle_status(dev, p, status); } else { /* If the stream was not started because of a pending error don't send the packet to the usb-host */ @@ -666,21 +660,15 @@ static void usbredir_handle_interrupt_data(USBRedirDevice *dev, intp->status, intp->len); status = intp->status; - if (status != usb_redir_success) { - bufp_free(dev, intp, ep); - usbredir_handle_status(dev, p, status); - return; - } - len = intp->len; if (len > p->iov.size) { ERROR("received int data is larger then packet ep %02X\n", ep); - bufp_free(dev, intp, ep); - p->status = USB_RET_BABBLE; - return; + len = p->iov.size; + status = usb_redir_babble; } usb_packet_copy(p, intp->data, len); bufp_free(dev, intp, ep); + usbredir_handle_status(dev, p, status); } else { /* Output interrupt endpoint, normal async operation */ struct usb_redir_interrupt_packet_header interrupt_packet; @@ -1565,16 +1553,15 @@ static void usbredir_control_packet(void *priv, uint64_t id, p = usbredir_find_packet_by_id(dev, 0, id); if (p) { usbredir_handle_status(dev, p, control_packet->status); - if (p->status == USB_RET_SUCCESS) { + if (data_len > 0) { usbredir_log_data(dev, "ctrl data in:", data, data_len); - if (data_len <= sizeof(dev->dev.data_buf)) { - memcpy(dev->dev.data_buf, data, data_len); - } else { + if (data_len > sizeof(dev->dev.data_buf)) { ERROR("ctrl buffer too small (%d > %zu)\n", data_len, sizeof(dev->dev.data_buf)); p->status = USB_RET_STALL; - len = 0; + data_len = len = sizeof(dev->dev.data_buf); } + memcpy(dev->dev.data_buf, data, data_len); } p->actual_length = len; usb_generic_async_ctrl_complete(&dev->dev, p); @@ -1598,20 +1585,19 @@ static void usbredir_bulk_packet(void *priv, uint64_t id, if (p) { size_t size = (p->combined) ? p->combined->iov.size : p->iov.size; usbredir_handle_status(dev, p, bulk_packet->status); - if (p->status == USB_RET_SUCCESS) { + if (data_len > 0) { usbredir_log_data(dev, "bulk data in:", data, data_len); - if (data_len <= size) { - if (p->combined) { - iov_from_buf(p->combined->iov.iov, p->combined->iov.niov, - 0, data, data_len); - } else { - usb_packet_copy(p, data, data_len); - } - } else { + if (data_len > size) { ERROR("bulk got more data then requested (%d > %zd)\n", data_len, p->iov.size); p->status = USB_RET_BABBLE; - len = 0; + data_len = len = size; + } + if (p->combined) { + iov_from_buf(p->combined->iov.iov, p->combined->iov.niov, + 0, data, data_len); + } else { + usb_packet_copy(p, data, data_len); } } p->actual_length = len; @@ -1676,12 +1662,10 @@ static void usbredir_interrupt_packet(void *priv, uint64_t id, /* bufp_alloc also adds the packet to the ep queue */ bufp_alloc(dev, data, data_len, interrupt_packet->status, ep); } else { - int len = interrupt_packet->length; - USBPacket *p = usbredir_find_packet_by_id(dev, ep, id); if (p) { usbredir_handle_status(dev, p, interrupt_packet->status); - p->actual_length = len; + p->actual_length = interrupt_packet->length; usb_packet_complete(&dev->dev, p); } }