Commit bc0d104c authored Sep 25, 2014 by Alex Bennée Committed by Stefan Hajnoczi Sep 26, 2014

ohci: drop computed flags from trace events



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ée <alex.bennee@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

parent 3af8f177

hw/usb/hcd-ohci.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -724,8 +724,7 @@ static int ohci_service_iso_td(OHCIState ohci, struct 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],

trace-events

+1 −1

Original line number	Diff line number	Diff line
		@@ -296,7 +296,7 @@ usb_port_release(int bus, const char *port) "bus %d, port %s"

		# 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, uint32_t bp, uint32_t next, uint32_t be, uint32_t framenum, uint32_t startframe, 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, uint32_t bp, uint32_t next, uint32_t be, uint32_t framenum, uint32_t startframe, uint32_t framecount, int rel_frame_num) "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"
		usb_ohci_iso_td_head_offset(uint32_t o0, uint32_t o1, uint32_t o2, uint32_t o3, uint32_t o4, uint32_t o5, uint32_t o6, uint32_t o7) "0x%.8x 0x%.8x 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=%d < 0"
		usb_ohci_iso_td_relative_frame_number_big(int rel, int count) "ISO_TD R=%d > FC=%d"