From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZ1KS-0008Ra-3z for qemu-devel@nongnu.org; Thu, 15 Nov 2012 10:26:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TZ1KP-0000Ql-2J for qemu-devel@nongnu.org; Thu, 15 Nov 2012 10:26:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:61330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZ1KO-0000Qe-R2 for qemu-devel@nongnu.org; Thu, 15 Nov 2012 10:26:05 -0500 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 qAFFQ1bn014146 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 15 Nov 2012 10:26:04 -0500 Message-ID: <50A508D6.8000500@redhat.com> Date: Thu, 15 Nov 2012 16:23:02 +0100 From: Hans de Goede MIME-Version: 1.0 References: <1352992763-31409-1-git-send-email-kraxel@redhat.com> In-Reply-To: <1352992763-31409-1-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] usb-host: update tracing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org ACK series. Regards, Hans On 11/15/2012 04:19 PM, Gerd Hoffmann wrote: > Now that we have separate status and length fields in USBPacket > update the completion tracepoint to log both. > > Signed-off-by: Gerd Hoffmann > --- > hw/usb/host-linux.c | 20 ++++++++++++-------- > trace-events | 2 +- > 2 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c > index b17e1dc..e3d394f 100644 > --- a/hw/usb/host-linux.c > +++ b/hw/usb/host-linux.c > @@ -385,10 +385,12 @@ static void async_complete(void *opaque) > } > > if (aurb->urb.type == USBDEVFS_URB_TYPE_CONTROL) { > - trace_usb_host_req_complete(s->bus_num, s->addr, p, p->status); > + trace_usb_host_req_complete(s->bus_num, s->addr, p, > + p->status, aurb->urb.actual_length); > usb_generic_async_ctrl_complete(&s->dev, p); > } else if (!aurb->more) { > - trace_usb_host_req_complete(s->bus_num, s->addr, p, p->status); > + trace_usb_host_req_complete(s->bus_num, s->addr, p, > + p->status, aurb->urb.actual_length); > usb_packet_complete(&s->dev, p); > } > } > @@ -863,8 +865,9 @@ static void usb_host_handle_data(USBDevice *dev, USBPacket *p) > p->ep->nr, p->iov.size); > > if (!is_valid(s, p->pid, p->ep->nr)) { > - trace_usb_host_req_complete(s->bus_num, s->addr, p, USB_RET_NAK); > p->status = USB_RET_NAK; > + trace_usb_host_req_complete(s->bus_num, s->addr, p, > + p->status, p->actual_length); > return; > } > > @@ -879,8 +882,9 @@ static void usb_host_handle_data(USBDevice *dev, USBPacket *p) > ret = ioctl(s->fd, USBDEVFS_CLEAR_HALT, &arg); > if (ret < 0) { > perror("USBDEVFS_CLEAR_HALT"); > - trace_usb_host_req_complete(s->bus_num, s->addr, p, USB_RET_NAK); > p->status = USB_RET_NAK; > + trace_usb_host_req_complete(s->bus_num, s->addr, p, > + p->status, p->actual_length); > return; > } > clear_halt(s, p->pid, p->ep->nr); > @@ -936,15 +940,15 @@ static void usb_host_handle_data(USBDevice *dev, USBPacket *p) > > switch(errno) { > case ETIMEDOUT: > - trace_usb_host_req_complete(s->bus_num, s->addr, p, > - USB_RET_NAK); > p->status = USB_RET_NAK; > + trace_usb_host_req_complete(s->bus_num, s->addr, p, > + p->status, p->actual_length); > break; > case EPIPE: > default: > - trace_usb_host_req_complete(s->bus_num, s->addr, p, > - USB_RET_STALL); > p->status = USB_RET_STALL; > + trace_usb_host_req_complete(s->bus_num, s->addr, p, > + p->status, p->actual_length); > } > return; > } > diff --git a/trace-events b/trace-events > index 913e00b..02cdabc 100644 > --- a/trace-events > +++ b/trace-events > @@ -431,7 +431,7 @@ usb_host_claim_interfaces(int bus, int addr, int config, int nif) "dev %d:%d, co > usb_host_release_interfaces(int bus, int addr) "dev %d:%d" > usb_host_req_control(int bus, int addr, void *p, int req, int value, int index) "dev %d:%d, packet %p, req 0x%x, value %d, index %d" > usb_host_req_data(int bus, int addr, void *p, int in, int ep, int size) "dev %d:%d, packet %p, in %d, ep %d, size %d" > -usb_host_req_complete(int bus, int addr, void *p, int status) "dev %d:%d, packet %p, status %d" > +usb_host_req_complete(int bus, int addr, void *p, int status, int length) "dev %d:%d, packet %p, status %d, length %d" > usb_host_req_emulated(int bus, int addr, void *p, int status) "dev %d:%d, packet %p, status %d" > usb_host_req_canceled(int bus, int addr, void *p) "dev %d:%d, packet %p" > usb_host_urb_submit(int bus, int addr, void *aurb, int length, int more) "dev %d:%d, aurb %p, length %d, more %d" >