From patchwork Thu Jun 9 16:58:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 9167507 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D7FB360467 for ; Thu, 9 Jun 2016 17:05:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C47C328342 for ; Thu, 9 Jun 2016 17:05:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8E3F28359; Thu, 9 Jun 2016 17:05:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=2.0 tests=BAYES_00,FSL_HELO_HOME, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4518828342 for ; Thu, 9 Jun 2016 17:05:38 +0000 (UTC) Received: from localhost ([::1]:35884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB3Oj-0002lu-D0 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 09 Jun 2016 13:05:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB3IK-0005Z1-Ig for qemu-devel@nongnu.org; Thu, 09 Jun 2016 12:59:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bB3IE-0004xW-Fl for qemu-devel@nongnu.org; Thu, 09 Jun 2016 12:59:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53265) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB3IE-0004xO-81 for qemu-devel@nongnu.org; Thu, 09 Jun 2016 12:58:54 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C1566112775; Thu, 9 Jun 2016 16:58:53 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-5-191.ams2.redhat.com [10.36.5.191]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u59Gwbid021940; Thu, 9 Jun 2016 12:58:52 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 9 Jun 2016 17:58:05 +0100 Message-Id: <1465491514-7365-12-git-send-email-berrange@redhat.com> In-Reply-To: <1465491514-7365-1-git-send-email-berrange@redhat.com> References: <1465491514-7365-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 09 Jun 2016 16:58:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 11/40] trace: split out trace events for hw/virtio/ directory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Move all trace-events for files in the hw/virtio/ directory to their own file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 1 + hw/virtio/trace-events | 41 +++++++++++++++++++++++++++++++++++++++++ trace-events | 14 -------------- 3 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 hw/virtio/trace-events diff --git a/Makefile.objs b/Makefile.objs index 867c135..165475c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -128,3 +128,4 @@ trace-events-y += hw/block/trace-events trace-events-y += hw/char/trace-events trace-events-y += hw/intc/trace-events trace-events-y += hw/net/trace-events +trace-events-y += hw/virtio/trace-events diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events new file mode 100644 index 0000000..b88c3dc --- /dev/null +++ b/hw/virtio/trace-events @@ -0,0 +1,41 @@ +# Trace events for debugging and performance instrumentation +# +# This file is processed by the tracetool script during the build. +# +# To add a new trace event: +# +# 1. Choose a name for the trace event. Declare its arguments and format +# string. +# +# 2. Call the trace event from code using trace_##name, e.g. multiwrite_cb() -> +# trace_multiwrite_cb(). The source file must #include "trace.h". +# +# Format of a trace event: +# +# [disable] ( [, ] ...) "" +# +# Example: g_malloc(size_t size) "size %zu" +# +# The "disable" keyword will build without the trace event. +# +# The must be a valid as a C function name. +# +# Types should be standard C types. Use void * for pointers because the trace +# system may not have the necessary headers included. +# +# The should be a sprintf()-compatible format string. + +# hw/virtio/virtio.c +virtqueue_fill(void *vq, const void *elem, unsigned int len, unsigned int idx) "vq %p elem %p len %u idx %u" +virtqueue_flush(void *vq, unsigned int count) "vq %p count %u" +virtqueue_pop(void *vq, void *elem, unsigned int in_num, unsigned int out_num) "vq %p elem %p in_num %u out_num %u" +virtio_queue_notify(void *vdev, int n, void *vq) "vdev %p n %d vq %p" +virtio_irq(void *vq) "vq %p" +virtio_notify(void *vdev, void *vq) "vdev %p vq %p" +virtio_set_status(void *vdev, uint8_t val) "vdev %p val %u" + +# hw/virtio/virtio-rng.c +virtio_rng_guest_not_ready(void *rng) "rng %p: guest not ready" +virtio_rng_pushed(void *rng, size_t len) "rng %p: %zd bytes pushed" +virtio_rng_request(void *rng, size_t size, unsigned quota) "rng %p: %zd bytes requested, %u bytes quota left" + diff --git a/trace-events b/trace-events index 1792f2b..8e8de59 100644 --- a/trace-events +++ b/trace-events @@ -25,20 +25,6 @@ # # The should be a sprintf()-compatible format string. -# hw/virtio/virtio.c -virtqueue_fill(void *vq, const void *elem, unsigned int len, unsigned int idx) "vq %p elem %p len %u idx %u" -virtqueue_flush(void *vq, unsigned int count) "vq %p count %u" -virtqueue_pop(void *vq, void *elem, unsigned int in_num, unsigned int out_num) "vq %p elem %p in_num %u out_num %u" -virtio_queue_notify(void *vdev, int n, void *vq) "vdev %p n %d vq %p" -virtio_irq(void *vq) "vq %p" -virtio_notify(void *vdev, void *vq) "vdev %p vq %p" -virtio_set_status(void *vdev, uint8_t val) "vdev %p val %u" - -# hw/virtio/virtio-rng.c -virtio_rng_guest_not_ready(void *rng) "rng %p: guest not ready" -virtio_rng_pushed(void *rng, size_t len) "rng %p: %zd bytes pushed" -virtio_rng_request(void *rng, size_t size, unsigned quota) "rng %p: %zd bytes requested, %u bytes quota left" - # thread-pool.c thread_pool_submit(void *pool, void *req, void *opaque) "pool %p req %p opaque %p" thread_pool_complete(void *pool, void *req, void *opaque, int ret) "pool %p req %p opaque %p ret %d"