From nobody Tue Feb 10 12:57:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1696236699; cv=none; d=zohomail.com; s=zohoarc; b=Fqrq0KOyRSoATdGe7bfgIvCN+ZNA6/O7B+PhA0Rmz1NPSRQlMAPMFwtdEkMX5BMes26FGkwTRDmBKEqJvIdEu7dMVFSru0SRHjNDf8v2t2mn4rGuyXiVn8zGUVG0sWGO6dAtc4cpyLdDolPph7ziR/sy0rqGRK3G30uXQkWEXBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696236699; 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=SEbMjve/bAvs1OGlKYB7hg6sUanrhkIrbJTVoX8ewt0=; b=UWTmOzfk8D3MmxtrbzVmF/mRu8N3UTGTKSK18FSp0Z8SNONbYNYNpZzQ8MrZeGvu5P0oNSWyLCJjfi0dg62Z5AfkhAl/CCl7NopNAgMQVT6jEMZ7+bnrJpJcVYsWa6/zRez6HkFcYXQinKtR0NrKC7yQdT6G9QJdVyby9hV/5rw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1696236699169450.19846280749584; Mon, 2 Oct 2023 01:51:39 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-675-1_Fni69yOoa2zAp6GK7bXg-1; Mon, 02 Oct 2023 04:51:35 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A67B101B055; Mon, 2 Oct 2023 08:51:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E87BB2026D4B; Mon, 2 Oct 2023 08:51:31 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 365E21946A6B; Mon, 2 Oct 2023 08:51:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 99EF41946595 for ; Mon, 2 Oct 2023 08:51:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 89164C158BA; Mon, 2 Oct 2023 08:51:30 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.226.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 206ADC15BB8 for ; Mon, 2 Oct 2023 08:51:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696236698; 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=SEbMjve/bAvs1OGlKYB7hg6sUanrhkIrbJTVoX8ewt0=; b=SeKHUieMpL2+/cY29ygBM+F5ej0NtzixnroKzAWhi5gBuk1d4UDony4sf0UczKPNONmFDT tInmXcq8REgqaALSikMtYeMj4yzqQThqhDRlQBprJfEEfcRZcWk51YlqCExExGIuln01y2 mnv8aHj8ui2XwE0s5KpsoqE4HRsrIDY= X-MC-Unique: 1_Fni69yOoa2zAp6GK7bXg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 03/11] systemd: Accept multiple files for service_extra_in/socket_extra_in Date: Mon, 2 Oct 2023 10:51:18 +0200 Message-ID: <20231002085126.210149-4-abologna@redhat.com> In-Reply-To: <20231002085126.210149-1-abologna@redhat.com> References: <20231002085126.210149-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696236701292100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that the underlying script is able to merge an arbitrary number of units into the base template, expose this possibility in the build system. Signed-off-by: Andrea Bolognani --- src/ch/meson.build | 4 +++- src/libxl/meson.build | 8 ++++++-- src/lxc/meson.build | 4 +++- src/meson.build | 12 ++++++------ src/network/meson.build | 4 +++- src/qemu/meson.build | 4 +++- src/storage/meson.build | 4 +++- src/vbox/meson.build | 4 +++- src/vz/meson.build | 4 +++- 9 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/ch/meson.build b/src/ch/meson.build index df246ef9b0..7cee90d0da 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -58,7 +58,9 @@ if conf.has('WITH_CH') virt_daemon_units +=3D { 'service': 'virtchd', 'name': 'Cloud Hypervisor', - 'service_extra_in': files('virtchd.service.extra.in'), + 'service_extra_in': [ + files('virtchd.service.extra.in'), + ], } =20 virt_install_dirs +=3D [ diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 8e6f455139..e75a8f2fdb 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -67,8 +67,12 @@ if conf.has('WITH_LIBXL') virt_daemon_units +=3D { 'service': 'virtxend', 'name': 'Xen', - 'service_extra_in': files('virtxend.service.extra.in'), - 'socket_extra_in': files('virtxend.socket.extra.in'), + 'service_extra_in': [ + files('virtxend.service.extra.in'), + ], + 'socket_extra_in': [ + files('virtxend.socket.extra.in'), + ], } =20 openrc_init_files +=3D { diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 5eb23fbbbf..198e282e63 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -165,7 +165,9 @@ if conf.has('WITH_LXC') virt_daemon_units +=3D { 'service': 'virtlxcd', 'name': 'LXC', - 'service_extra_in': files('virtlxcd.service.extra.in'), + 'service_extra_in': [ + files('virtlxcd.service.extra.in'), + ], } =20 openrc_init_files +=3D { diff --git a/src/meson.build b/src/meson.build index 144f24e526..f3814d75ce 100644 --- a/src/meson.build +++ b/src/meson.build @@ -199,8 +199,8 @@ guest_unit_files =3D [] # * sockets - array of additional sockets (optional, default [ 'main', '= ro', 'admin' ]) # * service_in - service source file (optional, default virtd.service.in) # * socket_$name_in - additional socket source files (optional, default = virtd.socket.in or virtd-$name.socket.in) -# * service_extra_in - unit to merge with service_in (optional, default = None) -# * socket_extra_in - unit to merge with socket_$name_in (optional, defa= ult None) +# * service_extra_in - units to merge with service_in (optional, default= []) +# * socket_extra_in - units to merge with socket_$name_in (optional, def= ault []) virt_daemon_units =3D [] =20 # openrc_init_files @@ -824,9 +824,9 @@ if conf.has('WITH_LIBVIRTD') =20 if 'service_extra_in' in unit service_in =3D configure_file( - input: [ service_in, unit['service_extra_in'] ], + input: [ service_in ] + unit['service_extra_in'], output: '@0@.in'.format(service_out), - command: [ merge_systemd_units_prog, '@INPUT0@', '@INPUT1@' ], + command: [ merge_systemd_units_prog, '@INPUT@' ], capture: true, ) endif @@ -852,9 +852,9 @@ if conf.has('WITH_LIBVIRTD') =20 if 'socket_extra_in' in unit socket_in =3D configure_file( - input: [ socket_in, unit['socket_extra_in'] ], + input: [ socket_in ] + unit['socket_extra_in'], output: '@0@.in'.format(socket_out), - command: [ merge_systemd_units_prog, '@INPUT0@', '@INPUT1@' ], + command: [ merge_systemd_units_prog, '@INPUT@' ], capture: true, ) endif diff --git a/src/network/meson.build b/src/network/meson.build index d0383cca1c..3cf2ef3d3d 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -63,7 +63,9 @@ if conf.has('WITH_NETWORK') virt_daemon_units +=3D { 'service': 'virtnetworkd', 'name': 'network', - 'service_extra_in': files('virtnetworkd.service.extra.in'), + 'service_extra_in': [ + files('virtnetworkd.service.extra.in'), + ], } =20 openrc_init_files +=3D { diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 64c62e584f..fff61ddf27 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -184,7 +184,9 @@ if conf.has('WITH_QEMU') virt_daemon_units +=3D { 'service': 'virtqemud', 'name': 'QEMU', - 'service_extra_in': files('virtqemud.service.extra.in'), + 'service_extra_in': [ + files('virtqemud.service.extra.in'), + ], } =20 openrc_init_files +=3D { diff --git a/src/storage/meson.build b/src/storage/meson.build index 023353c1d6..daad8abf25 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -112,7 +112,9 @@ if conf.has('WITH_STORAGE') virt_daemon_units +=3D { 'service': 'virtstoraged', 'name': 'storage', - 'service_extra_in': files('virtstoraged.service.extra.in'), + 'service_extra_in': [ + files('virtstoraged.service.extra.in'), + ], } =20 openrc_init_files +=3D { diff --git a/src/vbox/meson.build b/src/vbox/meson.build index a72c1833f1..e05f532e35 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -58,7 +58,9 @@ if conf.has('WITH_VBOX') virt_daemon_units +=3D { 'service': 'virtvboxd', 'name': 'VirtualBox', - 'service_extra_in': files('virtvboxd.service.extra.in'), + 'service_extra_in': [ + files('virtvboxd.service.extra.in'), + ], } =20 openrc_init_files +=3D { diff --git a/src/vz/meson.build b/src/vz/meson.build index ce2cbae454..bc5b5fb623 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -49,7 +49,9 @@ if conf.has('WITH_VZ') virt_daemon_units +=3D { 'service': 'virtvzd', 'name': 'vz', - 'service_extra_in': files('virtvzd.service.extra.in'), + 'service_extra_in': [ + files('virtvzd.service.extra.in'), + ], } =20 openrc_init_files +=3D { --=20 2.41.0