From nobody Sun Feb 8 12:43:28 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=1594894401; cv=none; d=zohomail.com; s=zohoarc; b=X9jsf5GXL8djSOwVXXb9Qy7ra11zQIkS9ub0Dnyby5eVxXBmqEc00ldU1O957Jvi81qLDvuDJjcLzN+ow+sX0OTbvg6Z2Rw+rYZE6lsMAEBnCj9aAPYQVgkIQW1d5EFFMf4NAUFi5fgYGAR9f2+BSYeh086n9TuNCf1PUKB6wY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894401; 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=GjcCBvkJMSYbyGxxB3FnQjFXmQ23T4W0gpp6rqxmerY=; b=akn4NyoQYlfvK+27jeWyHkt0Hz8YyUKA5EPDvXdz67Sr+nezn2NpqTEOJrQHeTmfadXcnwwbUCRdkWIS8JpFRmUXkNqdJ0p2j7TUZeduIK5j48zeGz21xsJeufvkk4k95804jeZN9a12tWOzUhvQXot6CvT8aZja3V89i7zH4dI= 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894401593908.7471841796392; Thu, 16 Jul 2020 03:13:21 -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-361-x1fxWgO5NlKA-WJF8p-lag-1; Thu, 16 Jul 2020 06:13:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8365B80BCAB; Thu, 16 Jul 2020 10:13:11 +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 637015D9DC; Thu, 16 Jul 2020 10:13:11 +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 35BE29625F; Thu, 16 Jul 2020 10:13:11 +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 06GA5WaI018523 for ; Thu, 16 Jul 2020 06:05:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id A01C52B6DC; Thu, 16 Jul 2020 10:05:32 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B5C72B6DB for ; Thu, 16 Jul 2020 10:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894400; 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=GjcCBvkJMSYbyGxxB3FnQjFXmQ23T4W0gpp6rqxmerY=; b=f4X//mi0gAML9MRunIX6xTyds21Ng7liaOCyZzsdUNZNZW4R/r7R6TnWKS2A4BPTLhCPmD QTkJr6S1LUJvK5k8LtQrgP7vjh1yHWBZKz1dE7oTZlhRjPW8/mk1heBJ+wHQiMXyjB8T4a snxJVuRDdvAD04l1/MHiQkPrUCfPkcQ= X-MC-Unique: x1fxWgO5NlKA-WJF8p-lag-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 216/351] meson: src: build libvirt_lxc binary Date: Thu, 16 Jul 2020 11:57:32 +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.14 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/lxc/Makefile.inc.am | 88 ----------------------------------------- src/lxc/meson.build | 46 +++++++++++++++++++++ 2 files changed, 46 insertions(+), 88 deletions(-) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 19546181e51..03f03ba13db 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -1,40 +1,5 @@ # vim: filetype=3Dautomake =20 -LXC_MONITOR_PROTOCOL_GENERATED =3D \ - lxc/lxc_monitor_protocol.h \ - lxc/lxc_monitor_protocol.c \ - $(NULL) - -LXC_MONITOR_GENERATED =3D \ - lxc/lxc_monitor_dispatch.h \ - $(NULL) - -LXC_CONTROLLER_GENERATED =3D \ - lxc/lxc_controller_dispatch.h \ - $(NULL) - -LXC_GENERATED =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ - $(NULL) - -LXC_MONITOR_PROTOCOL =3D $(srcdir)/lxc/lxc_monitor_protocol.x - -LXC_CONTROLLER_SOURCES =3D \ - lxc/lxc_conf.c \ - lxc/lxc_conf.h \ - lxc/lxc_container.c \ - lxc/lxc_container.h \ - lxc/lxc_cgroup.c \ - lxc/lxc_cgroup.h \ - lxc/lxc_domain.c \ - lxc/lxc_domain.h \ - lxc/lxc_fuse.c \ - lxc/lxc_fuse.h \ - lxc/lxc_controller.c \ - $(NULL) - DRIVER_SOURCE_FILES +=3D \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ @@ -44,7 +9,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(LXC_MONITOR_GENERATED) \ $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) =20 - if WITH_LXC =20 nodist_conf_DATA +=3D lxc/virtlxcd.conf @@ -109,52 +73,6 @@ lxc/test_virtlxcd.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \ > $@ || rm -f $@ =20 -libexec_PROGRAMS +=3D libvirt_lxc - -libvirt_lxc_SOURCES =3D \ - $(LXC_CONTROLLER_SOURCES) \ - $(DATATYPES_SOURCES) \ - $(NULL) -nodist_libvirt_lxc_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ - $(NULL) -libvirt_lxc_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(CAPNG_LIBS) \ - $(LIBXML_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_lxc_LDADD =3D \ - libvirt.la \ - $(FUSE_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -libvirt_lxc_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES -libvirt_lxc_LDADD +=3D $(SECDRIVER_LIBS) -libvirt_lxc_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(builddir)/lxc \ - -I$(builddir)/rpc \ - -I$(srcdir)/hypervisor \ - $(AM_CFLAGS) \ - $(CAPNG_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(FUSE_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -if WITH_BLKID -libvirt_lxc_CFLAGS +=3D $(BLKID_CFLAGS) -libvirt_lxc_LDADD +=3D $(BLKID_LIBS) -endif WITH_BLKID -libvirt_lxc_CFLAGS +=3D $(SECDRIVER_CFLAGS) - - if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif @@ -182,12 +100,6 @@ uninstall-data-lxc: =20 endif WITH_LXC =20 -lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ - lxc/lxc_controller_dispatch.h - .PHONY: \ install-data-lxc \ uninstall-data-lxc \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build index a90083cdc3d..cf1f976573a 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -40,6 +40,26 @@ lxc_monitor_generated =3D custom_target( capture: true, ) =20 +lxc_controller_sources =3D files( + 'lxc_conf.c', + 'lxc_container.c', + 'lxc_cgroup.c', + 'lxc_domain.c', + 'lxc_fuse.c', + 'lxc_controller.c', +) + +lxc_controller_generated =3D custom_target( + 'lxc_controller_dispatch_h', + input: lxc_monitor_protocol, + output: 'lxc_controller_dispatch.h', + command: [ + gendispatch_prog, '--mode=3Dserver', + 'virLXCMonitor', 'VIR_LXC_MONITOR', '@INPUT@' + ], + capture: true, +) + if conf.has('WITH_LXC') lxc_driver_impl_lib =3D static_library( 'virt_driver_lxc_impl', @@ -82,4 +102,30 @@ if conf.has('WITH_LXC') '-DMODULE_NAME=3D"lxc"', ], } + + virt_helpers +=3D { + 'name': 'libvirt_lxc', + 'sources': [ + lxc_controller_sources, + lxc_monitor_protocol_generated, + lxc_controller_generated, + datatypes_sources, + dtrace_gen_objects, + ], + 'include': [ + conf_inc_dir, + hypervisor_inc_dir, + include_directories('.'), + ], + 'deps': [ + blkid_dep, + capng_dep, + dbus_dep, + fuse_dep, + libnl_dep, + rpc_dep, + secdriver_dep, + xdr_dep, + ], + } endif --=20 2.26.2