From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXTGF-0007Vb-IW for qemu-devel@nongnu.org; Fri, 26 Sep 2014 07:00:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXTGA-00068P-J5 for qemu-devel@nongnu.org; Fri, 26 Sep 2014 07:00:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXTGA-00062y-3A for qemu-devel@nongnu.org; Fri, 26 Sep 2014 07:00:22 -0400 From: Stefan Hajnoczi Date: Fri, 26 Sep 2014 11:59:37 +0100 Message-Id: <1411729177-5222-17-git-send-email-stefanha@redhat.com> In-Reply-To: <1411729177-5222-1-git-send-email-stefanha@redhat.com> References: <1411729177-5222-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 16/16] ohci: drop computed flags from trace events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefan Hajnoczi From: Alex Benn=C3=A9e This exceeded the trace argument limit for LTTNG UST and wasn't really needed as the flags value is stored anyway. Dropping this fixes the compile failure for UST. It can probably be merged with the previous trace shortening patch. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi --- hw/usb/hcd-ohci.c | 3 +-- trace-events | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 8d3c9cc..9a84eb6 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -724,8 +724,7 @@ static int ohci_service_iso_td(OHCIState *ohci, struc= t ohci_ed *ed, ed->head & OHCI_DPTR_MASK, ed->tail & OHCI_DPTR_MASK, iso_td.flags, iso_td.bp, iso_td.next, iso_td.be, ohci->frame_number, starting_frame, - frame_count, relative_frame_number, - OHCI_BM(iso_td.flags, TD_DI), OHCI_BM(iso_td.flags, TD_CC)); + frame_count, relative_frame_number); trace_usb_ohci_iso_td_head_offset( iso_td.offset[0], iso_td.offset[1], iso_td.offset[2], iso_td.offset[3], diff --git a/trace-events b/trace-events index 646db01..9153f98 100644 --- a/trace-events +++ b/trace-events @@ -296,7 +296,7 @@ usb_port_release(int bus, const char *port) "bus %d, = port %s" =20 # hw/usb/hcd-ohci.c usb_ohci_iso_td_read_failed(uint32_t addr) "ISO_TD read error at %x" -usb_ohci_iso_td_head(uint32_t head, uint32_t tail, uint32_t flags, uint3= 2_t bp, uint32_t next, uint32_t be, uint32_t framenum, uint32_t startfram= e, uint32_t framecount, int rel_frame_num, uint32_t bm_di, uint32_t td_cc= ) "ISO_TD ED head 0x%.8x tailp 0x%.8x\n0x%.8x 0x%.8x 0x%.8x 0x%.8x\nframe= _number 0x%.8x starting_frame 0x%.8x\nframe_count 0x%.8x relative %d\ndi= 0x%.8x cc 0x%.8x" +usb_ohci_iso_td_head(uint32_t head, uint32_t tail, uint32_t flags, uint3= 2_t bp, uint32_t next, uint32_t be, uint32_t framenum, uint32_t startfram= e, uint32_t framecount, int rel_frame_num) "ISO_TD ED head 0x%.8x tailp 0= x%.8x\n0x%.8x 0x%.8x 0x%.8x 0x%.8x\nframe_number 0x%.8x starting_frame 0x= %.8x\nframe_count 0x%.8x relative %d" usb_ohci_iso_td_head_offset(uint32_t o0, uint32_t o1, uint32_t o2, uint3= 2_t o3, uint32_t o4, uint32_t o5, uint32_t o6, uint32_t o7) "0x%.8x 0x%.8= x 0x%.8x 0x%.8x 0x%.8x 0x%.8x 0x%.8x 0x%.8x" usb_ohci_iso_td_relative_frame_number_neg(int rel) "ISO_TD R=3D%d < 0" usb_ohci_iso_td_relative_frame_number_big(int rel, int count) "ISO_TD R=3D= %d > FC=3D%d" --=20 1.9.3