From nobody Sun Feb 8 15:30:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894712; cv=none; d=zohomail.com; s=zohoarc; b=f3a25d0A0FWKkLeM6RH8zaoFRQx8wB7tEo/un13dXWB20dfVDAF9ZpHd7knroQGT6Xaji2QWDBNy+Msw8pU4s8Gnuoojs0/TS3+12UvWemHJR1H7xshsus56ZECBAIbwSF3ii18OJ/UFgwIcJYsMWWKMdFkYrTNUuW9Q7kdiOFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894712; 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=Cn4J8xm3630sfwFuu+dXKlezxnz+ZhPjrmatMFlzb3Q=; b=agpafXXtfEAyN91UwuKnq66ZA3ZJ1y5EyaTK6EW8YZ/sH6ZiuMRoVROyp4urqzJ5KdtdqN3U4Vhhrq0Xw/aSO30/KLCJgpRaT69vG9OTrLTjJ+vBmOvwGOGBryh5u5zUL5+aGTCQe0YXRiR2QhcCC7pZjIWVdnRasEKJnhNSqcE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894712000225.07434924786958; Thu, 16 Jul 2020 03:18:32 -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-503-STBhuI1CMxq_tnyC3DNlWw-1; Thu, 16 Jul 2020 06:07:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD480100AA34; Thu, 16 Jul 2020 10:07:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 475486146F; Thu, 16 Jul 2020 10:07:27 +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 1819496232; Thu, 16 Jul 2020 10:07:27 +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 06GA3bkE017300 for ; Thu, 16 Jul 2020 06:03:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D8862DE69; Thu, 16 Jul 2020 10:03:37 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 088D92B6DB for ; Thu, 16 Jul 2020 10:03:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894710; 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=Cn4J8xm3630sfwFuu+dXKlezxnz+ZhPjrmatMFlzb3Q=; b=Jpfwro6XxIpRaBej7EgoCFByhDgzvXkPNSKMDK+5kGJdWHctqj0MmE6NQ+CqS9zCsR+3CV nnYHpt6ZOtSgW+z02MSaDycSZf3nTTHSIcY1aCVHPhDEB/5OZ711e1ihW8t1k4wJE/uS9M Bi/9SjIgBSXVtPEoX7QEkXsedLX8yQ8= X-MC-Unique: STBhuI1CMxq_tnyC3DNlWw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 131/351] meson: src: build libvirt_conf.a static lib Date: Thu, 16 Jul 2020 11:56:07 +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.79 on 10.5.11.16 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 | 1 - src/conf/Makefile.inc.am | 191 --------------------------------------- src/conf/meson.build | 108 ++++++++++++++++++++++ src/meson.build | 2 + 4 files changed, 110 insertions(+), 192 deletions(-) delete mode 100644 src/conf/Makefile.inc.am create mode 100644 src/conf/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index e533e27b344..01ae2596c31 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,7 +69,6 @@ COMMON_UNIT_VARS =3D \ lib_LTLIBRARIES +=3D libvirt.la libvirt-qemu.la libvirt-lxc.la =20 include util/Makefile.inc.am -include conf/Makefile.inc.am include cpu/Makefile.inc.am include cpu_map/Makefile.inc.am include security/Makefile.inc.am diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am deleted file mode 100644 index debc6f4eef0..00000000000 --- a/src/conf/Makefile.inc.am +++ /dev/null @@ -1,191 +0,0 @@ -# vim: filetype=3Dautomake - -NETDEV_CONF_SOURCES =3D \ - conf/netdev_bandwidth_conf.h \ - conf/netdev_bandwidth_conf.c \ - conf/netdev_vport_profile_conf.h \ - conf/netdev_vport_profile_conf.c \ - conf/netdev_vlan_conf.h \ - conf/netdev_vlan_conf.c \ - conf/virnetworkportdef.h \ - conf/virnetworkportdef.c \ - $(NULL) - -DOMAIN_CONF_SOURCES =3D \ - conf/backup_conf.c \ - conf/backup_conf.h \ - conf/capabilities.c \ - conf/capabilities.h \ - conf/checkpoint_conf.c \ - conf/checkpoint_conf.h \ - conf/domain_addr.c \ - conf/domain_addr.h \ - conf/domain_capabilities.c \ - conf/domain_capabilities.h \ - conf/domain_conf.c \ - conf/domain_conf.h \ - conf/domain_audit.c \ - conf/domain_audit.h \ - conf/domain_nwfilter.c \ - conf/domain_nwfilter.h \ - conf/virsavecookie.c \ - conf/virsavecookie.h \ - conf/moment_conf.c \ - conf/moment_conf.h \ - conf/snapshot_conf.c \ - conf/snapshot_conf.h \ - conf/snapshot_conf_priv.h \ - conf/numa_conf.c \ - conf/numa_conf.h \ - conf/virconftypes.h \ - conf/virdomaincheckpointobjlist.c \ - conf/virdomaincheckpointobjlist.h \ - conf/virdomainobjlist.c \ - conf/virdomainobjlist.h \ - conf/virdomainmomentobjlist.c \ - conf/virdomainmomentobjlist.h \ - conf/virdomainsnapshotobjlist.c \ - conf/virdomainsnapshotobjlist.h \ - $(NULL) - -OBJECT_EVENT_SOURCES =3D \ - conf/object_event.c \ - conf/object_event.h \ - conf/object_event_private.h \ - $(NULL) - -DOMAIN_EVENT_SOURCES =3D \ - conf/domain_event.c \ - conf/domain_event.h \ - $(NULL) - -NETWORK_EVENT_SOURCES =3D \ - conf/network_event.c \ - conf/network_event.h \ - $(NULL) - -STORAGE_EVENT_SOURCES =3D \ - conf/storage_event.c \ - conf/storage_event.h \ - $(NULL) - -NODE_DEVICE_EVENT_SOURCES =3D \ - conf/node_device_event.c \ - conf/node_device_event.h \ - $(NULL) - -SECRET_EVENT_SOURCES =3D \ - conf/secret_event.c \ - conf/secret_event.h \ - $(NULL) - -NETWORK_CONF_SOURCES =3D \ - conf/network_conf.c \ - conf/network_conf.h \ - conf/virnetworkobj.c \ - conf/virnetworkobj.h \ - conf/networkcommon_conf.c \ - conf/networkcommon_conf.h \ - $(NULL) - -NWFILTER_PARAM_CONF_SOURCES =3D \ - conf/nwfilter_params.c \ - conf/nwfilter_params.h \ - conf/nwfilter_ipaddrmap.c \ - conf/nwfilter_ipaddrmap.h \ - conf/nwfilter_conf.h \ - conf/virnwfilterobj.h \ - $(NULL) - -NWFILTER_CONF_SOURCES =3D \ - $(NWFILTER_PARAM_CONF_SOURCES) \ - conf/nwfilter_conf.c \ - conf/nwfilter_conf.h \ - conf/virnwfilterobj.c \ - conf/virnwfilterobj.h \ - conf/virnwfilterbindingdef.c \ - conf/virnwfilterbindingdef.h \ - conf/virnwfilterbindingobj.c \ - conf/virnwfilterbindingobj.h \ - conf/virnwfilterbindingobjlist.c \ - conf/virnwfilterbindingobjlist.h \ - $(NULL) - -STORAGE_CONF_SOURCES =3D \ - conf/storage_adapter_conf.h \ - conf/storage_adapter_conf.c \ - conf/storage_capabilities.h \ - conf/storage_capabilities.c \ - conf/storage_conf.h \ - conf/storage_conf.c \ - conf/virstorageobj.h \ - conf/virstorageobj.c \ - $(NULL) - -INTERFACE_CONF_SOURCES =3D \ - conf/interface_conf.c \ - conf/interface_conf.h \ - conf/virinterfaceobj.c \ - conf/virinterfaceobj.h \ - $(NULL) - -SECRET_CONF_SOURCES =3D \ - conf/secret_conf.h \ - conf/secret_conf.c \ - conf/virsecretobj.h \ - conf/virsecretobj.c \ - $(NULL) - -NODE_DEVICE_CONF_SOURCES =3D \ - conf/node_device_conf.c \ - conf/node_device_conf.h \ - conf/node_device_util.c \ - conf/node_device_util.h \ - conf/virnodedeviceobj.c \ - conf/virnodedeviceobj.h \ - $(NULL) - -CPU_CONF_SOURCES =3D \ - conf/cpu_conf.c \ - conf/cpu_conf.h \ - $(NULL) - -CHRDEV_CONF_SOURCES =3D \ - conf/virchrdev.c \ - conf/virchrdev.h \ - $(NULL) - -DEVICE_CONF_SOURCES =3D \ - conf/device_conf.c \ - conf/device_conf.h \ - $(NULL) - -CONF_SOURCES =3D \ - $(NETDEV_CONF_SOURCES) \ - $(DOMAIN_CONF_SOURCES) \ - $(OBJECT_EVENT_SOURCES) \ - $(DOMAIN_EVENT_SOURCES) \ - $(NETWORK_EVENT_SOURCES) \ - $(STORAGE_EVENT_SOURCES) \ - $(NODE_DEVICE_EVENT_SOURCES) \ - $(SECRET_EVENT_SOURCES) \ - $(NETWORK_CONF_SOURCES) \ - $(NWFILTER_CONF_SOURCES) \ - $(NODE_DEVICE_CONF_SOURCES) \ - $(STORAGE_CONF_SOURCES) \ - $(INTERFACE_CONF_SOURCES) \ - $(SECRET_CONF_SOURCES) \ - $(CPU_CONF_SOURCES) \ - $(CHRDEV_CONF_SOURCES) \ - $(DEVICE_CONF_SOURCES) \ - $(NULL) - -noinst_LTLIBRARIES +=3D libvirt_conf.la -libvirt_la_BUILT_LIBADD +=3D libvirt_conf.la -libvirt_conf_la_SOURCES =3D $(CONF_SOURCES) -libvirt_conf_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_conf_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_conf_la_LIBADD =3D $(LIBXML_LIBS) diff --git a/src/conf/meson.build b/src/conf/meson.build new file mode 100644 index 00000000000..394cca4e6a1 --- /dev/null +++ b/src/conf/meson.build @@ -0,0 +1,108 @@ +netdev_conf_sources =3D [ + 'netdev_bandwidth_conf.c', + 'netdev_vlan_conf.c', + 'netdev_vport_profile_conf.c', + 'virnetworkportdef.c', +] + +domain_conf_sources =3D [ + 'backup_conf.c', + 'capabilities.c', + 'checkpoint_conf.c', + 'domain_addr.c', + 'domain_audit.c', + 'domain_capabilities.c', + 'domain_conf.c', + 'domain_nwfilter.c', + 'moment_conf.c', + 'numa_conf.c', + 'snapshot_conf.c', + 'virdomaincheckpointobjlist.c', + 'virdomainmomentobjlist.c', + 'virdomainobjlist.c', + 'virdomainsnapshotobjlist.c', + 'virsavecookie.c', +] + +event_conf_sources =3D [ + 'domain_event.c', + 'network_event.c', + 'node_device_event.c', + 'object_event.c', + 'secret_event.c', + 'storage_event.c', +] + +network_conf_sources =3D [ + 'network_conf.c', + 'networkcommon_conf.c', + 'virnetworkobj.c', +] + +nwfilter_conf_sources =3D [ + 'nwfilter_conf.c', + 'nwfilter_ipaddrmap.c', + 'nwfilter_params.c', + 'virnwfilterbindingdef.c', + 'virnwfilterbindingobj.c', + 'virnwfilterbindingobjlist.c', + 'virnwfilterobj.c', +] + +storage_conf_sources =3D [ + 'storage_adapter_conf.c', + 'storage_capabilities.c', + 'storage_conf.c', + 'virstorageobj.c', +] + +interface_conf_sources =3D [ + 'interface_conf.c', + 'virinterfaceobj.c', +] + +secret_conf_sources =3D [ + 'secret_conf.c', + 'virsecretobj.c', +] + +node_device_conf_sources =3D [ + 'node_device_conf.c', + 'node_device_util.c', + 'virnodedeviceobj.c', +] + +cpu_conf_sources =3D [ + 'cpu_conf.c', +] + +chrdev_conf_sources =3D [ + 'virchrdev.c', +] + +device_conf_sources =3D [ + 'device_conf.c', +] + +virt_conf_lib =3D static_library( + 'virt_conf', + [ + chrdev_conf_sources, + cpu_conf_sources, + device_conf_sources, + domain_conf_sources, + event_conf_sources, + interface_conf_sources, + netdev_conf_sources, + network_conf_sources, + node_device_conf_sources, + nwfilter_conf_sources, + secret_conf_sources, + storage_conf_sources, + ], + dependencies: [ + src_dep, + ], +) + +conf_inc_dir =3D include_directories('.') diff --git a/src/meson.build b/src/meson.build index 9f3dd9fca8f..34babecd9b0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -77,3 +77,5 @@ src_dep =3D declare_dependency( dependencies: [ src_dep ], include_directories: [ util_inc_dir ], ) + +subdir('conf') --=20 2.26.2