From nobody Sun Feb 8 11:17:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1594894924; cv=none; d=zohomail.com; s=zohoarc; b=G6EzCwOcw4afI9G3diKkSSKVZifxzs0xAUx5ZMEg6hCn+ko3L4KR1P+CFajqc89OBgMUEW8ohZM8sdwuPjzcOdCyGW2aVfmn+tQkVwuvEwSQkmgrMVNl5amkpx9RBWDjzuIhBGdh5P+Hux2QGVgceg04NZRhBMbBO3eBcze4nmw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894924; 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=i3oH98p8TBqtt3zLeGKilbrs6/U6GsKbsWfHPOG85ic=; b=m7FkTB96gTI6MCPND5MbRIcBnE3H9/BgvF6IeJymfNWWrEGCLg5jFvRWva/76+PukUjEFaq5pLKAqrHhBpvTVw2NxVXmxLQINkXW008fN9gES1w8eZgQ4zJGjXXECRQY9f+v5FUAFTyw51z6rsTtr92KqmoZjwA9LTinMjG0GLw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894924535228.7236754663843; Thu, 16 Jul 2020 03:22:04 -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-299-UaEKNJlUPxazOiHGmDw1SQ-1; Thu, 16 Jul 2020 06:10:07 -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 01B63100AA22; Thu, 16 Jul 2020 10:10:02 +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 B7F7272AEE; Thu, 16 Jul 2020 10:10:00 +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 83250181AC45; Thu, 16 Jul 2020 10:10:00 +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 06GA62m8018938 for ; Thu, 16 Jul 2020 06:06:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9B65D2B6DB; Thu, 16 Jul 2020 10:06:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15D242B6E2 for ; Thu, 16 Jul 2020 10:06:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894923; 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=i3oH98p8TBqtt3zLeGKilbrs6/U6GsKbsWfHPOG85ic=; b=iDLNUXWQFAKu76UfYZYuPwQoureaQ5gXQRrk4iam0QuEekhnc+znDnXV3tsvRllxWG/qBi 5sIlhC+8QdyG2c5JutQHe6b+xLgwoZJ8YSJPhv8x5+wMI8JQG9C7mg5j1PqithIPNdOV/z tqu+QXX7iEvTiLYxEm/pqJwCE7i1Siw= X-MC-Unique: UaEKNJlUPxazOiHGmDw1SQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 243/351] meson: src: add check-driverimpls test Date: Thu, 16 Jul 2020 11:57:59 +0200 Message-Id: <755e77cd140c5d7fa802b3d8a2b420a3b8d8ae5e.1594891445.git.phrdina@redhat.com> 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.79 on 10.5.11.15 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 | 8 +------- src/bhyve/Makefile.inc.am | 1 - src/bhyve/meson.build | 2 ++ src/interface/Makefile.inc.am | 1 - src/interface/meson.build | 2 ++ src/libxl/Makefile.inc.am | 1 - src/libxl/meson.build | 2 ++ src/lxc/Makefile.inc.am | 4 ---- src/lxc/meson.build | 6 ++++++ src/meson.build | 11 +++++++++++ src/network/Makefile.inc.am | 1 - src/network/meson.build | 2 ++ src/node_device/Makefile.inc.am | 6 ------ src/node_device/meson.build | 2 ++ src/nwfilter/Makefile.inc.am | 1 - src/nwfilter/meson.build | 2 ++ src/qemu/Makefile.inc.am | 1 - src/qemu/meson.build | 2 ++ src/secret/Makefile.inc.am | 1 - src/secret/meson.build | 2 ++ src/storage/Makefile.inc.am | 1 - src/storage/meson.build | 2 ++ src/vbox/Makefile.inc.am | 6 ------ src/vbox/meson.build | 5 +++++ src/vz/Makefile.inc.am | 1 - src/vz/meson.build | 2 ++ 26 files changed, 43 insertions(+), 32 deletions(-) delete mode 100644 src/vbox/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index e5d338409dc..54e3ed42974 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,6 @@ # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. =20 -DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D augeas_DATA =3D augeastest_DATA =3D @@ -31,7 +30,6 @@ RPC_PROBE_FILES =3D =20 include locking/Makefile.inc.am include admin/Makefile.inc.am -include vbox/Makefile.inc.am include qemu/Makefile.inc.am include bhyve/Makefile.inc.am include libxl/Makefile.inc.am @@ -99,10 +97,6 @@ else !WITH_REMOTE check-protocol: endif !WITH_REMOTE =20 -check-driverimpls: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-driverimpls.p= y \ - $(DRIVER_SOURCE_FILES) - check-aclrules: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclrules.py \ $(REMOTE_PROTOCOL) \ @@ -114,7 +108,7 @@ check-aclperms: $(srcdir)/access/viraccessperm.c =20 check-local: check-protocol \ - check-driverimpls check-aclrules \ + check-aclrules \ check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 65021d785a2..7a9c6a87242 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SO= URCES)) diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index fd1f6bbad88..12b933b0b44 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -10,6 +10,8 @@ bhyve_sources =3D files( 'bhyve_process.c', ) =20 +driver_source_files +=3D bhyve_sources + if conf.has('WITH_BHYVE') bhyve_driver_impl =3D static_library( 'virt_driver_bhyve_impl', diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 06bd8f820b1..6cd6dff3b90 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES= )) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) diff --git a/src/interface/meson.build b/src/interface/meson.build index 8b5347bce43..bd04a7f350f 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -10,6 +10,8 @@ if conf.has('WITH_UDEV') interface_driver_sources +=3D 'interface_backend_udev.c' endif =20 +driver_source_files +=3D files(interface_driver_sources) + if conf.has('WITH_INTERFACE') virt_modules +=3D { 'name': 'virt_driver_interface', diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 5af19c83512..d713f4e75aa 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SO= URCES)) diff --git a/src/libxl/meson.build b/src/libxl/meson.build index a5df0011b0b..6720d826435 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -10,6 +10,8 @@ libxl_driver_sources =3D [ 'xen_xm.c', ] =20 +driver_source_files +=3D files(libxl_driver_sources) + if conf.has('WITH_LIBXL') libxl_driver_imp =3D static_library( 'virt_driver_libxl_impl', diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 7f312975d6c..6abd08e333e 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -1,9 +1,5 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ - $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build index ccb11ee1d42..65dff6a7c4b 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -40,6 +40,12 @@ lxc_monitor_generated =3D custom_target( capture: true, ) =20 +driver_source_files +=3D [ + files(lxc_driver_sources), + lxc_monitor_protocol_generated, + lxc_monitor_generated, +] + lxc_controller_sources =3D files( 'lxc_conf.c', 'lxc_container.c', diff --git a/src/meson.build b/src/meson.build index 5fb90f61687..e30bf7e90b6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -207,6 +207,10 @@ sysconf_files =3D [] # list of directories to create during installation virt_install_dirs =3D [] =20 +# driver_source_files: +# driver source files to check +driver_source_files =3D [] + =20 # list subdirectories =20 @@ -835,3 +839,10 @@ test( ], env: runutf8, ) + +test( + 'check-driverimpls', + python3_prog, + args: [ check_driverimpls_prog.path(), driver_source_files ], + env: runutf8, +) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index c13a6831cc0..cf5cff4ea88 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) diff --git a/src/network/meson.build b/src/network/meson.build index 948dad39432..c33404dfd96 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -3,6 +3,8 @@ network_driver_sources =3D [ 'bridge_driver_platform.c', ] =20 +driver_source_files +=3D files(network_driver_sources) + network_leases_helper_sources =3D files( 'leaseshelper.c', ) diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 63d2548e11f..ddd906fa782 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -1,11 +1,5 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_HAL_SOURCES)) \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_UDEV_SOURCES)) \ - $(NULL) - STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(NULL) diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 437924466eb..0ac2aecf4f1 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -10,6 +10,8 @@ if conf.has('WITH_UDEV') node_device_driver_sources +=3D 'node_device_udev.c' endif =20 +driver_source_files +=3D files(node_device_driver_sources) + if conf.has('WITH_NODE_DEVICES') node_device_driver_impl =3D static_library( 'virt_driver_nodedev_impl', diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 4d34d7f3ad1..68bc42c2edf 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index a05f0ce8fcf..c2c186903d8 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -6,6 +6,8 @@ nwfilter_driver_sources =3D [ 'nwfilter_learnipaddr.c', ] =20 +driver_source_files +=3D files(nwfilter_driver_sources) + if conf.has('WITH_NWFILTER') nwfilter_driver_impl =3D static_library( 'virt_driver_nwfilter_impl', diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index f665cb1f130..96265d2893b 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 7bdaf6c19bd..c74acf9d14b 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -37,6 +37,8 @@ qemu_driver_sources =3D [ 'qemu_virtiofs.c', ] =20 +driver_source_files +=3D files(qemu_driver_sources) + qemu_dtrace_gen_headers =3D [] qemu_dtrace_gen_objects =3D [] =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index a60a6b507f4..361305283a5 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) diff --git a/src/secret/meson.build b/src/secret/meson.build index 2245790f796..bbcd74ce309 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -2,6 +2,8 @@ secret_driver_sources =3D [ 'secret_driver.c', ] =20 +driver_source_files +=3D files(secret_driver_sources) + if conf.has('WITH_SECRETS') virt_modules +=3D { 'name': 'virt_driver_secret', diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index d5438e8a71c..0834ac43a64 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) diff --git a/src/storage/meson.build b/src/storage/meson.build index 59024746322..b14dcf969d9 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -8,6 +8,8 @@ storage_driver_sources =3D [ storage_driver_backend_sources, ] =20 +driver_source_files +=3D files(storage_driver_sources) + storage_backend_fs_sources =3D [ 'storage_backend_fs.c', ] diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am deleted file mode 100644 index 6197c3172b5..00000000000 --- a/src/vbox/Makefile.inc.am +++ /dev/null @@ -1,6 +0,0 @@ -# vim: filetype=3Dautomake - -DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ - $(srcdir)/vbox/vbox_tmpl.c \ - $(NULL) diff --git a/src/vbox/meson.build b/src/vbox/meson.build index b6dcee279b9..8451e3018be 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -10,6 +10,11 @@ vbox_driver_sources =3D [ 'vbox_XPCOMCGlue.c', ] =20 +driver_source_files +=3D files( + vbox_driver_sources, + 'vbox_tmpl.c', +) + if conf.has('WITH_VBOX') vbox_driver_impl =3D static_library( 'virt_driver_vbox_impl', diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 380d1ffb839..eb6721fb135 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURC= ES)) diff --git a/src/vz/meson.build b/src/vz/meson.build index 9e8ac3f8cfc..903e1f1359f 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -4,6 +4,8 @@ vz_driver_sources =3D [ 'vz_sdk.c', ] =20 +driver_source_files +=3D files(vz_driver_sources) + if conf.has('WITH_VZ') vz_driver_impl =3D static_library( 'virt_driver_vz_impl', --=20 2.26.2