From patchwork Fri Jun 17 15:59:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 9184613 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 0A041608A2 for ; Fri, 17 Jun 2016 16:51:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8E952839F for ; Fri, 17 Jun 2016 16:51:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD81D283A8; Fri, 17 Jun 2016 16:51:10 +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=-6.9 required=2.0 tests=BAYES_00,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 6E7492839F for ; Fri, 17 Jun 2016 16:51:10 +0000 (UTC) Received: from localhost ([::1]:59055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwz7-0007AA-HR for patchwork-qemu-devel@patchwork.kernel.org; Fri, 17 Jun 2016 12:51:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwCA-0004Mg-Hf for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:00:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDwC5-0002hm-05 for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:00:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57045) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwC4-0002he-NE for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:00:28 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 3A3F463E2A; Fri, 17 Jun 2016 16:00:28 +0000 (UTC) Received: from localhost (ovpn-112-65.ams2.redhat.com [10.36.112.65]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5HG0Qta008922; Fri, 17 Jun 2016 12:00:27 -0400 From: Stefan Hajnoczi To: Date: Fri, 17 Jun 2016 16:59:24 +0100 Message-Id: <1466179193-11232-14-git-send-email-stefanha@redhat.com> In-Reply-To: <1466179193-11232-1-git-send-email-stefanha@redhat.com> References: <1466179193-11232-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 17 Jun 2016 16:00:28 +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] [PULL 13/42] 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 From: "Daniel P. Berrange" Move all trace-events for files in the hw/virtio/ directory to their own file. Signed-off-by: Daniel P. Berrange Message-id: 1466066426-16657-12-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- Makefile.objs | 1 + hw/virtio/trace-events | 16 ++++++++++++++++ trace-events | 14 -------------- 3 files changed, 17 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..2853053 --- /dev/null +++ b/hw/virtio/trace-events @@ -0,0 +1,16 @@ +# See docs/trace-events.txt for syntax documentation. + +# 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 37cac33..d2ac199 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"