From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1xba-0002bd-Ph for qemu-devel@nongnu.org; Thu, 16 Aug 2012 06:47:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1xbY-0006Tv-QX for qemu-devel@nongnu.org; Thu, 16 Aug 2012 06:47:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20395) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1xbY-0006Tb-HD for qemu-devel@nongnu.org; Thu, 16 Aug 2012 06:47:08 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7GAl7Jx016374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 16 Aug 2012 06:47:07 -0400 From: Gerd Hoffmann Date: Thu, 16 Aug 2012 12:11:47 +0200 Message-Id: <1345111910-26791-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1345111910-26791-1-git-send-email-kraxel@redhat.com> References: <1345111910-26791-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH for-1.2 1/4] usb: async control xfer fixup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Need to clear p->result after copying setup data using usb_packet_copy() because we'll reuse the USBPacket for the data transfer. Signed-off-by: Gerd Hoffmann --- hw/usb/core.c | 1 + hw/usb/host-linux.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index 01a7622..c7e5bc0 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -107,6 +107,7 @@ static int do_token_setup(USBDevice *s, USBPacket *p) } usb_packet_copy(p, s->setup_buf, p->iov.size); + p->result = 0; s->setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6]; s->setup_index = 0; diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c index d55be87..8df9207 100644 --- a/hw/usb/host-linux.c +++ b/hw/usb/host-linux.c @@ -1045,6 +1045,7 @@ static int usb_host_handle_control(USBDevice *dev, USBPacket *p, /* Note request is (bRequestType << 8) | bRequest */ trace_usb_host_req_control(s->bus_num, s->addr, p, request, value, index); + assert(p->result == 0); switch (request) { case DeviceOutRequest | USB_REQ_SET_ADDRESS: -- 1.7.1