From patchwork Mon Oct 8 07:51:26 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: 189923 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 6DBC42C01FD for ; Mon, 8 Oct 2012 18:50:33 +1100 (EST) Received: from localhost ([::1]:44793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TL86e-0001Vc-65 for incoming@patchwork.ozlabs.org; Mon, 08 Oct 2012 03:50:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TL86P-0001NU-Dx for qemu-devel@nongnu.org; Mon, 08 Oct 2012 03:50:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TL86N-00066H-QA for qemu-devel@nongnu.org; Mon, 08 Oct 2012 03:50:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TL86N-000660-Hk for qemu-devel@nongnu.org; Mon, 08 Oct 2012 03:50:11 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q987oAtM007017 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 8 Oct 2012 03:50:10 -0400 Received: from shalem.localdomain.com (vpn1-7-79.ams2.redhat.com [10.36.7.79]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q987o59e012329; Mon, 8 Oct 2012 03:50:09 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Mon, 8 Oct 2012 09:51:26 +0200 Message-Id: <1349682696-3046-3-git-send-email-hdegoede@redhat.com> In-Reply-To: <1349682696-3046-1-git-send-email-hdegoede@redhat.com> References: <1349682696-3046-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 02/12] usb-redir: Add support for 32 bits bulk packet length 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 And also switch to using usb_ep_set_pipeline(), rather then modifying the ep directly. This is a preparation patch for adding input queuing support. Signed-off-by: Hans de Goede --- configure | 2 +- hw/usb/redirect.c | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 248b871..036c38a 100755 --- a/configure +++ b/configure @@ -2768,7 +2768,7 @@ fi # check for usbredirparser for usb network redirection support if test "$usb_redir" != "no" ; then - if $pkg_config --atleast-version=0.5 libusbredirparser-0.5 >/dev/null 2>&1 ; then + if $pkg_config --atleast-version=0.5.3 libusbredirparser-0.5 >/dev/null 2>&1 ; then usb_redir="yes" usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null) usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index ae7393f..19fe00b 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -585,6 +585,10 @@ static int usbredir_handle_bulk_data(USBRedirDevice *dev, USBPacket *p, bulk_packet.endpoint = ep; bulk_packet.length = p->iov.size; bulk_packet.stream_id = 0; + bulk_packet.length_high = p->iov.size >> 16; + assert(bulk_packet.length_high == 0 || + usbredirparser_peer_has_cap(dev->parser, + usb_redir_cap_32bits_bulk_length)); if (ep & USB_DIR_IN) { usbredirparser_send_bulk_packet(dev->parser, p->id, @@ -906,6 +910,7 @@ static void usbredir_create_parser(USBRedirDevice *dev) usbredirparser_caps_set_cap(caps, usb_redir_cap_filter); usbredirparser_caps_set_cap(caps, usb_redir_cap_ep_info_max_packet_size); usbredirparser_caps_set_cap(caps, usb_redir_cap_64bits_ids); + usbredirparser_caps_set_cap(caps, usb_redir_cap_32bits_bulk_length); if (runstate_check(RUN_STATE_INMIGRATE)) { flags |= usbredirparser_fl_no_hello; @@ -1302,7 +1307,7 @@ static void usbredir_ep_info(void *priv, { USBRedirDevice *dev = priv; struct USBEndpoint *usb_ep; - int i; + int i, pid; for (i = 0; i < MAX_ENDPOINTS; i++) { dev->endpoint[i].type = ep_info->type[i]; @@ -1339,7 +1344,16 @@ static void usbredir_ep_info(void *priv, usb_ep->max_packet_size = ep_info->max_packet_size[i]; } if (ep_info->type[i] == usb_redir_type_bulk) { - usb_ep->pipeline = true; + if (i & 0x10) { + if (!usbredirparser_peer_has_cap(dev->parser, + usb_redir_cap_32bits_bulk_length)) { + continue; /* No input pipeline without 32 bits length! */ + } + pid = USB_TOKEN_IN; + } else { + pid = USB_TOKEN_OUT; + } + usb_ep_set_pipeline(&dev->dev, pid, i & 0x0f, true); } } } @@ -1471,7 +1485,7 @@ static void usbredir_bulk_packet(void *priv, uint64_t id, { USBRedirDevice *dev = priv; uint8_t ep = bulk_packet->endpoint; - int len = bulk_packet->length; + int len = (bulk_packet->length_high << 16) | bulk_packet->length; USBPacket *p; DPRINTF("bulk-in status %d ep %02X len %d id %"PRIu64"\n",