From patchwork Fri Sep 26 10:59:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 37957 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 931AF20F2E for ; Fri, 26 Sep 2014 11:08:08 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id c13sf5874956eek.11 for ; Fri, 26 Sep 2014 04:08:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=Pozg1KbgXgxbfJ11mCwU/uGd6Rm/63OdDvQ/aodtE2w=; b=h59GqfuBgPlDYTm1diGkLCo7+MOAbs5CnOthLdwui16em8Qo1EsjFxgorAkt7ya0SP 6865+tToDxPd3wrRI5zMNHXd8FY+sCRUWZ2eT6GMk2ksRL8H9m2UW6NSualfl5aIMaeV OCimjgWE3TlmkziVdllhsb1mSjVo0poehha+al/kmcamoLatfotbGls/aG9u54apbtba 0dkxPrJd+6Hqo6RfnRdSGHVxg7ewL22mRRJI3ZyvbsJinGVlarhYqGX2zTdZfdwkAnZB uN6w82om/cklRCQeqf14ROmAZvsr3OzE3Uj6xmr8064UQJAwEMLd+waUHGJoVv1nM8gJ FiiA== X-Gm-Message-State: ALoCoQkHGn4t9L4tsOx6vNl+2VBVb97KafG+5Yo8GAA/y6pl21S7NCsPJxifn//sKpQdgU21mSie X-Received: by 10.181.28.169 with SMTP id jp9mr3478824wid.6.1411729687719; Fri, 26 Sep 2014 04:08:07 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.167 with SMTP id dd7ls356652lad.36.gmail; Fri, 26 Sep 2014 04:08:07 -0700 (PDT) X-Received: by 10.112.170.165 with SMTP id an5mr9952259lbc.6.1411729687435; Fri, 26 Sep 2014 04:08:07 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41]) by mx.google.com with ESMTPS id a8si6782069lbp.24.2014.09.26.04.08.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Sep 2014 04:08:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id s18so14369676lam.0 for ; Fri, 26 Sep 2014 04:08:07 -0700 (PDT) X-Received: by 10.152.7.8 with SMTP id f8mr19324744laa.27.1411729686745; Fri, 26 Sep 2014 04:08:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp41028lbb; Fri, 26 Sep 2014 04:08:06 -0700 (PDT) X-Received: by 10.140.18.179 with SMTP id 48mr23716826qgf.52.1411729685582; Fri, 26 Sep 2014 04:08:05 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n5si5480271qat.86.2014.09.26.04.08.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 26 Sep 2014 04:08:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:47040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXTNc-0001qZ-Kz for patch@linaro.org; Fri, 26 Sep 2014 07:08:04 -0400 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 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 s8QB0DV5001495 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 26 Sep 2014 07:00:14 -0400 Received: from localhost (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8QB0BTE021212; Fri, 26 Sep 2014 07:00:12 -0400 From: Stefan Hajnoczi To: 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 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id s8QB0DV5001495 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefan Hajnoczi Subject: [Qemu-devel] [PULL 16/16] ohci: drop computed flags from trace events 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Alex Bennée 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 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, 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], 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" # 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"