From patchwork Thu Sep 25 09:38:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 37911 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5386220560 for ; Thu, 25 Sep 2014 09:39:42 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id q1sf319955lam.4 for ; Thu, 25 Sep 2014 02:39:40 -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=B60YcCf6A8KRFblM8gR3h18q3vzKx9JvTiaid/BFv90=; b=ZIVyerinF6EeaES4UbARH+co7Qc7YNJeNU/zyBMpOpDxnRaHtbxNMKnbEgqhNjZIrt FzC/ny2Gf8zbiIW5b2P8+kK1P8WaV8CNcRvqtsEz6PXzqS0U5mqBAKH+wma3Sy7D9Elm jrInk+2IT8tOe3GdXZ7Q+H1aaSiNYjUfLXi8wAWb5Tp+gDAp35G9sBtC504BS4pmbopy mfAAfJmkfDsyU4DsTiGB/9H6qC/KSbpX2PGkdrcXFf4Fhjaj2WE8CtKy5J8sXbHHy/O9 Zo2yk3gY/JEwYfmkoBGn4feGFM+hLnBzzqYzvuVT9yC20bSHqfiBvVOZauNZDWpaT2o+ REyA== X-Gm-Message-State: ALoCoQlKM4HYPIPHZbOOwP1m8kzLHtFm+VaqHUMSQPcpMDzlVbXEmxpg0rg3HROP/6oFPkIHQSzS X-Received: by 10.180.160.169 with SMTP id xl9mr4955907wib.7.1411637980028; Thu, 25 Sep 2014 02:39:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.170 with SMTP id z10ls249467laj.73.gmail; Thu, 25 Sep 2014 02:39:39 -0700 (PDT) X-Received: by 10.112.48.100 with SMTP id k4mr2179802lbn.95.1411637979774; Thu, 25 Sep 2014 02:39:39 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com [209.85.215.51]) by mx.google.com with ESMTPS id jm10si2239003lbc.49.2014.09.25.02.39.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Sep 2014 02:39:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id pv20so2648290lab.38 for ; Thu, 25 Sep 2014 02:39:39 -0700 (PDT) X-Received: by 10.112.76.6 with SMTP id g6mr11567640lbw.22.1411637979352; Thu, 25 Sep 2014 02:39:39 -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 of9csp719975lbb; Thu, 25 Sep 2014 02:39:38 -0700 (PDT) X-Received: by 10.224.131.7 with SMTP id v7mr16486494qas.5.1411637977870; Thu, 25 Sep 2014 02:39:37 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e88si1911076qga.20.2014.09.25.02.39.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 25 Sep 2014 02:39:37 -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]:39166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XX5WS-0001vX-VK for patch@linaro.org; Thu, 25 Sep 2014 05:39:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XX5Vy-0001Xe-J7 for qemu-devel@nongnu.org; Thu, 25 Sep 2014 05:39:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XX5Vt-0002G0-OA for qemu-devel@nongnu.org; Thu, 25 Sep 2014 05:39:06 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:46985 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XX5Vt-0002F8-IY for qemu-devel@nongnu.org; Thu, 25 Sep 2014 05:39:01 -0400 Received: from localhost ([127.0.0.1] helo=zen.linaro.local) by socrates.bennee.com with esmtp (Exim 4.80) (envelope-from ) id 1XX5t1-0004Po-95; Thu, 25 Sep 2014 12:02:55 +0200 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: aik@ozlabs.ru Date: Thu, 25 Sep 2014 10:38:44 +0100 Message-Id: <1411637924-6981-1-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411604219-15029-1-git-send-email-aik@ozlabs.ru> References: <1411604219-15029-1-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 88.198.71.155 Cc: qemu-devel@nongnu.org, kraxel@redhat.com, stefanha@redhat.com, mohamad.gebai@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , vilanova@ac.upc.edu Subject: [Qemu-devel] [PATCH] 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: alex.bennee@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.51 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 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 --- 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 a3c1aac..ac962be 100644 --- a/trace-events +++ b/trace-events @@ -297,7 +297,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"