From patchwork Thu Nov 15 15:19:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 199329 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 DE3E52C03F6 for ; Fri, 16 Nov 2012 02:49:28 +1100 (EST) Received: from localhost ([::1]:58415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZ1F0-0005Wr-Ii for incoming@patchwork.ozlabs.org; Thu, 15 Nov 2012 10:20:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZ1E1-0003DI-Oq for qemu-devel@nongnu.org; Thu, 15 Nov 2012 10:19:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TZ1Dy-0006no-LO for qemu-devel@nongnu.org; Thu, 15 Nov 2012 10:19:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZ1Dy-0006nZ-DG for qemu-devel@nongnu.org; Thu, 15 Nov 2012 10:19:26 -0500 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 qAFFJPWL015116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 15 Nov 2012 10:19:26 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAFFJOKw021138; Thu, 15 Nov 2012 10:19:25 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 4577E403BB; Thu, 15 Nov 2012 16:19:24 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 15 Nov 2012 16:19:23 +0100 Message-Id: <1352992763-31409-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1352992763-31409-1-git-send-email-kraxel@redhat.com> References: <1352992763-31409-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: hdegoede@redhat.com, Gerd Hoffmann Subject: [Qemu-devel] [PATCH 2/2] usb-host: fix splitted transfers 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 USBPacket->actual_length wasn't updated correctly for USBPackets splitted into multiple urbs. Fix it. Signed-off-by: Gerd Hoffmann --- hw/usb/host-linux.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c index e3d394f..aa77b77 100644 --- a/hw/usb/host-linux.c +++ b/hw/usb/host-linux.c @@ -366,8 +366,11 @@ static void async_complete(void *opaque) if (p) { switch (aurb->urb.status) { case 0: - p->actual_length = aurb->urb.actual_length; - p->status = USB_RET_SUCCESS; /* Clear previous ASYNC status */ + p->actual_length += aurb->urb.actual_length; + if (!aurb->more) { + /* Clear previous ASYNC status */ + p->status = USB_RET_SUCCESS; + } break; case -EPIPE: