From nobody Mon Feb 9 18:46:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622554095; cv=none; d=zohomail.com; s=zohoarc; b=bJ4lrzMu+p3dwhdINlWe1v9XsggugfV35gEet4nnW7LnHK0x3g9nGjkRcIQxokNe+aelqk9x5QaX5nYaFgEVq6bRUJJrx2w9WHg2z1z8/Ab3ceBpptWGMHG1OG1DzXr6K2O02AFY5Qs2e/fWDZMjdIjQbKcjqichZcwxK6+Cbzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622554095; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BIzAkFblQQyoSZCk5PvWy8jsgPBiIsSm8FqckkOpJNw=; b=i90PY6VNSXm8yliSaiACKqnvCmWmW2g4glwowtB5jQtA0DrDRxDfMObCcuA3uoaYaHohNJWfzVcTJrahRNGbPe2JUweyjKcdX1krFD0b7aIcJ0MU58K/KR3u/hr9ggf8ulMn+dVsQMz1Ra6TYdCv17Ar9PUFFgSu2bdczbu7CWQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622554095614479.32883470710397; Tue, 1 Jun 2021 06:28:15 -0700 (PDT) Received: from localhost ([::1]:58790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lo4RK-00010l-Jy for importer@patchew.org; Tue, 01 Jun 2021 09:28:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lo4OT-0002z9-NB for qemu-devel@nongnu.org; Tue, 01 Jun 2021 09:25:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49261) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lo4OR-0007ib-1q for qemu-devel@nongnu.org; Tue, 01 Jun 2021 09:25:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-460--ZOS9r2nO_KxG9rs9rcu2Q-1; Tue, 01 Jun 2021 09:25:12 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CFF328015F8 for ; Tue, 1 Jun 2021 13:25:11 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-84.ams2.redhat.com [10.36.112.84]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2CF4C5D751; Tue, 1 Jun 2021 13:25:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B0D6918007AE; Tue, 1 Jun 2021 15:24:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622553914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BIzAkFblQQyoSZCk5PvWy8jsgPBiIsSm8FqckkOpJNw=; b=aZRCWi2Btf0OsqLmmIMfZ5949D4xPTzceZq1t8LyZL6b43l0iUe20crAzd9NmpAJ9dCjmV o961D2dRqFPZuMrrDIjTz650Zu5+kNa4VZFCpRPkhhoefrBg2IFsFdJazZGtXhAI2DziqF pM7ENyfVa1A3x29/IJBeGOZb+emE3Hc= X-MC-Unique: -ZOS9r2nO_KxG9rs9rcu2Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 09/13] trace/stap: build stap files for modules Date: Tue, 1 Jun 2021 15:24:10 +0200 Message-Id: <20210601132414.432430-10-kraxel@redhat.com> In-Reply-To: <20210601132414.432430-1-kraxel@redhat.com> References: <20210601132414.432430-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Stefan Hajnoczi --- meson.build | 32 ++++++++++++++++++++++++++++++++ trace/meson.build | 5 +++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 0e1c2f995d79..51fc261a22d3 100644 --- a/meson.build +++ b/meson.build @@ -2020,6 +2020,7 @@ foreach d, list : modules module_ss =3D module_ss.apply(config_all, strict: false) module_trace_cfg =3D module_trace.get(d + '-' + m, {}) module_trace_src =3D module_trace_cfg.get('src', []) + module_trace_evt =3D module_trace_cfg.get('evt', '') sl =3D static_library(d + '-' + m, [genh, module_ss.sources(), modul= e_trace_src], dependencies: [modulecommon, module_ss.dependenc= ies()], pic: true) if d =3D=3D 'block' @@ -2027,6 +2028,37 @@ foreach d, list : modules else softmmu_mods +=3D sl endif + if 'CONFIG_TRACE_SYSTEMTAP' in config_host and module_trace_evt !=3D= '' + modname =3D d + '-' + m + modlib =3D modname + '.so' + foreach stp: [ + {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_= dir() / modlib, 'install': false}, + {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') / qem= u_moddir / modlib, 'install': true}, + {'ext': '-simpletrace.stp', 'fmt': 'simpletrace-stap', 'bin': ''= , 'install': true}, + {'ext': '-log.stp', 'fmt': 'log-stap', 'bin': '', 'install': tru= e}, + ] + foreach target : target_dirs + config_target =3D config_target_mak[target] + target_name =3D config_target['TARGET_NAME'] + if target.endswith('-softmmu') + custom_target(modname + '-' + target_name + stp['ext'], + input: module_trace_evt, + output: modname + '-' + target_name + stp['ext= '], + install: stp['install'], + install_dir: get_option('datadir') / 'systemta= p/tapset', + command: [ + tracetool, '--group=3Dall', '--format=3D' + = stp['fmt'], + '--binary=3D' + stp['bin'], + '--target-name=3D' + target_name, + '--target-type=3Dsystem', + '--probe-prefix=3Dqemu.system.' + target_nam= e, + '@INPUT@', '@OUTPUT@' + ], + depend_files: tracetool_depends) + endif + endforeach + endforeach + endif else if d =3D=3D 'block' block_ss.add_all(module_ss) diff --git a/trace/meson.build b/trace/meson.build index 834ebaa7cc5f..82332a4a772b 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -16,7 +16,6 @@ endforeach =20 foreach c : trace_events_config trace_events_file =3D c.get('file') - trace_events_files +=3D [ trace_events_file ] module_name =3D c.get('module', '') group_name =3D c.get('group', module_name.underscorify()) group =3D '--group=3D' + group_name @@ -66,9 +65,11 @@ foreach c : trace_events_config genh +=3D trace_dtrace_h endif if enable_modules and module_name !=3D '' - module_trace +=3D { module_name : { 'src' : module_trace_src } } + module_trace +=3D { module_name : { 'src' : module_trace_src, + 'evt' : trace_events_file } } else trace_ss.add(module_trace_src) + trace_events_files +=3D [ trace_events_file ] endif endforeach =20 --=20 2.31.1