From nobody Mon Feb 9 08:57:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1485956825538302.9525666219181; Wed, 1 Feb 2017 05:47:05 -0800 (PST) Received: from localhost ([::1]:51059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYvFW-0007Uj-6u for importer@patchew.org; Wed, 01 Feb 2017 08:47:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYvDY-0006Ie-Et for qemu-devel@nongnu.org; Wed, 01 Feb 2017 08:45:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYvDX-0004he-IO for qemu-devel@nongnu.org; Wed, 01 Feb 2017 08:45:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55142) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cYvDX-0004gY-CZ for qemu-devel@nongnu.org; Wed, 01 Feb 2017 08:44:59 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 72E41C04B332; Wed, 1 Feb 2017 13:44:59 +0000 (UTC) Received: from localhost (ovpn-116-240.ams2.redhat.com [10.36.116.240]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v11Diw4Z029020; Wed, 1 Feb 2017 08:44:58 -0500 From: Stefan Hajnoczi To: Date: Wed, 1 Feb 2017 13:44:45 +0000 Message-Id: <20170201134453.11963-3-stefanha@redhat.com> In-Reply-To: <20170201134453.11963-1-stefanha@redhat.com> References: <20170201134453.11963-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 01 Feb 2017 13:44:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 02/10] trace: move hw/block/dataplane events to correct subdir 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Daniel P. Berrange" The trace-events for a given source file should generally always live in the same directory as the source file. Reviewed-by: Stefan Hajnoczi Signed-off-by: Daniel P. Berrange Message-id: 20170125161417.31949-3-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- Makefile.objs | 1 + hw/block/dataplane/trace-events | 6 ++++++ hw/block/trace-events | 5 ----- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 hw/block/dataplane/trace-events diff --git a/Makefile.objs b/Makefile.objs index 01cef86..babbc4e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -125,6 +125,7 @@ trace-events-y +=3D io/trace-events trace-events-y +=3D migration/trace-events trace-events-y +=3D block/trace-events trace-events-y +=3D hw/block/trace-events +trace-events-y +=3D hw/block/dataplane/trace-events trace-events-y +=3D hw/char/trace-events trace-events-y +=3D hw/intc/trace-events trace-events-y +=3D hw/net/trace-events diff --git a/hw/block/dataplane/trace-events b/hw/block/dataplane/trace-eve= nts new file mode 100644 index 0000000..13f5dbb --- /dev/null +++ b/hw/block/dataplane/trace-events @@ -0,0 +1,6 @@ +# See docs/tracing.txt for syntax documentation. + +# hw/block/dataplane/virtio-blk.c +virtio_blk_data_plane_start(void *s) "dataplane %p" +virtio_blk_data_plane_stop(void *s) "dataplane %p" +virtio_blk_data_plane_process_request(void *s, unsigned int out_num, unsig= ned int in_num, unsigned int head) "dataplane %p out_num %u in_num %u head = %u" diff --git a/hw/block/trace-events b/hw/block/trace-events index d0dd94f..65e83dc 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -7,11 +7,6 @@ virtio_blk_handle_write(void *req, uint64_t sector, size_t= nsectors) "req %p sec virtio_blk_handle_read(void *req, uint64_t sector, size_t nsectors) "req %= p sector %"PRIu64" nsectors %zu" virtio_blk_submit_multireq(void *mrb, int start, int num_reqs, uint64_t of= fset, size_t size, bool is_write) "mrb %p start %d num_reqs %d offset %"PRI= u64" size %zu is_write %d" =20 -# hw/block/dataplane/virtio-blk.c -virtio_blk_data_plane_start(void *s) "dataplane %p" -virtio_blk_data_plane_stop(void *s) "dataplane %p" -virtio_blk_data_plane_process_request(void *s, unsigned int out_num, unsig= ned int in_num, unsigned int head) "dataplane %p out_num %u in_num %u head = %u" - # hw/block/hd-geometry.c hd_geometry_lchs_guess(void *blk, int cyls, int heads, int secs) "blk %p L= CHS %d %d %d" hd_geometry_guess(void *blk, uint32_t cyls, uint32_t heads, uint32_t secs,= int trans) "blk %p CHS %u %u %u trans %d" --=20 2.9.3