From nobody Tue Feb 10 04:03:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1695668383; cv=none; d=zohomail.com; s=zohoarc; b=e+KQvJ9CDskpRgWKpy/un8mu3GEqRg/5YbUmwb9QyaxqQUyE9ctrD6N11cHLQ4dDUT5vF7v53Yw50n4ZzD73dlAbU4zDk2vgK+g1V5+507EJxurVsz3ctoTeXI0GSzYPax6h0e6Edd3+6XlkP2UL9peyTcdOqf8MlpLsBS3CccA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668383; 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=xwNMrGNE/p63WO+mWyMzSVijN1pT91DeSHf+ecP42iI=; b=KCvY4pPkKS3G+t4Vw+NjhYXCfjOINK8DAvg1QAy81OwaCgh2Lkd8abkC0EuPmaxjSNfAF1m0Gu2IGxrAuOD2mtH1XcGwkJFvE0Hw/ID06x10wWIQ/jVeFEv5SoxrqWGn8eYHdKRvaa1VBKhzgGTBikPY85CKh1ajnOIvYhObPP8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1695668383149267.96171534679524; Mon, 25 Sep 2023 11:59:43 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-214-43OamwyiNi-xtV7CE2Ka_Q-1; Mon, 25 Sep 2023 14:59:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 06A8A3822557; Mon, 25 Sep 2023 18:59:30 +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 E52AD40C2070; Mon, 25 Sep 2023 18:59:29 +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 A19421946A4F; Mon, 25 Sep 2023 18:59:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7D4201946A4A for ; Mon, 25 Sep 2023 18:59:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 51D06711294; Mon, 25 Sep 2023 18:59:14 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9CB2711293 for ; Mon, 25 Sep 2023 18:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668382; 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=xwNMrGNE/p63WO+mWyMzSVijN1pT91DeSHf+ecP42iI=; b=bsZMkW31ZQmHOFgzN9CuzVUYo/P5aXaCHG2+ATZk464MU7wUd5nkLs8hQGsnPqE8HqdWKX IIN2QNo0UriXKPS8inCgpKsm047GtP9QpA8yDRlyiYtSOl5rqA+KQfUVcoYuQDYa4WGbwk fO3bzdqQwNSTx/4fkMWMxvB0Zvr/FVI= X-MC-Unique: 43OamwyiNi-xtV7CE2Ka_Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 15/42] systemd: Introduce common templates Date: Mon, 25 Sep 2023 20:58:13 +0200 Message-ID: <20230925185840.880191-16-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.1 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: 1695668384367100002 Content-Type: text/plain; charset="utf-8"; x-default="true" These contain the part that is common to all existing service and socket definitions. Each section of each template ends with a placeholder, which marks the spot where additional, service-specific lines should be injected. Signed-off-by: Andrea Bolognani --- src/meson.build | 10 ++++++++++ src/virtd-admin.socket.in | 16 ++++++++++++++++ src/virtd-ro.socket.in | 16 ++++++++++++++++ src/virtd-tcp.socket.in | 15 +++++++++++++++ src/virtd-tls.socket.in | 15 +++++++++++++++ src/virtd.service.in | 28 ++++++++++++++++++++++++++++ src/virtd.socket.in | 15 +++++++++++++++ 7 files changed, 115 insertions(+) create mode 100644 src/virtd-admin.socket.in create mode 100644 src/virtd-ro.socket.in create mode 100644 src/virtd-tcp.socket.in create mode 100644 src/virtd-tls.socket.in create mode 100644 src/virtd.service.in create mode 100644 src/virtd.socket.in diff --git a/src/meson.build b/src/meson.build index fdd15906b9..d7133d1293 100644 --- a/src/meson.build +++ b/src/meson.build @@ -203,6 +203,8 @@ libvirtd_socket_admin_in =3D files('remote' / 'libvirtd= -admin.socket.in') # * sockets - array of additional sockets (optional, default [ 'main', '= ro', 'admin' ]) # * service_in - service source file (optional, default remote/libvirtd.= service.in) # * socket_$name_in - additional socket source files (optional, default = remote/libvirtd.socket.in ) +# * service_$name_extra - additional lines for service's [$name] section= (optional, default []) +# * socket_$name_extra - additional lines for socket's [$name] section (= optional, default []) # * deps - socket dependencies (optional, default '') virt_daemon_units =3D [] =20 @@ -817,11 +819,19 @@ if conf.has('WITH_LIBVIRTD') 'initconfdir': initconfdir, 'name': unit['name'], 'service': unit['service'], + 'SERVICE': unit['service'].to_upper(), 'sockprefix': unit.get('sockprefix', unit['service']), 'deps': unit.get('deps', ''), 'sockmode': sockmode, }) =20 + foreach extra : [ 'service_unit', 'service_service', 'service_instal= l', + 'socket_unit', 'socket_socket', 'socket_install' ] + extra_key =3D '@0@_extra'.format(extra) + extra_value =3D '\n'.join(unit.get(extra_key, [])) + unit_conf.set(extra_key, extra_value) + endforeach + configure_file( input: unit.get('service_in', service_in_default), output: '@0@.service'.format(unit['service']), diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in new file mode 100644 index 0000000000..3a09951b12 --- /dev/null +++ b/src/virtd-admin.socket.in @@ -0,0 +1,16 @@ +[Unit] +Description=3D@name@ admin socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@socket_unit_extra@ + +[Socket] +ListenStream=3D@runstatedir@/libvirt/@sockprefix@-admin-sock +Service=3D@service@.service +SocketMode=3D0600 +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in new file mode 100644 index 0000000000..e882f25a7b --- /dev/null +++ b/src/virtd-ro.socket.in @@ -0,0 +1,16 @@ +[Unit] +Description=3D@name@ local read-only socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@socket_unit_extra@ + +[Socket] +ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock-ro +Service=3D@service@.service +SocketMode=3D0666 +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in new file mode 100644 index 0000000000..26c6dfa75b --- /dev/null +++ b/src/virtd-tcp.socket.in @@ -0,0 +1,15 @@ +[Unit] +Description=3D@name@ non-TLS IP socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@socket_unit_extra@ + +[Socket] +ListenStream=3D16509 +Service=3D@service@.service +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in new file mode 100644 index 0000000000..077c320cce --- /dev/null +++ b/src/virtd-tls.socket.in @@ -0,0 +1,15 @@ +[Unit] +Description=3D@name@ TLS IP socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@socket_unit_extra@ + +[Socket] +ListenStream=3D16514 +Service=3D@service@.service +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ diff --git a/src/virtd.service.in b/src/virtd.service.in new file mode 100644 index 0000000000..c9afecad73 --- /dev/null +++ b/src/virtd.service.in @@ -0,0 +1,28 @@ +[Unit] +Description=3D@name@ daemon +Conflicts=3Dlibvirtd.service +Requires=3D@service@.socket +Requires=3D@service@-ro.socket +Requires=3D@service@-admin.socket +After=3Dnetwork.target +After=3Ddbus.service +After=3Dapparmor.service +Documentation=3Dman:@service@(8) +Documentation=3Dhttps://libvirt.org +@service_unit_extra@ + +[Service] +Type=3Dnotify +Environment=3D@SERVICE@_ARGS=3D"--timeout 120" +EnvironmentFile=3D-@initconfdir@/@service@ +ExecStart=3D@sbindir@/@service@ $@SERVICE@_ARGS +ExecReload=3D/bin/kill -HUP $MAINPID +Restart=3Don-failure +@service_service_extra@ + +[Install] +WantedBy=3Dmulti-user.target +Also=3D@service@.socket +Also=3D@service@-ro.socket +Also=3D@service@-admin.socket +@service_install_extra@ diff --git a/src/virtd.socket.in b/src/virtd.socket.in new file mode 100644 index 0000000000..278f59ef1c --- /dev/null +++ b/src/virtd.socket.in @@ -0,0 +1,15 @@ +[Unit] +Description=3D@name@ local socket +Before=3D@service@.service +@socket_unit_extra@ + +[Socket] +ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock +Service=3D@service@.service +SocketMode=3D@sockmode@ +RemoveOnStop=3Dyes +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ --=20 2.41.0