From nobody Sun Feb 8 22:08:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894430; cv=none; d=zohomail.com; s=zohoarc; b=ckQG1TFuMIoeYUCLtX6n4BCAQzg8oHAOLq7p2DFzOc3aMxBptbOj3ZuSeqYanugOn+M6pjcSO4xq4WXaTCT7vLqWy95Hrene0/ofFiN2yPw8/869EkcS5aMxcqN2QbC6raxAtHWDURvKHH5wmZ2AxYuYnqBgSEuqhKn/R1rfWR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894430; h=Content-Type:Content-Transfer-Encoding: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=XFZvcyoCQ1uN7GoihsNBC5ZL9ChWUbNnk68FZNxMqsA=; b=ji90Acl1+V+cnrwd+EPcG12A+VT+I/Ey6XfqGiT6/UlNEbtdd69KmqBhbv7OEbFHhhscuNWLxxHkC9wJjcmg8hXl8GLU85dYqTvKfCT5jND6tFq+tBqAGoH8EI+Lo6nyEu1IKPhd75dDAKtS8QdDNR0zhVTAwZlkNcjkk5SWudY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894430881468.68641247479536; Thu, 16 Jul 2020 03:13:50 -0700 (PDT) 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-312-6KQHnI9aNPO0zEQgQdiZ8Q-1; Thu, 16 Jul 2020 06:13:47 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0FE701098; Thu, 16 Jul 2020 10:13:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E27F010098A1; Thu, 16 Jul 2020 10:13:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B49551803503; Thu, 16 Jul 2020 10:13:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA66at019326 for ; Thu, 16 Jul 2020 06:06:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3DCAB2B6DC; Thu, 16 Jul 2020 10:06:06 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABD292B6DB for ; Thu, 16 Jul 2020 10:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894429; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XFZvcyoCQ1uN7GoihsNBC5ZL9ChWUbNnk68FZNxMqsA=; b=CNUUbG3ubm+mfnsXSxgakCIB17Ax3An2Az5eGqWwxVoO8f0FxSwjjt7U4aTtOZ2R4hQLVn h13TEILVmH/nnWxw5XWgLl+nJXPvqVArK0cNAypPV3Ddyty3SLd0Vi1PindOSvSy0op0PJ 7KdOB34RN91uBNGjSzF0FF6iy8ECrCE= X-MC-Unique: 6KQHnI9aNPO0zEQgQdiZ8Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 247/351] meson: src: build libvirt_functions.stp Date: Thu, 16 Jul 2020 11:58:03 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/Makefile.am | 24 ------------------------ src/admin/meson.build | 2 ++ src/locking/Makefile.inc.am | 3 --- src/locking/meson.build | 2 ++ src/lxc/Makefile.inc.am | 9 --------- src/lxc/meson.build | 2 ++ src/meson.build | 14 ++++++++++++++ src/remote/meson.build | 2 ++ src/rpc/meson.build | 2 ++ 9 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 src/locking/Makefile.inc.am delete mode 100644 src/lxc/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 88e44fab2b9..7289f247362 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,14 +20,9 @@ # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. =20 -if WITH_DTRACE_PROBES -tapset_DATA =3D -endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D =20 -include locking/Makefile.inc.am include admin/Makefile.inc.am -include lxc/Makefile.inc.am =20 =20 # Keep this list synced with RPC_PROBE_FILES @@ -87,22 +82,3 @@ endif !WITH_REMOTE check-local: check-protocol \ check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) - - -if WITH_DTRACE_PROBES - -tapset_DATA +=3D libvirt_functions.stp - -# Keep this list synced with PROTOCOL_STRUCTS -RPC_PROBE_FILES +=3D $(srcdir)/rpc/virnetprotocol.x \ - $(srcdir)/rpc/virkeepaliveprotocol.x \ - $(srcdir)/remote/remote_protocol.x \ - $(srcdir)/remote/lxc_protocol.x \ - $(srcdir)/remote/qemu_protocol.x \ - $(srcdir)/admin/admin_protocol.x - -libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)/scripts/gensystemt= ap.py - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/gensystemtap.py \ - $(RPC_PROBE_FILES) > $@ - -endif WITH_DTRACE_PROBES diff --git a/src/admin/meson.build b/src/admin/meson.build index c9dff4d92a0..330fe2f98d1 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -5,6 +5,8 @@ admin_driver_sources =3D [ =20 admin_driver_protocol =3D files('admin_protocol.x') =20 +rpc_probe_files +=3D admin_driver_protocol + admin_driver_generated =3D [] =20 admin_driver_generated +=3D custom_target( diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am deleted file mode 100644 index 285e73a6bf4..00000000000 --- a/src/locking/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x diff --git a/src/locking/meson.build b/src/locking/meson.build index dbff78ca1bb..5c49bc641f8 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -1,5 +1,7 @@ lock_protocol =3D 'lock_protocol.x' =20 +rpc_probe_files +=3D files(lock_protocol) + lock_driver_sources =3D [ 'lock_manager.c', 'lock_driver_nop.c', diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am deleted file mode 100644 index 564b3519bcb..00000000000 --- a/src/lxc/Makefile.inc.am +++ /dev/null @@ -1,9 +0,0 @@ -# vim: filetype=3Dautomake - -if WITH_LXC - -if WITH_DTRACE_PROBES -RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x -endif - -endif WITH_LXC diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 8b51093a387..0999e1c96b8 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -13,6 +13,8 @@ lxc_driver_sources =3D [ =20 lxc_monitor_protocol =3D files('lxc_monitor_protocol.x') =20 +rpc_probe_files +=3D lxc_monitor_protocol + lxc_monitor_protocol_generated =3D [] =20 lxc_monitor_protocol_generated +=3D custom_target( diff --git a/src/meson.build b/src/meson.build index 9b4c26e32ea..7965c5fb18a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -75,6 +75,8 @@ if conf.has('WITH_DTRACE_PROBES') ) endif =20 +rpc_probe_files =3D [] + =20 # symbol files =20 @@ -802,6 +804,18 @@ foreach sysconf : sysconf_files ) endforeach =20 +if conf.has('WITH_DTRACE_PROBES') + custom_target( + 'libvirt_functions.stp', + input: rpc_probe_files, + output: 'libvirt_functions.stp', + command: [ meson_python_prog, gensystemtap_prog, '@INPUT@' ], + capture: true, + install: true, + install_dir: systemtap_dir, + ) +endif + =20 # Install empty directories =20 diff --git a/src/remote/meson.build b/src/remote/meson.build index 055857ae360..fa7ce7ce5be 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -37,6 +37,8 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', ], ) + + rpc_probe_files +=3D files(protocol_x) endforeach =20 remote_daemon_sources =3D files( diff --git a/src/rpc/meson.build b/src/rpc/meson.build index 8f4372bb3e2..d759fa21aec 100644 --- a/src/rpc/meson.build +++ b/src/rpc/meson.build @@ -45,6 +45,8 @@ foreach name : [ 'virnet', 'virkeepalive' ] genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', ], ) + + rpc_probe_files +=3D protocol_file endforeach =20 rpc_server_sources =3D [ --=20 2.26.2