From nobody Sat May 18 03:09:03 2024 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=1695832619; cv=none; d=zohomail.com; s=zohoarc; b=FsxvEvMscioWOv11ElP0RZWNHhq2gwALb5KWWc1p/BqaDgJx0pJN9KBrOyGQzUgOvbSTajbLGavl7swH2x/MAIasDOZktwIr7YA/KsaOchHyOJC66jirwR0SrTVtFCZIKVm8ph8vLEfZ1nh7apPwQhsx/QLtf6CthbP2IMX7qQQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695832619; 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=F5O22/0XQdkMTcb1cE4J2iT0uMHDpRT4Nqg/sZLULOA=; b=kGKduBxjgZPY5r4E1rtuDcoeoFRMFGjpQKNjIP78ffzJAYVyeo1TD+68cJeKkjG2tIus1qSX7VnmRH2x6gg68elsBGGU1itX4yM5Cii9LDPR4wofGEPtvp+GVz/e4vgedfl4iiYTECtq872/59lL95+q+v8oRG9r2G40D9E8BCM= 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 1695832619434978.1235190260593; Wed, 27 Sep 2023 09:36:59 -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-417-yxcNDdvLMjGBm0-Pw3NWug-1; Wed, 27 Sep 2023 12:36:54 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 759503C23FD5; Wed, 27 Sep 2023 16:36:52 +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 6135B492C37; Wed, 27 Sep 2023 16:36:52 +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 3C7FF19465B1; Wed, 27 Sep 2023 16:36:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 587DB19465B2 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 612541055466; Wed, 27 Sep 2023 16:19:37 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E884A1005E2A for ; Wed, 27 Sep 2023 16:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695832618; 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=F5O22/0XQdkMTcb1cE4J2iT0uMHDpRT4Nqg/sZLULOA=; b=Z3Vnu0WGuGhWHNxVy0DajQFUVtIka11yZxvq9l9zye7dZb1Kii67X3CCgU0mVTQCEJpnb1 HIbcAuh/tRe+Pxcbuhkt/Oj3bqzABHxyfRNivV80auqvoxHSIqLW8dUv1yiVCcjsqeh/ni wypNpmh/trWFubWypCYt24UZLQHMot8= X-MC-Unique: yxcNDdvLMjGBm0-Pw3NWug-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 01/33] systemd: Drop Conflicts from virtproxyd sockets Date: Wed, 27 Sep 2023 18:19:02 +0200 Message-ID: <20230927161934.181728-2-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.10 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: 1695832619761100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The idea behind these is to prevent running both modular daemons and monolithic daemon at the same time. We will implement a more effective solution for that shortly. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/remote/meson.build | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/remote/meson.build b/src/remote/meson.build index eb4f7a0068..dc2f528d0b 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -128,8 +128,6 @@ libvirtd_socket_unit_files =3D [ 'libvirtd-tls.socket', ] =20 -libvirtd_socket_conflicts =3D ' '.join(libvirtd_socket_unit_files) - logrotate_files =3D [ 'libvirtd.qemu', 'libvirtd.lxc', @@ -225,7 +223,6 @@ if conf.has('WITH_REMOTE') 'name': 'Libvirt proxy', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], - 'deps': 'Conflicts=3D' + libvirtd_socket_conflicts, } =20 openrc_init_files +=3D { --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695835627; cv=none; d=zohomail.com; s=zohoarc; b=Rgf5FvjLPcFuAHoHEwUsG+bH7pEf8bR2WkNtwPoqUzLWJAEZ/gJIrSmb3SviWrySWYbMcdvAArl4EMVKWQN7aAKFqhPypjY3EesLV37TFdcFMvU8f5gs3wzfy7P85wGr+ZYZAWSJakcTesmbjF4VVr7GOT2HIkMCcd3udoOO+T8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695835627; 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=ePn0M3gpEbLHT2E0hE1FWn3ZPO0zXGPua3stDWjfaQg=; b=d/1zLPebOp4Q/v2dLJICjuD34+K7SK1l/C8DtoWFCnEvCifpNCHMcc69lRuEFcuk4t1jngQ+6V6gzG15bcrOd2hX63ljFoDXEw/dHpFlwPKlvj1b7sDYI2p/TXeJ4G1iDzz//luOaRSiFUxu8E4O3nxAfI1IfPLps73UH79picE= 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 16958356275481021.7714029005145; Wed, 27 Sep 2023 10:27:07 -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-218-9YRF6uQxMfScLFenNJLDmA-1; Wed, 27 Sep 2023 13:27:00 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 3839D185A79B; Wed, 27 Sep 2023 17:26:58 +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 B5D01C15BB8; Wed, 27 Sep 2023 17:26:56 +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 2F5BB1946589; Wed, 27 Sep 2023 17:26:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 599C919465B7 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1C8301005B96; Wed, 27 Sep 2023 16:19:38 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A4260100651E for ; Wed, 27 Sep 2023 16:19:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695835626; 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=ePn0M3gpEbLHT2E0hE1FWn3ZPO0zXGPua3stDWjfaQg=; b=DfhoQLehaokZrxq8fz8SSWJKIVWVGtIZEJnRniLy4ByaKijBMYTdaDVmgP/eej5GLrF2oY /SAV1HHO/OHNgaqx4luoUusInCk4GVUgbhvArg73rkilW/nrPqbXWfQ7BPxez8h5hXcQhU ME8JT2KfsygzafTlVzj4z3BGC59S+7c= X-MC-Unique: 9YRF6uQxMfScLFenNJLDmA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 02/33] systemd: Introduce service_in/service_out variables Date: Wed, 27 Sep 2023 18:19:03 +0200 Message-ID: <20230927161934.181728-3-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.8 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: 1695835629637100001 Content-Type: text/plain; charset="utf-8"; x-default="true" They're similar to the existing socket_in/socket_out variables and will make future changes nicer. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build index 6c85cc9b9b..c6728cc8f8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -816,9 +816,12 @@ if conf.has('WITH_LIBVIRTD') 'sockmode': sockmode, }) =20 + service_in =3D unit['service_in'] + service_out =3D '@0@.service'.format(unit['service']) + configure_file( - input: unit['service_in'], - output: '@0@.service'.format(unit['service']), + input: service_in, + output: service_out, configuration: unit_conf, install: true, install_dir: systemd_unit_dir, --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695835642; cv=none; d=zohomail.com; s=zohoarc; b=EvmWYOwvw0pFLcrI9t0sL4TDc3YvZHkAk1SlvV0IrROFc138n1E88df7H8v0fhvjCO+ikBlnGLAc33sM0cwUWqZO0KtEHVdMCc8FE+sSeNDn4sqFr8q97gR11aoQkwM1CM6FAqP6JMhdbIR7Kang5E94K6r2Ic3bXtw9n8yBSu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695835642; 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=hcIX1Pl+/p5abm9smkNXyN0/sAx7JL/EWza0XWNzhg0=; b=IlZFR79OQz9ZNwfP9ivfM9OMoDZ2Lo6Gkiss6ejsVZOwb92ewJ4WPIVzxV82aAKNxmX2CjvkJFpucGDxJsm7Fnt+cR4yn7shTHi5j08SbWvvu7mUWft3nAcMzqemvISQtC4tz05+HEwqdxXs+Q4gY+DPKVVG4n5iFOaLxUSzsLs= 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 1695835642082869.3027282322346; Wed, 27 Sep 2023 10:27:22 -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-488-TvTI76qDO163TVeNedtGjw-1; Wed, 27 Sep 2023 13:27:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 92C0F280FECC; Wed, 27 Sep 2023 17:27:12 +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 7C216C15BB8; Wed, 27 Sep 2023 17:27:12 +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 68B8019465B7; Wed, 27 Sep 2023 17:26:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 917DE19466EC for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CCB6810EE402; Wed, 27 Sep 2023 16:19:38 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5FD151005E2A for ; Wed, 27 Sep 2023 16:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695835641; 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=hcIX1Pl+/p5abm9smkNXyN0/sAx7JL/EWza0XWNzhg0=; b=clSEvTmqS4XWy9zsO9hmYDtcYiZOEPkCPbmjTc/LHq5t0Wgc4wreGnwnY0yBLS3FCxfqCI +CZp/wcQPqjP8yGaxS7PGRWYyCWsNSr/KwuHA3wIiJZnHZutEad2HgFSLCzh0H+eGB/Vpu Keue/HsdaVwY/8ubaHfUULk1BWvJOcE= X-MC-Unique: TvTI76qDO163TVeNedtGjw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 03/33] systemd: Make @service_in@ optional Date: Wed, 27 Sep 2023 18:19:04 +0200 Message-ID: <20230927161934.181728-4-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.8 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: 1695835642449100001 Content-Type: text/plain; charset="utf-8"; x-default="true" It is currently considered required, but we're soon going to provide a default that will be suitable for most services. Since all services currently provide a value explicitly, we can implement a default without breaking anything. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build index c6728cc8f8..b7c2076c04 100644 --- a/src/meson.build +++ b/src/meson.build @@ -194,10 +194,10 @@ guest_unit_files =3D [] # virt_daemon_units: # generate libvirt daemon systemd unit files # * service - name of the service (required) -# * service_in - service source file (required) # * name - socket description (required) # * sockprefix - socket prefix name (optional, default unit['service']) # * 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 ) # * deps - socket dependencies (optional, default '') virt_daemon_units =3D [] @@ -803,6 +803,8 @@ if conf.has('WITH_LIBVIRTD') sockmode =3D '0600' endif =20 + service_in_default =3D 'remote' / 'libvirtd.service.in' + foreach unit : virt_daemon_units unit_conf =3D configuration_data({ 'runstatedir': runstatedir, @@ -816,7 +818,7 @@ if conf.has('WITH_LIBVIRTD') 'sockmode': sockmode, }) =20 - service_in =3D unit['service_in'] + service_in =3D unit.get('service_in', service_in_default) service_out =3D '@0@.service'.format(unit['service']) =20 configure_file( --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695834719; cv=none; d=zohomail.com; s=zohoarc; b=Y7g3sqK7zkOEC/Dq93WC12+t/IZ8SA3icLBZY2zhH2RGn5k022gm6kU6bFTOTJpm3gugQ4L2l6mgSaTT1CWWM26rENmuVzOel7zPtMu8KRt9DSdQf9HpOHmhLgzPRf3DnqhGlXQmymQHcce4FpPIrXz/J+b6oE6b8re/VTBHl8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695834719; 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=XRhEH+aiPjtFhL7hDJYm5Nq9ipEraNqcrnrcFueYU/s=; b=TCqQIjad2pmC3+cOUA6SSo9jiwWw4V9E+T45nWixWsGP/E2vDwLfNaVD+zIN15/Ncq80gA5R9bUD7geBfw/0W1feYcDA+itW1oszHLi6c1bdk11J1tpPCJyz/6n1ZxC3dzEnNIN3ZR9BbFwDO6ucgN6h4wEVarpHiOYnrmQPT2k= 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 1695834719849940.1688845544439; Wed, 27 Sep 2023 10:11:59 -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-219-N4QGBkxyMW2IQAb5xtOF2A-1; Wed, 27 Sep 2023 13:11:57 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 8079A280AA30; Wed, 27 Sep 2023 17:11:54 +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 6954021B2419; Wed, 27 Sep 2023 17:11:54 +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 8B07619465BA; Wed, 27 Sep 2023 17:11:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8C7E119466E9 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 881CC100650B; Wed, 27 Sep 2023 16:19:39 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1BA931005E2A for ; Wed, 27 Sep 2023 16:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695834718; 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=XRhEH+aiPjtFhL7hDJYm5Nq9ipEraNqcrnrcFueYU/s=; b=VnTatGGln34Xh+f8I2EPpzESZs/THiGXf4IUzlDJU9SSe/D+fIu/6TYrWlSkBytBRRBsS/ 5VAgWyuap2Qkqri5za041sQT9wfx1s4fvx7YNG1CGzpqgUlaVyEgrP2iCPJ/x/qnngKFgY nCTH7greFokagAvIy7GKzcaTfLxZM/o= X-MC-Unique: N4QGBkxyMW2IQAb5xtOF2A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 04/33] systemd: Introduce temporary libvirtd_socket*_in values Date: Wed, 27 Sep 2023 18:19:05 +0200 Message-ID: <20230927161934.181728-5-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.6 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: 1695834721778100001 Content-Type: text/plain; charset="utf-8"; x-default="true" These will be useful during the upcoming migration to common templates for systemd units and will be dropped as soon as all services have been converted. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/meson.build b/src/meson.build index b7c2076c04..2fbf98b9fe 100644 --- a/src/meson.build +++ b/src/meson.build @@ -191,6 +191,10 @@ virt_test_aug_dir =3D datadir / 'augeas' / 'lenses' / = 'tests' # guest unit files to install guest_unit_files =3D [] =20 +libvirtd_socket_in =3D files('remote' / 'libvirtd.socket.in') +libvirtd_socket_ro_in =3D files('remote' / 'libvirtd-ro.socket.in') +libvirtd_socket_admin_in =3D files('remote' / 'libvirtd-admin.socket.in') + # virt_daemon_units: # generate libvirt daemon systemd unit files # * service - name of the service (required) --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695834679; cv=none; d=zohomail.com; s=zohoarc; b=V56L7JrFqer8XO0YidCX25ae9TZ05RWacTAPpYSDLOm/IGi5iLY5jQZoNWaQAhV4n/xwXcHSqsHOBA1KiGRxkRlkpDE12uuCvIAIMyNZbPgYd7tFkcLtyyu9jjV6JOmyv0pVcp5lIDuZFTJN7LkF+y2mQ/rMkMJg/CHNtcF+Ycw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695834679; 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=oeL1ieb6pZe9Z7XErWKnoi5KEU6+iUgZjfda197Xec4=; b=egduTSAahugSdj7UJS8M4ydsonUHzB/KkgCKxHi4e7MpYgm+gXu+9lHmT3OfrU9bVO0tZqv9AvSmKu8pRHc3NG0pnolgD5ihtTZ0Rs+DiaHUDx6/EcusSFEKDl8EWudTvPiiq8zJI8vIJTAxvFaUINwtHTc9dlglVN6xweyTQBc= 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 1695834679152626.098549073605; Wed, 27 Sep 2023 10:11:19 -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-41-9lWQNw_SMiypP4YFxCWMRQ-1; Wed, 27 Sep 2023 13:11:15 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 9A819811E88; Wed, 27 Sep 2023 17:11:13 +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 E3DC7401027; Wed, 27 Sep 2023 17:11:12 +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 CFAB219465BB; Wed, 27 Sep 2023 17:11:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8C74619466E7 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 44354100651E; Wed, 27 Sep 2023 16:19:40 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB56E1005E2A for ; Wed, 27 Sep 2023 16:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695834678; 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=oeL1ieb6pZe9Z7XErWKnoi5KEU6+iUgZjfda197Xec4=; b=ggK8Tx4Fp+NpQm2xfGMuWaQrekDx325WarxdrPniR9v8AQwL7Yt4G97cdgwuXaH/GMKbbe QA3PAV57hiZpmjq4acfF4KPw9sFfEXcpYFYTJ+8CnxcArhRb6AwFUWw4Vqx8GQrMgx6S/7 R9fzSFOwnirbS+p+m810qqMj1UKYNAM= X-MC-Unique: 9lWQNw_SMiypP4YFxCWMRQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 05/33] systemd: Provide all input files explicitly Date: Wed, 27 Sep 2023 18:19:06 +0200 Message-ID: <20230927161934.181728-6-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.9 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: 1695834680668100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We're about to change the defaults and start migrating to common templates: in order to be able to switch units over one at a time, make the input files that are currently used explicit rather than implicit. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/ch/meson.build | 3 +++ src/interface/meson.build | 3 +++ src/libxl/meson.build | 3 +++ src/lxc/meson.build | 3 +++ src/network/meson.build | 3 +++ src/node_device/meson.build | 3 +++ src/nwfilter/meson.build | 3 +++ src/qemu/meson.build | 3 +++ src/remote/meson.build | 10 ++++++++++ src/secret/meson.build | 3 +++ src/storage/meson.build | 3 +++ src/vbox/meson.build | 3 +++ src/vz/meson.build | 3 +++ 13 files changed, 46 insertions(+) diff --git a/src/ch/meson.build b/src/ch/meson.build index 936b9bc95a..dc08069dcd 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -59,6 +59,9 @@ if conf.has('WITH_CH') 'service': 'virtchd', 'service_in': files('virtchd.service.in'), 'name': 'Libvirt ch', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 virt_install_dirs +=3D [ diff --git a/src/interface/meson.build b/src/interface/meson.build index 06c5241fa3..6fa65117c3 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -46,6 +46,9 @@ if conf.has('WITH_INTERFACE') 'service': 'virtinterfaced', 'service_in': files('virtinterfaced.service.in'), 'name': 'Libvirt interface', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/libxl/meson.build b/src/libxl/meson.build index db8ccde38e..a1553dbe27 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -68,6 +68,9 @@ if conf.has('WITH_LIBXL') 'service': 'virtxend', 'service_in': files('virtxend.service.in'), 'name': 'Libvirt libxl', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, 'deps': 'ConditionPathExists=3D/proc/xen/capabilities', } =20 diff --git a/src/lxc/meson.build b/src/lxc/meson.build index a8773f64a5..531078448c 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -166,6 +166,9 @@ if conf.has('WITH_LXC') 'service': 'virtlxcd', 'service_in': files('virtlxcd.service.in'), 'name': 'Libvirt lxc', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/network/meson.build b/src/network/meson.build index 40abfaef7e..2e51d5d47b 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -64,6 +64,9 @@ if conf.has('WITH_NETWORK') 'service': 'virtnetworkd', 'service_in': files('virtnetworkd.service.in'), 'name': 'Libvirt network', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 47d9f63600..dd60b1f819 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -54,6 +54,9 @@ if conf.has('WITH_NODE_DEVICES') 'service': 'virtnodedevd', 'service_in': files('virtnodedevd.service.in'), 'name': 'Libvirt nodedev', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 5efdee7189..de672bb827 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -52,6 +52,9 @@ if conf.has('WITH_NWFILTER') 'service': 'virtnwfilterd', 'service_in': files('virtnwfilterd.service.in'), 'name': 'Libvirt nwfilter', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/qemu/meson.build b/src/qemu/meson.build index afa9139d9a..b52497bdf0 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -185,6 +185,9 @@ if conf.has('WITH_QEMU') 'service': 'virtqemud', 'service_in': files('virtqemud.service.in'), 'name': 'Libvirt qemu', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/remote/meson.build b/src/remote/meson.build index dc2f528d0b..78c08bf5ad 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -194,6 +194,11 @@ if conf.has('WITH_REMOTE') 'name': 'Libvirt', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], + 'socket_in': files('libvirtd.socket.in'), + 'socket_ro_in': files('libvirtd-ro.socket.in'), + 'socket_admin_in': files('libvirtd-admin.socket.in'), + 'socket_tcp_in': files('libvirtd-tcp.socket.in'), + 'socket_tls_in': files('libvirtd-tls.socket.in'), } =20 openrc_init_files +=3D { @@ -223,6 +228,11 @@ if conf.has('WITH_REMOTE') 'name': 'Libvirt proxy', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], + 'socket_in': files('libvirtd.socket.in'), + 'socket_ro_in': files('libvirtd-ro.socket.in'), + 'socket_admin_in': files('libvirtd-admin.socket.in'), + 'socket_tcp_in': files('libvirtd-tcp.socket.in'), + 'socket_tls_in': files('libvirtd-tls.socket.in'), } =20 openrc_init_files +=3D { diff --git a/src/secret/meson.build b/src/secret/meson.build index 49f6972f36..58e47c22e8 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -35,6 +35,9 @@ if conf.has('WITH_SECRETS') 'service': 'virtsecretd', 'service_in': files('virtsecretd.service.in'), 'name': 'Libvirt secret', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/storage/meson.build b/src/storage/meson.build index d0d0b72228..e0a1e9f4de 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -113,6 +113,9 @@ if conf.has('WITH_STORAGE') 'service': 'virtstoraged', 'service_in': files('virtstoraged.service.in'), 'name': 'Libvirt storage', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 9f2fb0f938..2d6b71ab8f 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -59,6 +59,9 @@ if conf.has('WITH_VBOX') 'service': 'virtvboxd', 'service_in': files('virtvboxd.service.in'), 'name': 'Libvirt vbox', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/vz/meson.build b/src/vz/meson.build index 4c8747e3eb..9c2eb90463 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -50,6 +50,9 @@ if conf.has('WITH_VZ') 'service': 'virtvzd', 'service_in': files('virtvzd.service.in'), 'name': 'Libvirt vz', + 'socket_in': libvirtd_socket_in, + 'socket_ro_in': libvirtd_socket_ro_in, + 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695834702; cv=none; d=zohomail.com; s=zohoarc; b=d1+UlMxEnpYnMX0Vux41hEePvNeyQ1v2H4azQd7KJ0W2eevEoE0YEjjQmJSkqkRz76S3ILXSVLgLXY1ny8ghW/Ix6hWgSs3MrRGPVratQw0zENC5lo/y8T9n+oUkoHpoJCtMO4ogg0np4i+BxBSQq7qQFubwH5gbSoG8kx/bZ1A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695834702; 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=ChjNpiLBjb9yGnh3AIXtBjmbW4nbIt1yuBpler24R7Y=; b=k+8FVbocPrEe6rVVSs4S4S4uN+g7W0oxy7nF1DMAtJTm/wcLf13oww54PtHo5XL5USRS0EENuiCtsTDFIuSH94vJ5HoMTL+87Cs/blIfuiyex4cyPyYUK2mRBf76600W/1hXJSusx7916bP259oSU//ozQYhPTSqWJAYTgTanXY= 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 1695834702338545.5381389481129; Wed, 27 Sep 2023 10:11:42 -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-549-EnwUaALSPjWUOoGhG-D9sQ-1; Wed, 27 Sep 2023 13:11:38 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 4EB9C85A5BF; Wed, 27 Sep 2023 17:11:34 +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 0331FC0FE03; Wed, 27 Sep 2023 17:11:34 +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 6568319466FA; Wed, 27 Sep 2023 17:11:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8FA2819465A4 for ; Wed, 27 Sep 2023 16:21:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 210331005E2A; Wed, 27 Sep 2023 16:19:41 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8784E10EE6C9 for ; Wed, 27 Sep 2023 16:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695834701; 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=ChjNpiLBjb9yGnh3AIXtBjmbW4nbIt1yuBpler24R7Y=; b=g2mRnFgE78AuzrHFcwc+pTdgntnMuIM08g+dK4Dya/A4asDwtjHA67JTSfCv61B7FoNFat TYMDnsdAAfeN1xR8KGw7yzxoJrFToIJQsW4ALpibxqBHJgyo5gBY9ew/z/ms4XSt+UpDxo vKv+AtKQaA6QgL74VnqoZUaP4fUkq4w= X-MC-Unique: EnwUaALSPjWUOoGhG-D9sQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 06/33] systemd: Introduce common templates Date: Wed, 27 Sep 2023 18:19:07 +0200 Message-ID: <20230927161934.181728-7-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.8 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: 1695834703692100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We already use templating to generate sockets, which are all based off libvirtd's. Push the idea further, and extend it to cover services as well. This is more challenging, as the various modular daemons each have their own needs in terms of what system services needs to be available before they can be started, which other components of libvirt they depend on, and so on. In order to make this sort of per-service tweaks possible, we introduce a Python script that can merge two systemd units together. The script is aware of the semantics of systemd's unit definition format, so it can intelligently merge sections together. This generic systemd unit merging mechanism will also supersede the extremely ad-hoc @deps@ variable, which is currently used in a single scenario. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- scripts/merge-systemd-units.py | 91 ++++++++++++++++++++++++++++++++++ scripts/meson.build | 1 + src/meson.build | 22 ++++++++ src/virtd-admin.socket.in | 13 +++++ src/virtd-ro.socket.in | 13 +++++ src/virtd-tcp.socket.in | 12 +++++ src/virtd-tls.socket.in | 12 +++++ src/virtd.service.in | 25 ++++++++++ src/virtd.socket.in | 12 +++++ 9 files changed, 201 insertions(+) create mode 100755 scripts/merge-systemd-units.py 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/scripts/merge-systemd-units.py b/scripts/merge-systemd-units.py new file mode 100755 index 0000000000..136bc8d416 --- /dev/null +++ b/scripts/merge-systemd-units.py @@ -0,0 +1,91 @@ +#!/usr/bin/env python3 + +import sys + +SECTIONS =3D [ + '[Unit]', + '[Service]', + '[Socket]', + '[Install]', +] + + +def parse_unit(unit_path): + unit =3D {} + current_section =3D '[Invalid]' + + with open(unit_path) as f: + for line in f: + line =3D line.strip() + + if line =3D=3D '': + continue + + if line[0] =3D=3D '[' and line[-1] =3D=3D ']': + if line not in SECTIONS: + print('Unknown section {}'.format(line)) + sys.exit(1) + + current_section =3D line + continue + + if current_section not in unit: + unit[current_section] =3D [] + + unit[current_section].append(line) + + if '[Invalid]' in unit: + print('Contents found outside of any section') + sys.exit(1) + + return unit + + +def format_unit(unit): + lines =3D [] + + for section in SECTIONS: + if section not in unit: + continue + + lines.append(section) + + for line in unit[section]: + lines.append(line) + + lines.append('') + + return '\n'.join(lines) + + +def merge_units(base, extra): + merged =3D {} + + for section in SECTIONS: + if section in extra and section not in base: + print('Section {} in extra but not in base'.format(section)) + sys.exit(1) + + if section not in base: + continue + + merged[section] =3D base[section] + + if section not in extra: + continue + + merged[section].extend(extra[section]) + + return merged + + +if len(sys.argv) < 2: + print('usage: {} BASE EXTRA'.format(sys.argv[0])) + sys.exit(1) + +base =3D parse_unit(sys.argv[1]) +extra =3D parse_unit(sys.argv[2]) + +merged =3D merge_units(base, extra) + +sys.stdout.write(format_unit(merged)) diff --git a/scripts/meson.build b/scripts/meson.build index 05b71184f1..65fd1e21c5 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -19,6 +19,7 @@ scripts =3D [ 'header-ifdef.py', 'hvsupport.py', 'hyperv_wmi_generator.py', + 'merge-systemd-units.py', 'meson-dist.py', 'meson-gen-authors.py', 'meson-gen-def.py', diff --git a/src/meson.build b/src/meson.build index 2fbf98b9fe..02c92621ba 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_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) # * deps - socket dependencies (optional, default '') virt_daemon_units =3D [] =20 @@ -817,6 +819,7 @@ 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, @@ -825,6 +828,15 @@ if conf.has('WITH_LIBVIRTD') service_in =3D unit.get('service_in', service_in_default) service_out =3D '@0@.service'.format(unit['service']) =20 + if 'service_extra_in' in unit + service_in =3D configure_file( + input: [ service_in, unit['service_extra_in'] ], + output: '@0@.in'.format(service_out), + command: [ merge_systemd_units_prog, '@INPUT0@', '@INPUT1@' ], + capture: true, + ) + endif + configure_file( input: service_in, output: service_out, @@ -843,6 +855,16 @@ if conf.has('WITH_LIBVIRTD') socket_in =3D unit.get('socket_@0@_in'.format(socket), socket_in= _default) socket_out =3D '@0@-@1@.socket'.format(unit['service'], socket) endif + + if 'socket_extra_in' in unit + socket_in =3D configure_file( + input: [ socket_in, unit['socket_extra_in'] ], + output: '@0@.in'.format(socket_out), + command: [ merge_systemd_units_prog, '@INPUT0@', '@INPUT1@' ], + capture: true, + ) + endif + configure_file( input: socket_in, output: socket_out, diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in new file mode 100644 index 0000000000..39bb0badea --- /dev/null +++ b/src/virtd-admin.socket.in @@ -0,0 +1,13 @@ +[Unit] +Description=3D@name@ admin socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket + +[Socket] +ListenStream=3D@runstatedir@/libvirt/@sockprefix@-admin-sock +Service=3D@service@.service +SocketMode=3D0600 + +[Install] +WantedBy=3Dsockets.target diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in new file mode 100644 index 0000000000..b7b7ae0dd8 --- /dev/null +++ b/src/virtd-ro.socket.in @@ -0,0 +1,13 @@ +[Unit] +Description=3D@name@ local read-only socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket + +[Socket] +ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock-ro +Service=3D@service@.service +SocketMode=3D0666 + +[Install] +WantedBy=3Dsockets.target diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in new file mode 100644 index 0000000000..7c8bcdb525 --- /dev/null +++ b/src/virtd-tcp.socket.in @@ -0,0 +1,12 @@ +[Unit] +Description=3D@name@ non-TLS IP socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket + +[Socket] +ListenStream=3D16509 +Service=3D@service@.service + +[Install] +WantedBy=3Dsockets.target diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in new file mode 100644 index 0000000000..c6dceb2d4e --- /dev/null +++ b/src/virtd-tls.socket.in @@ -0,0 +1,12 @@ +[Unit] +Description=3D@name@ TLS IP socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket + +[Socket] +ListenStream=3D16514 +Service=3D@service@.service + +[Install] +WantedBy=3Dsockets.target diff --git a/src/virtd.service.in b/src/virtd.service.in new file mode 100644 index 0000000000..76f9c60351 --- /dev/null +++ b/src/virtd.service.in @@ -0,0 +1,25 @@ +[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] +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 + +[Install] +WantedBy=3Dmulti-user.target +Also=3D@service@.socket +Also=3D@service@-ro.socket +Also=3D@service@-admin.socket diff --git a/src/virtd.socket.in b/src/virtd.socket.in new file mode 100644 index 0000000000..aec0708fd4 --- /dev/null +++ b/src/virtd.socket.in @@ -0,0 +1,12 @@ +[Unit] +Description=3D@name@ local socket +Before=3D@service@.service + +[Socket] +ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock +Service=3D@service@.service +SocketMode=3D@sockmode@ +RemoveOnStop=3Dyes + +[Install] +WantedBy=3Dsockets.target --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695834684; cv=none; d=zohomail.com; s=zohoarc; b=T1pP70Hsqx18wsWk8hkUFGwKe4PU+Qieso06p4R6y7IQO+GJQ/Z6tiXTYX5eS3ff8Qfcdnhcg62W3uL4TNqiqSreKScshbif6uhV94nxCM7GE+5rqO20rN5XTY46c5pk/AJsKtmSgGWyFeeVid/7pqirIWCF1247uLnPDrTY7qQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695834684; 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=i7tO3u/ZA56Tg7v9iU2ehd5s9woFBnIlrsByvzgAnpU=; b=OUzmi0YcRl7wrhTNXW+nlADNcX2t0qiOppcSEzteFvWAZyuFyVluSFxc2aSHNPoakYtZUAAvvJSdQ++K1Ml0lrkrAkvbJgzrJooJQLzROSGK2LrNlqWL7EuJDIyG5IeOQc1aeh7tTf/8TIupo7jC8ApiENyOaB/qFjVdFlNC36k= 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 16958346846938.501174105409973; Wed, 27 Sep 2023 10:11:24 -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-78-TJ_hV5q5OS-bvdYSg8-Y_w-1; Wed, 27 Sep 2023 13:11:20 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 4F82185A5BD; Wed, 27 Sep 2023 17:11:17 +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 3C08C1402740; Wed, 27 Sep 2023 17:11:17 +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 EFCC91946594; Wed, 27 Sep 2023 17:11:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9A98619465B7 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D0A5010069B4; Wed, 27 Sep 2023 16:19:41 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64AD410EE6C9 for ; Wed, 27 Sep 2023 16:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695834683; 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=i7tO3u/ZA56Tg7v9iU2ehd5s9woFBnIlrsByvzgAnpU=; b=HBS8GO74NXLexLIF4bgoJcX3gpw07ICKUPciv8BM49/XK6H3O6YvPT7n6uaO6N1P/GIfWl ojGU8V/MfFQd/KHk/Nxu4zkQBD2YSRxpOHjqpiQgKcEeFL8nEe+FApJBXXIln3Id3uWKoS v+grXyEZjx2sl/NkFwwNdeoisrkTb9s= X-MC-Unique: TJ_hV5q5OS-bvdYSg8-Y_w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 07/33] systemd: Use common templates by default Date: Wed, 27 Sep 2023 18:19:08 +0200 Message-ID: <20230927161934.181728-8-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.7 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: 1695834686295100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All services are still listing their input files explicitly, so no changes to the output files will occur yet. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/meson.build b/src/meson.build index 02c92621ba..0fbefe37d5 100644 --- a/src/meson.build +++ b/src/meson.build @@ -201,8 +201,8 @@ libvirtd_socket_admin_in =3D files('remote' / 'libvirtd= -admin.socket.in') # * name - socket description (required) # * sockprefix - socket prefix name (optional, default unit['service']) # * 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_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) # * deps - socket dependencies (optional, default '') @@ -809,7 +809,7 @@ if conf.has('WITH_LIBVIRTD') sockmode =3D '0600' endif =20 - service_in_default =3D 'remote' / 'libvirtd.service.in' + service_in_default =3D 'virtd.service.in' =20 foreach unit : virt_daemon_units unit_conf =3D configuration_data({ @@ -847,11 +847,11 @@ if conf.has('WITH_LIBVIRTD') =20 foreach socket : unit.get('sockets', [ 'main', 'ro', 'admin' ]) if socket =3D=3D 'main' - socket_in_default =3D 'remote' / 'libvirtd.socket.in' + socket_in_default =3D 'virtd.socket.in' socket_in =3D unit.get('socket_in', socket_in_default) socket_out =3D '@0@.socket'.format(unit['service']) else - socket_in_default =3D 'remote' / 'libvirtd-@0@.socket.in'.format= (socket) + socket_in_default =3D 'virtd-@0@.socket.in'.format(socket) socket_in =3D unit.get('socket_@0@_in'.format(socket), socket_in= _default) socket_out =3D '@0@-@1@.socket'.format(unit['service'], socket) endif --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.145.221.124 as permitted sender) client-ip=216.145.221.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 216.145.221.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=1695832627; cv=none; d=zohomail.com; s=zohoarc; b=I90h3kvtKHfgxDgKGlZ2dV2pmWNDrhvKCib701yP4Y1gUKFjmZlWJqOOiXmYaSrpZ51HASpv3YZ0Jmwqv1S3zeZtitjhXR0rruMQ0+6W8KEvVkiK7qEQS6657CVgFib6xPRQHx6vdvqE5faAuNkrXTyjAPPpOzEUYuFbf71BOQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695832627; 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=fuIn2/fiPvD/+kX6wIZn8aRL7y8mKFJtXDkvkG2Y2UQ=; b=ULC8IJb2TWxm1ZzGHPBDFiDzuDW5yl1i2FuIQ/uZrpXv3BVo2IEwIVX8fElaby3AcFDkyy1ZLL2xMGBoLBRRzZ7mYypJG3XtANI+h+nq7Pz/8Jfbfngo9gWiZJgkru4UwHI7Ksc3iiw+FPAj21riKLhaRVK8oFK9NhM448w0eTA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.145.221.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 [216.145.221.124]) by mx.zohomail.com with SMTPS id 1695832627288576.5773060083309; Wed, 27 Sep 2023 09:37:07 -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-237--cFDt2lpNFebzDtsJOmpMQ-1; Wed, 27 Sep 2023 12:37:01 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 AACA5101A529; Wed, 27 Sep 2023 16:36:59 +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 97D49176C3; Wed, 27 Sep 2023 16:36:59 +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 8536619466FD; Wed, 27 Sep 2023 16:36:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BC7CF19465A8 for ; Wed, 27 Sep 2023 16:21:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8C2801006B6D; Wed, 27 Sep 2023 16:19:42 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2026C1006B56 for ; Wed, 27 Sep 2023 16:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695832626; 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=fuIn2/fiPvD/+kX6wIZn8aRL7y8mKFJtXDkvkG2Y2UQ=; b=SAHeBwT2O0ANqdYMBtsMq/9BC/megUNevNT8yEC5sgwH4w1wrqYLvBsZBVgsTkt7AarZFp zxR1c4E5XcffVfKj7zMHjVXlGnR1+YYgZlWkDU2zfWbarOclX6NUTXePLHXst3mqv2gR5k u0sLlK1XAiuskMZPgtE5yyd/b2Ga7wY= X-MC-Unique: -cFDt2lpNFebzDtsJOmpMQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 08/33] systemd: Switch virtnodedevd to common templates Date: Wed, 27 Sep 2023 18:19:09 +0200 Message-ID: <20230927161934.181728-9-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.5 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: 1695832629117100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/node_device/meson.build | 4 ---- src/node_device/virtnodedevd.service.in | 25 ------------------------- 2 files changed, 29 deletions(-) delete mode 100644 src/node_device/virtnodedevd.service.in diff --git a/src/node_device/meson.build b/src/node_device/meson.build index dd60b1f819..2614ff8b9c 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -52,11 +52,7 @@ if conf.has('WITH_NODE_DEVICES') =20 virt_daemon_units +=3D { 'service': 'virtnodedevd', - 'service_in': files('virtnodedevd.service.in'), 'name': 'Libvirt nodedev', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virt= nodedevd.service.in deleted file mode 100644 index 2ac41db32e..0000000000 --- a/src/node_device/virtnodedevd.service.in +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=3DVirtualization nodedev daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtnodedevd.socket -Requires=3Dvirtnodedevd-ro.socket -Requires=3Dvirtnodedevd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -Documentation=3Dman:virtnodedevd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTNODEDEVD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtnodedevd -ExecStart=3D@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtnodedevd.socket -Also=3Dvirtnodedevd-ro.socket -Also=3Dvirtnodedevd-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695831690; cv=none; d=zohomail.com; s=zohoarc; b=DjuimavCAC04Pkx1wyPtHLyZyfaU375wC6Cu05+Gt6ghCUcB2SSdJ6LU31XC1VUkgc8xJsf9fHD/iQLOz6uP5ARVYWrTREAzVnNK9fKC8TX3XuoCL256yNfI6NDTclAnw6Jbndn6pEhaGMANFXxgyKxwAva80UrK3p0l9+yfZZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695831690; 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=Sr5Hj1ljg/oOUqyGMMOrWwNK//BsarwrugfGOTFPmyM=; b=fEQtCHRmURUvIOfjedA3LwiffKRkX0qYpsewjpa+YM9yG4H6Y+/n9luD9WFF9xGk5Zl7dXQeKKf9UfYrbMTP1NBd/m1+hsYO9hLoIvLTA31qJPWrRyHsLxLpxaeJPEk0PQM+nOQNbu11I95mABI8O15eCvhc4pyIt3BqSbHFGv8= 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 1695831689988359.89754589301003; Wed, 27 Sep 2023 09:21:29 -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-564-i-_o8b0HMeaR16SNAcNprw-1; Wed, 27 Sep 2023 12:21:25 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 E621C3C108E1; Wed, 27 Sep 2023 16:21:22 +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 D26B5C154CD; Wed, 27 Sep 2023 16:21:22 +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 2975D1946588; Wed, 27 Sep 2023 16:21:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B694319466F9 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 47C2B1054FC1; Wed, 27 Sep 2023 16:19:43 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CF32A1054FC3 for ; Wed, 27 Sep 2023 16:19:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695831688; 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=Sr5Hj1ljg/oOUqyGMMOrWwNK//BsarwrugfGOTFPmyM=; b=fqLzAEpBGM3UklcxxVtoUaZVJhm3oB8Zmh+vjNlWJ/LnXS4NkJXCjS2VsK1NT8+VhywPfA c9/0yvLSu4YcPmv0aP8yY7Wl++7lRgBzPA5yz6yjHGXK+y32cWxuGUscQQwi2hWBV1oM82 ayecyMecTIW2L67Rc4+WA8TFjrmH69k= X-MC-Unique: i-_o8b0HMeaR16SNAcNprw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 09/33] systemd: Switch virtinterfaced to common templates Date: Wed, 27 Sep 2023 18:19:10 +0200 Message-ID: <20230927161934.181728-10-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.8 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: 1695831691692100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/interface/meson.build | 4 ---- src/interface/virtinterfaced.service.in | 25 ------------------------- 2 files changed, 29 deletions(-) delete mode 100644 src/interface/virtinterfaced.service.in diff --git a/src/interface/meson.build b/src/interface/meson.build index 6fa65117c3..54c0b1a935 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -44,11 +44,7 @@ if conf.has('WITH_INTERFACE') =20 virt_daemon_units +=3D { 'service': 'virtinterfaced', - 'service_in': files('virtinterfaced.service.in'), 'name': 'Libvirt interface', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtin= terfaced.service.in deleted file mode 100644 index 5cb2cd19dc..0000000000 --- a/src/interface/virtinterfaced.service.in +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=3DVirtualization interface daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtinterfaced.socket -Requires=3Dvirtinterfaced-ro.socket -Requires=3Dvirtinterfaced-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -Documentation=3Dman:virtinterfaced(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTINTERFACED_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtinterfaced -ExecStart=3D@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtinterfaced.socket -Also=3Dvirtinterfaced-ro.socket -Also=3Dvirtinterfaced-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833229; cv=none; d=zohomail.com; s=zohoarc; b=eSt0ZmrCav9C2LWVK2IH2esFsSnhKE8loHa1GV+aDWKA9JkqphuCZz+o1WFDkkveD598WwKCpFEEFBmYwQMctpIfIiLoNqU/gEIqoENePFTI8bgNfRb/pBHR+NbxgPcNS5wIromLYhV6oSN3hGZkmQHrmIMuTgMEQZDyYELEZjA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833229; 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=Gk+EibLg/daLnC1ShjbSTIEUUWU2VW9aw5leAJ5xMD4=; b=WSbiucbaHxEFpmiliigetDYwZBDTFln6ub4O24sM7QQhyPT7yc9LfAT6k1kIEoMsrKTZPDE8juusvOnXLRNYNxerR0OZXPi7L9eTnpAroxj75q6IAC3l4GqvVjwsyZiAzNIt8DyTCV2yTCyjR1z6pEmTDFAy3F0Rif0r9CXfn+g= 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 1695833229261576.4376884577065; Wed, 27 Sep 2023 09:47:09 -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-225-2oBtu7CjNla2gBLA8xLD8Q-1; Wed, 27 Sep 2023 12:47:05 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 D7B043C1770C; Wed, 27 Sep 2023 16:47:02 +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 45F2E2156A27; Wed, 27 Sep 2023 16:47:02 +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 E238A194658D; Wed, 27 Sep 2023 16:46:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BC78D19465A4 for ; Wed, 27 Sep 2023 16:21:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 02FD91054FC3; Wed, 27 Sep 2023 16:19:44 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8AB6F1054FC2 for ; Wed, 27 Sep 2023 16:19:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833228; 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=Gk+EibLg/daLnC1ShjbSTIEUUWU2VW9aw5leAJ5xMD4=; b=E0XiD4LRJnFE7nHwgjQ+hiSwt+VEKZHECGdL/uhgRk/URSVgqlakXAzIbl9yzCV+qlZOws RdZurV0dqeOeW6RYOdSxIG1Qf4NnAyUdgZg4Qut85mGrEHBROy5Klaxb20279PxURSxrha SpHyjYvweiFXaBzbvDve5m2LDjcPROs= X-MC-Unique: 2oBtu7CjNla2gBLA8xLD8Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 10/33] systemd: Switch virtnwfilterd to common templates Date: Wed, 27 Sep 2023 18:19:11 +0200 Message-ID: <20230927161934.181728-11-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.6 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: 1695833229545100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/nwfilter/meson.build | 4 ---- src/nwfilter/virtnwfilterd.service.in | 25 ------------------------- 2 files changed, 29 deletions(-) delete mode 100644 src/nwfilter/virtnwfilterd.service.in diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index de672bb827..c091bc3f1b 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -50,11 +50,7 @@ if conf.has('WITH_NWFILTER') =20 virt_daemon_units +=3D { 'service': 'virtnwfilterd', - 'service_in': files('virtnwfilterd.service.in'), 'name': 'Libvirt nwfilter', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfil= terd.service.in deleted file mode 100644 index d6e98240a8..0000000000 --- a/src/nwfilter/virtnwfilterd.service.in +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=3DVirtualization nwfilter daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtnwfilterd.socket -Requires=3Dvirtnwfilterd-ro.socket -Requires=3Dvirtnwfilterd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -Documentation=3Dman:virtnwfilterd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTNWFILTERD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtnwfilterd -ExecStart=3D@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtnwfilterd.socket -Also=3Dvirtnwfilterd-ro.socket -Also=3Dvirtnwfilterd-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695835660; cv=none; d=zohomail.com; s=zohoarc; b=KhFxLAFJ+Ivve9vhe6fSOMp5YNcx5tdooNHMVUhu++FYYsTgkYzCWSYCTU4UbRm9W8w5sxE8RXBBzfOVVfKtLN5962OgJV+IWBd1pMGZCY6A32cdr8Mm6GYLvC/CoStw6QFKj+3spUucv3FUl3R4ffXCBQy8eYc3GZ8709EtjLo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695835660; 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=xSxZ46gEFl8Y73EscczdNggRKpAhQ2GS0KazL4m177Q=; b=gn7YhE/5CcDbjKV4wUpwLpcjmgZT49ClOG2uNfGaFy478xeb5GYQ6StZUCCgAk/lB0o0Bhrnbv/Ffa1eik+4R38mOdROjkTU6iLeEiPu+QPZDadZTKhxu0AoVr7qZbqRWxwWOGQlRlwky0IvwQC15J8dnQHpXXPmHQ4r3FXwLwI= 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 1695835660752334.1537030764614; Wed, 27 Sep 2023 10:27:40 -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-653-gfQ_MQToPU6AthytIWrMXg-1; Wed, 27 Sep 2023 13:27:36 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 9D7E5381459A; Wed, 27 Sep 2023 17:27:33 +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 8A98014171B6; Wed, 27 Sep 2023 17:27:33 +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 C9D5E19466F0; Wed, 27 Sep 2023 17:26:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B19FE1946587 for ; Wed, 27 Sep 2023 16:21:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B27E61054FC4; Wed, 27 Sep 2023 16:19:44 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 45F321054FC2 for ; Wed, 27 Sep 2023 16:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695835659; 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=xSxZ46gEFl8Y73EscczdNggRKpAhQ2GS0KazL4m177Q=; b=DydRcnsQVOs2owJ6PguvwXbcNpFekOBAvwZCwLCW0YR9/gsT6swqCIBoH1BEv9AQGQZDil QUw/zgX9WC0d1HxPUBt9A/qIh7dSWDfJi+V4EO52/IXukuNkA9XtrNnUynRPsduqdwGz1E olOLNfSFCt57RhwnnIBR2jiw5KAK6ZI= X-MC-Unique: gfQ_MQToPU6AthytIWrMXg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 11/33] systemd: Switch virtsecretd to common templates Date: Wed, 27 Sep 2023 18:19:12 +0200 Message-ID: <20230927161934.181728-12-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.7 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: 1695835662350100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/secret/meson.build | 4 ---- src/secret/virtsecretd.service.in | 25 ------------------------- 2 files changed, 29 deletions(-) delete mode 100644 src/secret/virtsecretd.service.in diff --git a/src/secret/meson.build b/src/secret/meson.build index 58e47c22e8..e05b46abea 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -33,11 +33,7 @@ if conf.has('WITH_SECRETS') =20 virt_daemon_units +=3D { 'service': 'virtsecretd', - 'service_in': files('virtsecretd.service.in'), 'name': 'Libvirt secret', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, } =20 openrc_init_files +=3D { diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.ser= vice.in deleted file mode 100644 index 3804fe553b..0000000000 --- a/src/secret/virtsecretd.service.in +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=3DVirtualization secret daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtsecretd.socket -Requires=3Dvirtsecretd-ro.socket -Requires=3Dvirtsecretd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -Documentation=3Dman:virtsecretd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTSECRETD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtsecretd -ExecStart=3D@sbindir@/virtsecretd $VIRTSECRETD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtsecretd.socket -Also=3Dvirtsecretd-ro.socket -Also=3Dvirtsecretd-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695834721; cv=none; d=zohomail.com; s=zohoarc; b=ghr9fjctCVrvedTv5P2jY3uspuRle5qAveOV5cYHNa77M3xZhzdEuh6uOKpPzdb2V/gsTxzonMtz4H3x1taLsp81BSwBuur+x6pjmiymiaayLJRL1QnT9aKNQXqNAp0U6NczwJIqUHP7ywpUTIguR/WaMR3CTMZqNhPqUzvM+OE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695834721; 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=6X3zStdyo7LRssQxhVU5IC4GBQYaMtNW2fNzobKx/tQ=; b=A2QZXs1RTB403W5CJypgMxsaGKUg5b2EanGzBQv4LgJHsOI9z28EuofZughqFd31IdqrXigPpENNf5bKwmRJCE5KYIcVBiOi8Kv28ZyCmwltiIuD8t+TahIZrcBQmCrnejL6kEMvggiCFXJuo26yLjh/wrFmyn7MRhPs6VCMHq0= 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 1695834721494695.5883646934412; Wed, 27 Sep 2023 10:12:01 -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-381-Sm5DU9zHN3aUsSKl53yH7w-1; Wed, 27 Sep 2023 13:11:57 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 B50F6858286; Wed, 27 Sep 2023 17:11:54 +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 A19D4492C37; Wed, 27 Sep 2023 17:11:54 +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 DD2671946594; Wed, 27 Sep 2023 17:11:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B222D19466F2 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6DAB81054FC5; Wed, 27 Sep 2023 16:19:45 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 01A161054FC2 for ; Wed, 27 Sep 2023 16:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695834720; 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=6X3zStdyo7LRssQxhVU5IC4GBQYaMtNW2fNzobKx/tQ=; b=Ezf7FHKYjbpZH5nlWgRI9tmu9mxS8wHgfD6DW+Wvr79gY49fC7JUWXddNjiuV3frZlxi/5 SDKtobbvU4U6JE7w52vU4YhJOaE5gX3MbBBiXKKcY2v4f4+jDSAgSHTv0nWXPcKxbY4YDf ZUpQ669q9qRYEpiJQK7YyhlFrurMcvM= X-MC-Unique: Sm5DU9zHN3aUsSKl53yH7w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 12/33] systemd: Switch virtnetworkd to common templates Date: Wed, 27 Sep 2023 18:19:13 +0200 Message-ID: <20230927161934.181728-13-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.10 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: 1695834723464100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/network/meson.build | 5 +---- src/network/virtnetworkd.service.extra.in | 2 ++ src/network/virtnetworkd.service.in | 26 ----------------------- 3 files changed, 3 insertions(+), 30 deletions(-) create mode 100644 src/network/virtnetworkd.service.extra.in delete mode 100644 src/network/virtnetworkd.service.in diff --git a/src/network/meson.build b/src/network/meson.build index 2e51d5d47b..ed7707c714 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -62,11 +62,8 @@ if conf.has('WITH_NETWORK') =20 virt_daemon_units +=3D { 'service': 'virtnetworkd', - 'service_in': files('virtnetworkd.service.in'), 'name': 'Libvirt network', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_extra_in': files('virtnetworkd.service.extra.in'), } =20 openrc_init_files +=3D { diff --git a/src/network/virtnetworkd.service.extra.in b/src/network/virtne= tworkd.service.extra.in new file mode 100644 index 0000000000..9fcabf652d --- /dev/null +++ b/src/network/virtnetworkd.service.extra.in @@ -0,0 +1,2 @@ +[Service] +KillMode=3Dprocess diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd= .service.in deleted file mode 100644 index 3d7374715d..0000000000 --- a/src/network/virtnetworkd.service.in +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=3DVirtualization network daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtnetworkd.socket -Requires=3Dvirtnetworkd-ro.socket -Requires=3Dvirtnetworkd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -Documentation=3Dman:virtnetworkd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTNETWORKD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtnetworkd -ExecStart=3D@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure -KillMode=3Dprocess - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtnetworkd.socket -Also=3Dvirtnetworkd-ro.socket -Also=3Dvirtnetworkd-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695834716; cv=none; d=zohomail.com; s=zohoarc; b=mQl/hmrFOsNR4G54t97eV4JrX/uRBbl95Q2J8daObPM4+zBvfFiuPAtT7rXZeX2H+NL76rv2amyCTDa1wKM6EUhtIaI+KwEUw4DXBsbqOuXqbdysG8caDg9g5Rl77yxDfdHMzQf0sQrgaAmg5OXJHe6cRgNEaLVaQwVVdbT/O1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695834716; 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=pYrQilkjqqzNBSsUIbdr0dpKHMQVEfH0xQX0Yw3wyBg=; b=iAnpT6fShuago34Pl3d4XK1tQm5r/OWoXVdzjoP6/G0JwWAEVjpPKJCxDS+V69Ibu+rmys4ne7PhGlUQZ5+x+e3SqCR1iRk45zhTkMwL/46MtvWoigLDVwbOVv+8HLn8lo9eXerLA2DVor7R7pf9cBerkn05TXP8bYVwnS+K6Us= 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 1695834716841546.2155885956587; Wed, 27 Sep 2023 10:11:56 -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-480-Jc9SXqEZNwKB71H_YdaU5g-1; Wed, 27 Sep 2023 13:11:53 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 2B8B9185A790; Wed, 27 Sep 2023 17:11:50 +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 13F57170EC; Wed, 27 Sep 2023 17:11:50 +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 DAD9D1946A50; Wed, 27 Sep 2023 17:11:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B474719466E9 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2940D1054FC6; Wed, 27 Sep 2023 16:19:46 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B0C031054FC2 for ; Wed, 27 Sep 2023 16:19:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695834715; 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=pYrQilkjqqzNBSsUIbdr0dpKHMQVEfH0xQX0Yw3wyBg=; b=Ebe2D6YQAaILbC1oO7VZ8QfKTXypYvWoayWgI2ezJrI0XIWe07lVOONGpG/cmMC53IZ0Db 5nsa36VWD0nvgup2zGOnLCLEPRPhx+NRmAkzVyEd4Ul4t8nRL2QCh38gqpIK+rZ8NNs+ik DR+ofQ3hhORVkyeGITG8WMKiehosIkQ= X-MC-Unique: Jc9SXqEZNwKB71H_YdaU5g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 13/33] systemd: Switch virtstoraged to common templates Date: Wed, 27 Sep 2023 18:19:14 +0200 Message-ID: <20230927161934.181728-14-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.5 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: 1695834717321100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/storage/meson.build | 5 +---- src/storage/virtstoraged.service.extra.in | 3 +++ src/storage/virtstoraged.service.in | 27 ----------------------- 3 files changed, 4 insertions(+), 31 deletions(-) create mode 100644 src/storage/virtstoraged.service.extra.in delete mode 100644 src/storage/virtstoraged.service.in diff --git a/src/storage/meson.build b/src/storage/meson.build index e0a1e9f4de..fb7feea81d 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -111,11 +111,8 @@ if conf.has('WITH_STORAGE') =20 virt_daemon_units +=3D { 'service': 'virtstoraged', - 'service_in': files('virtstoraged.service.in'), 'name': 'Libvirt storage', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_extra_in': files('virtstoraged.service.extra.in'), } =20 openrc_init_files +=3D { diff --git a/src/storage/virtstoraged.service.extra.in b/src/storage/virtst= oraged.service.extra.in new file mode 100644 index 0000000000..d134ae18da --- /dev/null +++ b/src/storage/virtstoraged.service.extra.in @@ -0,0 +1,3 @@ +[Unit] +After=3Discsid.service +After=3Dremote-fs.target diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged= .service.in deleted file mode 100644 index 235fbc6798..0000000000 --- a/src/storage/virtstoraged.service.in +++ /dev/null @@ -1,27 +0,0 @@ -[Unit] -Description=3DVirtualization storage daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtstoraged.socket -Requires=3Dvirtstoraged-ro.socket -Requires=3Dvirtstoraged-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Discsid.service -After=3Dapparmor.service -After=3Dremote-fs.target -Documentation=3Dman:virtstoraged(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTSTORAGED_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtstoraged -ExecStart=3D@sbindir@/virtstoraged $VIRTSTORAGED_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtstoraged.socket -Also=3Dvirtstoraged-ro.socket -Also=3Dvirtstoraged-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695834699; cv=none; d=zohomail.com; s=zohoarc; b=CF7ohlUc3zh0BerfBKTprSBrHLaL7crDcibvYKM9LaVEAFFyDIZMBHTJoHCzx5K7qoKlhpsSGlqRc63Qn+bHwepGSZ0fQlF7HlTCWevuv/tI4lXXKXTrflwG7eL7PLQEjQHegjXHAXRl2HmwCNMm2kH4lkSH4nXI8Zcjd/hYDl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695834699; 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=K7mNE6n5M2FELQH25jhXz0SvH+1OAILJMoGLM6Z57Nc=; b=kgVaO3ieCbYJFv53QnfdgfVUFyrf64/ICtxhmdcYtz2dHLqZE9n+ujzMraAGwVDYfq1MmT4EwJIjMYX/1y4bmxe4efNF/EVBESAhQIbIc4tWrUuenTQ1IcncSaOSg7eDq3rLjbmrbkPCEgLu3heRsSeAapjsUD2Cn7xCk11lYuA= 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 1695834699557182.01607853355085; Wed, 27 Sep 2023 10:11:39 -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-610-yKbOO6MjMXCSau2XFeuHUw-1; Wed, 27 Sep 2023 13:11:35 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 D821B3C02550; Wed, 27 Sep 2023 17:11: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 C3656492B16; Wed, 27 Sep 2023 17:11:32 +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 1102B194658D; Wed, 27 Sep 2023 17:11:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9934A19465A8 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D80E51054FC2; Wed, 27 Sep 2023 16:19:46 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6BF351054FC9 for ; Wed, 27 Sep 2023 16:19:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695834698; 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=K7mNE6n5M2FELQH25jhXz0SvH+1OAILJMoGLM6Z57Nc=; b=VWsuY8/+88nkf+njNLlWGlG+CoZ8dpWv9byuVlx19Sug5FZBmpd9tcNk88eHxJc99DiaBk gudaWUTxaRRO5jaBe11chF+heGumbRULkDfBJVD0Fv9zvhS2Ko/X+JJ2ZElJme7nsh1xOX 4mri5p1d/8U9htCBrWN7pej/dzGUv8Y= X-MC-Unique: yKbOO6MjMXCSau2XFeuHUw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 14/33] systemd: Switch virtvboxd to common templates Date: Wed, 27 Sep 2023 18:19:15 +0200 Message-ID: <20230927161934.181728-15-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.9 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: 1695834700957100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/vbox/meson.build | 5 +---- src/vbox/virtvboxd.service.extra.in | 2 ++ src/vbox/virtvboxd.service.in | 26 -------------------------- 3 files changed, 3 insertions(+), 30 deletions(-) create mode 100644 src/vbox/virtvboxd.service.extra.in delete mode 100644 src/vbox/virtvboxd.service.in diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 2d6b71ab8f..ee6efbdb42 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -57,11 +57,8 @@ if conf.has('WITH_VBOX') =20 virt_daemon_units +=3D { 'service': 'virtvboxd', - 'service_in': files('virtvboxd.service.in'), 'name': 'Libvirt vbox', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_extra_in': files('virtvboxd.service.extra.in'), } =20 openrc_init_files +=3D { diff --git a/src/vbox/virtvboxd.service.extra.in b/src/vbox/virtvboxd.servi= ce.extra.in new file mode 100644 index 0000000000..ba3ad13ace --- /dev/null +++ b/src/vbox/virtvboxd.service.extra.in @@ -0,0 +1,2 @@ +[Unit] +After=3Dremote-fs.target diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in deleted file mode 100644 index a567ed2443..0000000000 --- a/src/vbox/virtvboxd.service.in +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=3DVirtualization vbox daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtvboxd.socket -Requires=3Dvirtvboxd-ro.socket -Requires=3Dvirtvboxd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -After=3Dremote-fs.target -Documentation=3Dman:virtvboxd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTVBOXD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtvboxd -ExecStart=3D@sbindir@/virtvboxd $VIRTVBOXD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtvboxd.socket -Also=3Dvirtvboxd-ro.socket -Also=3Dvirtvboxd-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695831674; cv=none; d=zohomail.com; s=zohoarc; b=A+nPUOEHI4opyL5mshPHDlzHkLUgqteheTLjoEC2O2byQvEdsF/Kg57Vhnsp3p6l/dLqyDWy38otZGy0WNYYF9uwBtq8uL/npvBKxm5MRayuTOgEpQQr0JYIZNz9hOBSncmJ4ZkH5WW9UNPD1whL9Ro5wgglRzlri13eJ/vZSjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695831674; 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=cJDxOVmTcJ9RfMGHCPPsKGsR0Vu1C5xBDlFNQa2FkpI=; b=JIMYRlUiC3rF0IHgonR6HdNapwdCP0vNWI6S4saYLvFeeCZOO5J7FoGeJf0Lne/tmPvUROZnKMjmQC7ffP5oiDcif1cZ4+V20gn5aW51nQ9LvXGFXtElEFafLkz/A7itBkQW0y4lL6S6J1P24z8rKWaGghPJFaouERCU0JRfRjY= 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 1695831674062887.7718821718469; Wed, 27 Sep 2023 09:21:14 -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-284-1qXMPzlkMUWsrZpCw8RoQg-1; Wed, 27 Sep 2023 12:21:10 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 A37221C06E0C; Wed, 27 Sep 2023 16:21:03 +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 605811005B96; Wed, 27 Sep 2023 16:21:02 +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 BE1EE19465A0; Wed, 27 Sep 2023 16:21:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A0C5219465A2 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9391A1054FC9; Wed, 27 Sep 2023 16:19:47 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 275731054FC8 for ; Wed, 27 Sep 2023 16:19:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695831673; 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=cJDxOVmTcJ9RfMGHCPPsKGsR0Vu1C5xBDlFNQa2FkpI=; b=Q/lXsRmX+A6wp5nKZhY422JMszfI9BdoHSws16UqJv0WwrEoCYHKoyvD1qWu/BJVD7AKaO fvYZ104HOxonu5JoggMg5a5ERCALyR5JJadQ7uX0Yuax+XlqWFOhEKG1ocqz/NtarsVtLT PPdoU2LljPGiRk6P8ryzS23cIhVSnD8= X-MC-Unique: 1qXMPzlkMUWsrZpCw8RoQg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 15/33] systemd: Switch virtvzd to common templates Date: Wed, 27 Sep 2023 18:19:16 +0200 Message-ID: <20230927161934.181728-16-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.3 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: 1695831675998100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/vz/meson.build | 5 +---- src/vz/virtvzd.service.extra.in | 2 ++ src/vz/virtvzd.service.in | 26 -------------------------- 3 files changed, 3 insertions(+), 30 deletions(-) create mode 100644 src/vz/virtvzd.service.extra.in delete mode 100644 src/vz/virtvzd.service.in diff --git a/src/vz/meson.build b/src/vz/meson.build index 9c2eb90463..842cdb6136 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -48,11 +48,8 @@ if conf.has('WITH_VZ') =20 virt_daemon_units +=3D { 'service': 'virtvzd', - 'service_in': files('virtvzd.service.in'), 'name': 'Libvirt vz', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_extra_in': files('virtvzd.service.extra.in'), } =20 openrc_init_files +=3D { diff --git a/src/vz/virtvzd.service.extra.in b/src/vz/virtvzd.service.extra= .in new file mode 100644 index 0000000000..ba3ad13ace --- /dev/null +++ b/src/vz/virtvzd.service.extra.in @@ -0,0 +1,2 @@ +[Unit] +After=3Dremote-fs.target diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in deleted file mode 100644 index 5521e89e10..0000000000 --- a/src/vz/virtvzd.service.in +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=3DVirtualization vz daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtvzd.socket -Requires=3Dvirtvzd-ro.socket -Requires=3Dvirtvzd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -After=3Dremote-fs.target -Documentation=3Dman:virtvzd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTVZD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtvzd -ExecStart=3D@sbindir@/virtvzd $VIRTVZD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtvzd.socket -Also=3Dvirtvzd-ro.socket -Also=3Dvirtvzd-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833248; cv=none; d=zohomail.com; s=zohoarc; b=RfAxBKs5P2scogx/00hdyApDN8TlNwUDA0YP04z2YuyYpo6UYk0AQAX7Ok7+TVA3aB2oG6v5VU0Wn/PH18IAX9M0RM/kWwYtYGdrTXJpTymReXwEQUe0B2IFZi7uFKISTZ8OvOqnUqpeaAPb++yr58tvcRMfOjSd6ZOIOzfn9wQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833248; 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=AMs2A/vRjGbTk/9yhz+qBhpw+VpjO5WHi4HnDjAeIS0=; b=Pv3r8EUqEBHPgjbreIQEIlKMKoWNHo15vxDqjM5Ya749wHyVbNMbnORntsRINoll6wCh5sXycNMDyGE/+ooPgdvMQRSY6tDlq4ESAclNCSPIZbgzNW7VRbkomxaNlZjCjhzsP2B7RjfrD0rSml1Q7SKCFo0p4u1Wbh4x27qSfSM= 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 1695833248400683.7983893553998; Wed, 27 Sep 2023 09:47:28 -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-465-IEHInSJ2Nsu3fva7eqLOUA-1; Wed, 27 Sep 2023 12:47:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 5A4393C17710; Wed, 27 Sep 2023 16:47:19 +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 3FECE176C3; Wed, 27 Sep 2023 16:47:19 +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 9BBD519465BB; Wed, 27 Sep 2023 16:47:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A090819466EF for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4E44E1054FCA; Wed, 27 Sep 2023 16:19:48 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D68B41054FC8 for ; Wed, 27 Sep 2023 16:19:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833247; 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=AMs2A/vRjGbTk/9yhz+qBhpw+VpjO5WHi4HnDjAeIS0=; b=a8oMXCR435P6RUAf+UPe8aJKgJKnIHinozfW87jnu1WNLIRJ3vyYobLfnyxwsYkYvAcau3 MESvPesuFWM8kWogZc9F7WuH6pP8IqfoaIXneLc96Dci1eRUlaxzUgDONuZfh7VaOiBM4q lc20IZfIu1QQLLLPhAIS/FbZbU5SYvI= X-MC-Unique: IEHInSJ2Nsu3fva7eqLOUA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 16/33] systemd: Switch virtchd to common templates Date: Wed, 27 Sep 2023 18:19:17 +0200 Message-ID: <20230927161934.181728-17-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.5 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: 1695833250155100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/ch/meson.build | 5 +--- src/ch/virtchd.service.extra.in | 22 +++++++++++++++++ src/ch/virtchd.service.in | 44 --------------------------------- 3 files changed, 23 insertions(+), 48 deletions(-) create mode 100644 src/ch/virtchd.service.extra.in delete mode 100644 src/ch/virtchd.service.in diff --git a/src/ch/meson.build b/src/ch/meson.build index dc08069dcd..0ef7288257 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -57,11 +57,8 @@ if conf.has('WITH_CH') =20 virt_daemon_units +=3D { 'service': 'virtchd', - 'service_in': files('virtchd.service.in'), 'name': 'Libvirt ch', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_extra_in': files('virtchd.service.extra.in'), } =20 virt_install_dirs +=3D [ diff --git a/src/ch/virtchd.service.extra.in b/src/ch/virtchd.service.extra= .in new file mode 100644 index 0000000000..bc2fef57cc --- /dev/null +++ b/src/ch/virtchd.service.extra.in @@ -0,0 +1,22 @@ +[Unit] +Wants=3Dsystemd-machined.service +After=3Dsystemd-machined.service +After=3Dremote-fs.target + +[Service] +KillMode=3Dprocess +# Raise hard limits to match behaviour of systemd >=3D 240. +# During startup, daemon will set soft limit to match hard limit +# per systemd recommendations +LimitNOFILE=3D1024:524288 +# The cgroups pids controller can limit the number of tasks started by +# the daemon, which can limit the number of domains for some hypervisors. +# A conservative default of 8 tasks per guest results in a TasksMax of +# 32k to support 4096 guests. +TasksMax=3D32768 +# With cgroups v2 there is no devices controller anymore, we have to use +# eBPF to control access to devices. In order to do that we create a eBPF +# hash MAP which locks memory. The default map size for 64 devices together +# with program takes 12k per guest. After rounding up we will get 64M to +# support 4096 guests. +LimitMEMLOCK=3D64M diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in deleted file mode 100644 index 351eee312b..0000000000 --- a/src/ch/virtchd.service.in +++ /dev/null @@ -1,44 +0,0 @@ -[Unit] -Description=3DVirtualization Cloud-Hypervisor daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtchd.socket -Requires=3Dvirtchd-ro.socket -Requires=3Dvirtchd-admin.socket -Wants=3Dsystemd-machined.service -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -After=3Dremote-fs.target -After=3Dsystemd-machined.service -Documentation=3Dman:virtchd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTCHD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtchd -ExecStart=3D@sbindir@/virtchd $VIRTCHD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -KillMode=3Dprocess -Restart=3Don-failure -# Raise hard limits to match behaviour of systemd >=3D 240. -# During startup, daemon will set soft limit to match hard limit -# per systemd recommendations -LimitNOFILE=3D1024:524288 -# The cgroups pids controller can limit the number of tasks started by -# the daemon, which can limit the number of domains for some hypervisors. -# A conservative default of 8 tasks per guest results in a TasksMax of -# 32k to support 4096 guests. -TasksMax=3D32768 -# With cgroups v2 there is no devices controller anymore, we have to use -# eBPF to control access to devices. In order to do that we create a eBPF -# hash MAP which locks memory. The default map size for 64 devices togeth= er -# with program takes 12k per guest. After rounding up we will get 64M to -# support 4096 guests. -LimitMEMLOCK=3D64M - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtchd.socket -Also=3Dvirtchd-ro.socket -Also=3Dvirtchd-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833646; cv=none; d=zohomail.com; s=zohoarc; b=BkHY9AarvgX89APZajWeHBBATvDDscuAxsFKROeNG+75CaaOXNGqUMGI4/sQTxDInsiJHQsyywpC79dyVE68mTjsUOrd8NvP9dUbBmsgw6oNFBsES+BCc6cDFXfG5JRV8+DjeA8+GPPcO4brz53OzNY2KMVUgfhDxDE/uEuwcqg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833646; 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=adqxmXyZTntlF7ip51TbeulRZ03QbGB+JpWUHqU1bzY=; b=BJIgKrNTWRnmKy77QfCmV7UuLWLDmfULAA1Pj84bvos10Lfdsy/YV16gCSIZKaR8AGm2wSYfflqxg+hI3IlhjKseaghGhPSNLysC66evdsxBnqvYyJyyj2DAWNfX2x2/eGiriI6Sx776xOPkWxSPzEfamhSWnMTJSLPT4Po3oYk= 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 1695833646960457.0946792076958; Wed, 27 Sep 2023 09:54:06 -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-31-bfTfmBNoOMKMaoQv22GBgw-1; Wed, 27 Sep 2023 12:54:02 -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 88E35101A529; Wed, 27 Sep 2023 16:54:00 +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 DA8DF2026D4B; Wed, 27 Sep 2023 16:53:59 +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 7AB191946597; Wed, 27 Sep 2023 16:53:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C2A091946594 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 093C71054FCB; Wed, 27 Sep 2023 16:19:49 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 912261054FC8 for ; Wed, 27 Sep 2023 16:19:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833645; 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=adqxmXyZTntlF7ip51TbeulRZ03QbGB+JpWUHqU1bzY=; b=JrTXuk0LItkHUkbcss55h94rBwaZ3nsfu1mKZNCd9+j/RuZjfzibGf1wiieWIlhGXX+kjc d9KCQv62nYfnSX8Ue5jXlalTFopMYSOudreGp5R3h1dzuRz0+ywRhAyYlqYC5J2daFanNu Cjk7QGKQHaXs3H5Iq7gFiAtIBt0Gi20= X-MC-Unique: bfTfmBNoOMKMaoQv22GBgw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 17/33] systemd: Switch virtxend to common templates Date: Wed, 27 Sep 2023 18:19:18 +0200 Message-ID: <20230927161934.181728-18-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1695833648730100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/libxl/meson.build | 7 ++----- src/libxl/virtxend.service.extra.in | 12 +++++++++++ src/libxl/virtxend.service.in | 32 ----------------------------- src/libxl/virtxend.socket.extra.in | 2 ++ 4 files changed, 16 insertions(+), 37 deletions(-) create mode 100644 src/libxl/virtxend.service.extra.in delete mode 100644 src/libxl/virtxend.service.in create mode 100644 src/libxl/virtxend.socket.extra.in diff --git a/src/libxl/meson.build b/src/libxl/meson.build index a1553dbe27..171d6ca005 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -66,12 +66,9 @@ if conf.has('WITH_LIBXL') =20 virt_daemon_units +=3D { 'service': 'virtxend', - 'service_in': files('virtxend.service.in'), 'name': 'Libvirt libxl', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, - 'deps': 'ConditionPathExists=3D/proc/xen/capabilities', + '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/libxl/virtxend.service.extra.in b/src/libxl/virtxend.servi= ce.extra.in new file mode 100644 index 0000000000..ba38ba9160 --- /dev/null +++ b/src/libxl/virtxend.service.extra.in @@ -0,0 +1,12 @@ +[Unit] +Wants=3Dvirtlockd.socket +After=3Dremote-fs.target +After=3Dxencommons.service +Conflicts=3Dxendomains.service +ConditionPathExists=3D/proc/xen/capabilities + +[Service] +KillMode=3Dprocess + +[Install] +Also=3Dvirtlockd.socket diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in deleted file mode 100644 index c6a88f7fe9..0000000000 --- a/src/libxl/virtxend.service.in +++ /dev/null @@ -1,32 +0,0 @@ -[Unit] -Description=3DVirtualization xen daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtxend.socket -Requires=3Dvirtxend-ro.socket -Requires=3Dvirtxend-admin.socket -Wants=3Dvirtlockd.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -After=3Dremote-fs.target -After=3Dxencommons.service -Conflicts=3Dxendomains.service -Documentation=3Dman:virtxend(8) -Documentation=3Dhttps://libvirt.org -ConditionPathExists=3D/proc/xen/capabilities - -[Service] -Type=3Dnotify -Environment=3DVIRTXEND_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtxend -ExecStart=3D@sbindir@/virtxend $VIRTXEND_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure -KillMode=3Dprocess - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtlockd.socket -Also=3Dvirtxend.socket -Also=3Dvirtxend-ro.socket -Also=3Dvirtxend-admin.socket diff --git a/src/libxl/virtxend.socket.extra.in b/src/libxl/virtxend.socket= .extra.in new file mode 100644 index 0000000000..c8322efbbc --- /dev/null +++ b/src/libxl/virtxend.socket.extra.in @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=3D/proc/xen/capabilities --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833683; cv=none; d=zohomail.com; s=zohoarc; b=c5PtIVj1FNK06O4L0tNKewng4BSvI9M2Nq67ZPyrQ0tIdJr7K7UU824bCqPK51jmfobsWIkpTiplvdMajzMWtnY/OsmPbr4RMu99nVgpobcaOWaajVzV/wqEpE01Kwkt27yfu08L+uh5PVSbZQATHsBpvwws7H4mwJqf7wwZdso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833683; 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=wADvu9Dc57GoI4mOIGLcNXxRNBfa2LuE5dAIHAYizwI=; b=RkfBuSTWnKUj5OCRES4OdfcceGQZlQ6SY4XLHZI9JMuxlaZag7jf1RVeIf3c3SxSxRpGkTFVV+qEVI8f5x22UYOl08uWtF0ANQ/lQuz6vjRnAO6pqRMd2RtXXzcn21vaT3JREwCC/w1i3BS7Du52hkMITPtANXat4vK43R3/48E= 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 1695833683523931.4522347230218; Wed, 27 Sep 2023 09:54:43 -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-52-HN5VU7UHP9KM-JJXoPjABA-1; Wed, 27 Sep 2023 12:54:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 0EA7A185A78E; Wed, 27 Sep 2023 16:54:36 +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 EC24540C6E77; Wed, 27 Sep 2023 16:54:35 +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 D6AE919466F1; Wed, 27 Sep 2023 16:54:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CFB061946A41 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B81D21054FCC; Wed, 27 Sep 2023 16:19:49 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C0711054FC8 for ; Wed, 27 Sep 2023 16:19:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833682; 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=wADvu9Dc57GoI4mOIGLcNXxRNBfa2LuE5dAIHAYizwI=; b=QKEzY/1970xl4s8LCnGIqurMY8qVw0ytrisO8UTSip5TqmwmmLt+9qfJInwa6SGiTuy3e3 qqpQc47Nii2ACVr/cDUE4//wOtFMmsPxMnbbHco7Xn7x3D8302JTmNtIoPiymu/tcv0cWQ 4zeV5lo6dc0J9ro8ilovdlwB5tfZcVg= X-MC-Unique: HN5VU7UHP9KM-JJXoPjABA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 18/33] systemd: Switch virtlxcd to common templates Date: Wed, 27 Sep 2023 18:19:19 +0200 Message-ID: <20230927161934.181728-19-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.2 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: 1695833685639100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/lxc/meson.build | 5 +--- src/lxc/virtlxcd.service.extra.in | 22 ++++++++++++++++ src/lxc/virtlxcd.service.in | 44 ------------------------------- 3 files changed, 23 insertions(+), 48 deletions(-) create mode 100644 src/lxc/virtlxcd.service.extra.in delete mode 100644 src/lxc/virtlxcd.service.in diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 531078448c..84e6c313ea 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -164,11 +164,8 @@ if conf.has('WITH_LXC') =20 virt_daemon_units +=3D { 'service': 'virtlxcd', - 'service_in': files('virtlxcd.service.in'), 'name': 'Libvirt lxc', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_extra_in': files('virtlxcd.service.extra.in'), } =20 openrc_init_files +=3D { diff --git a/src/lxc/virtlxcd.service.extra.in b/src/lxc/virtlxcd.service.e= xtra.in new file mode 100644 index 0000000000..bc2fef57cc --- /dev/null +++ b/src/lxc/virtlxcd.service.extra.in @@ -0,0 +1,22 @@ +[Unit] +Wants=3Dsystemd-machined.service +After=3Dsystemd-machined.service +After=3Dremote-fs.target + +[Service] +KillMode=3Dprocess +# Raise hard limits to match behaviour of systemd >=3D 240. +# During startup, daemon will set soft limit to match hard limit +# per systemd recommendations +LimitNOFILE=3D1024:524288 +# The cgroups pids controller can limit the number of tasks started by +# the daemon, which can limit the number of domains for some hypervisors. +# A conservative default of 8 tasks per guest results in a TasksMax of +# 32k to support 4096 guests. +TasksMax=3D32768 +# With cgroups v2 there is no devices controller anymore, we have to use +# eBPF to control access to devices. In order to do that we create a eBPF +# hash MAP which locks memory. The default map size for 64 devices together +# with program takes 12k per guest. After rounding up we will get 64M to +# support 4096 guests. +LimitMEMLOCK=3D64M diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in deleted file mode 100644 index ee3a7f1083..0000000000 --- a/src/lxc/virtlxcd.service.in +++ /dev/null @@ -1,44 +0,0 @@ -[Unit] -Description=3DVirtualization lxc daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtlxcd.socket -Requires=3Dvirtlxcd-ro.socket -Requires=3Dvirtlxcd-admin.socket -Wants=3Dsystemd-machined.service -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -After=3Dremote-fs.target -After=3Dsystemd-machined.service -Documentation=3Dman:virtlxcd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTLXCD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtlxcd -ExecStart=3D@sbindir@/virtlxcd $VIRTLXCD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -KillMode=3Dprocess -Restart=3Don-failure -# Raise hard limits to match behaviour of systemd >=3D 240. -# During startup, daemon will set soft limit to match hard limit -# per systemd recommendations -LimitNOFILE=3D1024:524288 -# The cgroups pids controller can limit the number of tasks started by -# the daemon, which can limit the number of domains for some hypervisors. -# A conservative default of 8 tasks per guest results in a TasksMax of -# 32k to support 4096 guests. -TasksMax=3D32768 -# With cgroups v2 there is no devices controller anymore, we have to use -# eBPF to control access to devices. In order to do that we create a eBPF -# hash MAP which locks memory. The default map size for 64 devices togeth= er -# with program takes 12k per guest. After rounding up we will get 64M to -# support 4096 guests. -LimitMEMLOCK=3D64M - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtlxcd.socket -Also=3Dvirtlxcd-ro.socket -Also=3Dvirtlxcd-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695831699; cv=none; d=zohomail.com; s=zohoarc; b=gq4+t8QKWXq6coJVauLv8EaVKJfOgwc66orYt/F8sVBe2uRATdeVpjyEngxTWpfqMiafMeN2zYK/12xnJEvT57rXB1TXlr/s3w1TbIw/N6F5nFmjYq0oyqtW46uSTJKZ63ZDwAf7cn4PAd+JnNSuUmO5bk6AfHIKg2ZZkS9CtR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695831699; 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=1cUXdwpJ4S3XhOC4VPgQ3snQb6eLmZovO1K0MKOV87w=; b=FBQnBUHTRRJO4twJeW73NJcMmLMXpCoq3RG42NDT2BY7O4QfqwuHabalhuUUh05NBx753hweFvgn3fucZPuuq/DpXWNji9aiz1hGaQK+TMiTlFBmAPJOHAnOQsYNd0cXtTB1qstaSXg72KM1mYVX57ZWECdecBaku2P7wvG/Jlw= 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 1695831699368914.9513614404849; Wed, 27 Sep 2023 09:21:39 -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-178-PoFiPHlpNPGUeuySQSf4FA-1; Wed, 27 Sep 2023 12:21:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 427311C00D14; Wed, 27 Sep 2023 16:21: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 2C4DF140E96D; Wed, 27 Sep 2023 16:21:32 +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 D3CA5194658F; Wed, 27 Sep 2023 16:21:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A420919466F0 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 732F21054FCD; Wed, 27 Sep 2023 16:19:50 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 06FD51054FC8 for ; Wed, 27 Sep 2023 16:19:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695831698; 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=1cUXdwpJ4S3XhOC4VPgQ3snQb6eLmZovO1K0MKOV87w=; b=GNbNthR1VRMmvszYgESOwD+BTPb5+QGB0sds0SbAb3ULKnHsUoGCJQTgOniiRfJzHXuWa/ 7I54uLxZVGpv81uWbDVS2k7ujKcWEzuFxKl9d4DjfbFdSbygW8qjQYc6g0aptO/i4hJ19t 3N2JcXxW0L4wyY9owPyCf/JgqSv3oKA= X-MC-Unique: PoFiPHlpNPGUeuySQSf4FA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 19/33] systemd: Switch virtqemud to common templates Date: Wed, 27 Sep 2023 18:19:20 +0200 Message-ID: <20230927161934.181728-20-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.7 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: 1695831700649100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/meson.build | 5 +-- src/qemu/virtqemud.service.extra.in | 28 +++++++++++++++++ src/qemu/virtqemud.service.in | 48 ----------------------------- 3 files changed, 29 insertions(+), 52 deletions(-) create mode 100644 src/qemu/virtqemud.service.extra.in delete mode 100644 src/qemu/virtqemud.service.in diff --git a/src/qemu/meson.build b/src/qemu/meson.build index b52497bdf0..1afc301a6d 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -183,11 +183,8 @@ if conf.has('WITH_QEMU') =20 virt_daemon_units +=3D { 'service': 'virtqemud', - 'service_in': files('virtqemud.service.in'), 'name': 'Libvirt qemu', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_extra_in': files('virtqemud.service.extra.in'), } =20 openrc_init_files +=3D { diff --git a/src/qemu/virtqemud.service.extra.in b/src/qemu/virtqemud.servi= ce.extra.in new file mode 100644 index 0000000000..eaf616f575 --- /dev/null +++ b/src/qemu/virtqemud.service.extra.in @@ -0,0 +1,28 @@ +[Unit] +Requires=3Dvirtlogd.socket +Wants=3Dvirtlockd.socket +Wants=3Dsystemd-machined.service +After=3Dsystemd-machined.service +After=3Dremote-fs.target + +[Service] +KillMode=3Dprocess +# Raise hard limits to match behaviour of systemd >=3D 240. +# During startup, daemon will set soft limit to match hard limit +# per systemd recommendations +LimitNOFILE=3D1024:524288 +# The cgroups pids controller can limit the number of tasks started by +# the daemon, which can limit the number of domains for some hypervisors. +# A conservative default of 8 tasks per guest results in a TasksMax of +# 32k to support 4096 guests. +TasksMax=3D32768 +# With cgroups v2 there is no devices controller anymore, we have to use +# eBPF to control access to devices. In order to do that we create a eBPF +# hash MAP which locks memory. The default map size for 64 devices together +# with program takes 12k per guest. After rounding up we will get 64M to +# support 4096 guests. +LimitMEMLOCK=3D64M + +[Install] +Also=3Dvirtlogd.socket +Also=3Dvirtlockd.socket diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in deleted file mode 100644 index e79670ca95..0000000000 --- a/src/qemu/virtqemud.service.in +++ /dev/null @@ -1,48 +0,0 @@ -[Unit] -Description=3DVirtualization qemu daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtlogd.socket -Requires=3Dvirtqemud.socket -Requires=3Dvirtqemud-ro.socket -Requires=3Dvirtqemud-admin.socket -Wants=3Dvirtlockd.socket -Wants=3Dsystemd-machined.service -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -After=3Dremote-fs.target -After=3Dsystemd-machined.service -Documentation=3Dman:virtqemud(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTQEMUD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtqemud -ExecStart=3D@sbindir@/virtqemud $VIRTQEMUD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -KillMode=3Dprocess -Restart=3Don-failure -# Raise hard limits to match behaviour of systemd >=3D 240. -# During startup, daemon will set soft limit to match hard limit -# per systemd recommendations -LimitNOFILE=3D1024:524288 -# The cgroups pids controller can limit the number of tasks started by -# the daemon, which can limit the number of domains for some hypervisors. -# A conservative default of 8 tasks per guest results in a TasksMax of -# 32k to support 4096 guests. -TasksMax=3D32768 -# With cgroups v2 there is no devices controller anymore, we have to use -# eBPF to control access to devices. In order to do that we create a eBPF -# hash MAP which locks memory. The default map size for 64 devices togeth= er -# with program takes 12k per guest. After rounding up we will get 64M to -# support 4096 guests. -LimitMEMLOCK=3D64M - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtlogd.socket -Also=3Dvirtlockd.socket -Also=3Dvirtqemud.socket -Also=3Dvirtqemud-ro.socket -Also=3Dvirtqemud-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695832639; cv=none; d=zohomail.com; s=zohoarc; b=D8bAie/XAJUvL34b1SZpNpPCvt6H+2uWFiacRqMD+8apWGAjN05h4OAaG9du4dP4lPdtCYxL24pxtsajVHnFIKBpIUhu+JfDo78x1nEQE182J5P29qaDpH3avEe7P7BHokrmmRnRCW3qk0hSh8FlFl3dXI7yz6/ZUiCYwtaV96A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695832639; 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=5Z05/JdlQLwrTc+cK0F6J4TgsVBO8u9x3IjAyuI78Kg=; b=P64vWnh6LiJ33fL1BLyYAkXouJRw/GgnyvoBjp0y6uRQ3Xo9pxObEzCVq8k6TO306kRtPZHAMYArHkpQ1Dc7CGV5ek4/bOWtWn0ewg/RyjQNNcCzM3x7z7XQT5OE7+VKSxBbo7yeIIHFgexghHrGGRaTB15+KUXjHOmyl5YL7/c= 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 1695832639196334.074034952331; Wed, 27 Sep 2023 09:37:19 -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-46-xOS41bxZMXy4HnyRSL_1mQ-1; Wed, 27 Sep 2023 12:37:15 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 D39E7101A550; Wed, 27 Sep 2023 16:37:12 +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 BD7A2492B16; Wed, 27 Sep 2023 16:37:12 +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 AE70D194658F; Wed, 27 Sep 2023 16:36:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D07C61946A42 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2D9CD1054FCE; Wed, 27 Sep 2023 16:19:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5DAC1054FC8 for ; Wed, 27 Sep 2023 16:19:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695832638; 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=5Z05/JdlQLwrTc+cK0F6J4TgsVBO8u9x3IjAyuI78Kg=; b=HtWsw3PvOu2zGvULMpzPuKtx8GTgoPDpKY3Us0ySAlUit9kPJpVm85DTGTS64fRDCqwrTx y0fNlqnbUBrok8RRErTUvoCUItVX5INUTIrjfzqz8iAgPj/a8iScSVH3U24VwLbtgGoTGb gt0K6KudqAHM+5PVkNwQukJabYj+BaE= X-MC-Unique: xOS41bxZMXy4HnyRSL_1mQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 20/33] systemd: Switch virtproxyd to common templates Date: Wed, 27 Sep 2023 18:19:21 +0200 Message-ID: <20230927161934.181728-21-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.9 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: 1695832640294100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/remote/meson.build | 6 ------ src/remote/virtproxyd.service.in | 25 ------------------------- 2 files changed, 31 deletions(-) delete mode 100644 src/remote/virtproxyd.service.in diff --git a/src/remote/meson.build b/src/remote/meson.build index 78c08bf5ad..5ee6d4e61c 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -224,15 +224,9 @@ if conf.has('WITH_REMOTE') =20 virt_daemon_units +=3D { 'service': 'virtproxyd', - 'service_in': files('virtproxyd.service.in'), 'name': 'Libvirt proxy', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], - 'socket_in': files('libvirtd.socket.in'), - 'socket_ro_in': files('libvirtd-ro.socket.in'), - 'socket_admin_in': files('libvirtd-admin.socket.in'), - 'socket_tcp_in': files('libvirtd-tcp.socket.in'), - 'socket_tls_in': files('libvirtd-tls.socket.in'), } =20 openrc_init_files +=3D { diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.servi= ce.in deleted file mode 100644 index 9b829641f7..0000000000 --- a/src/remote/virtproxyd.service.in +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=3DVirtualization daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtproxyd.socket -Requires=3Dvirtproxyd-ro.socket -Requires=3Dvirtproxyd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -Documentation=3Dman:virtproxyd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTPROXYD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtproxyd -ExecStart=3D@sbindir@/virtproxyd $VIRTPROXYD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtproxyd.socket -Also=3Dvirtproxyd-ro.socket -Also=3Dvirtproxyd-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833680; cv=none; d=zohomail.com; s=zohoarc; b=S4hIftus5IYD+s6vTglEZz9LA/GsKn+A5qK+RJzuXDRYZrYfCfao59YY3Ke2ME6jB81jn+riZHvHNCu9C6HiczujBL2Yh1jSV5JqS+trPCEaegu2L8++0vpRnocr1OBoTpBcRKwPA5MevJSWm+0ZGmVkt1MPHlls6k34XwSBmVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833680; 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=GoaqLuaZ4dbO0WcCUPURadDzMCIFNJWuowWrmXky/sg=; b=FRIgVFjMLWNq2oVY6iol/rU1ZJAk2ZP1Vfdo5jyZOm7qe6y4Q/r1DmlhL6BW5x5PgkpeF/XBDeUPisd27YL9lsM7f8YygSdhoSYchP2yeBcxbE9oyjB1w3lybE3P8G+CipXyJFtsEAIAyUvy8mtdZ/GrMNH2A8MhLFRl0yq0Dbc= 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 1695833680014551.6236334165876; Wed, 27 Sep 2023 09:54:40 -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-600-lGrpzzAjOfiNhKlPHyDkVw-1; Wed, 27 Sep 2023 12:54:35 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 70FA7803498; Wed, 27 Sep 2023 16:54:31 +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 546BB4026F8; Wed, 27 Sep 2023 16:54: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 CA5FC194658F; Wed, 27 Sep 2023 16:54:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D0E9C1946A43 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DCA011054FD0; Wed, 27 Sep 2023 16:19:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 706EF1054FC8 for ; Wed, 27 Sep 2023 16:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833679; 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=GoaqLuaZ4dbO0WcCUPURadDzMCIFNJWuowWrmXky/sg=; b=MkmTNp5v2YemhSknq2uzVdYJZwtWYmmzumzCU/bYUwp6DTkvv8ATvGooxbkTM5asIlmyqS elfn0Xyg4JcfAKA/RAJs++56XkYONkdme5Xw7eZbFKfSjut3exQok1MbZ0P9qSqVXiLuoi y15paBKDe7Ogu79ttzhaAkJjTGJiZO0= X-MC-Unique: lGrpzzAjOfiNhKlPHyDkVw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 21/33] systemd: Drop libvirtd_socket*_in values Date: Wed, 27 Sep 2023 18:19:22 +0200 Message-ID: <20230927161934.181728-22-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.9 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: 1695833681801100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that the migration to common templates has been completed, we no longer need these. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index 0fbefe37d5..541ca61101 100644 --- a/src/meson.build +++ b/src/meson.build @@ -191,10 +191,6 @@ virt_test_aug_dir =3D datadir / 'augeas' / 'lenses' / = 'tests' # guest unit files to install guest_unit_files =3D [] =20 -libvirtd_socket_in =3D files('remote' / 'libvirtd.socket.in') -libvirtd_socket_ro_in =3D files('remote' / 'libvirtd-ro.socket.in') -libvirtd_socket_admin_in =3D files('remote' / 'libvirtd-admin.socket.in') - # virt_daemon_units: # generate libvirt daemon systemd unit files # * service - name of the service (required) --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695836143; cv=none; d=zohomail.com; s=zohoarc; b=XYtZh2FuUQixx3CYU48VnuDX1atGIqtDjDKHb2dVZznVN13IA/3CGGkck2cFwhCZqVSxqE/QGwuFghIhXlK1W60POSaw69ZYFzD/o/ryGfKIFZlyWG01OGuXNTlgUl7/sMfeRHGPal37heLvyHlsyhxX7+nW6rZ5/GGyP1UzEzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695836143; 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=YUWkElk5c2/An9wcYCuf+d5m6CFW5tFik1L/Mc9TwV4=; b=RepJRvKZ7e//1pzTT/DqAp5HaCndHpVhkVMUnMSsHZiGpL9O5pZtsklZEHPdv9ewwjFvk8dJFTxAcWRxpH1XhGCuzE0bGpMCx+GHhFqI09goxaDfPeJzfECe5Q5JPn6xZecKfaDrlPuIpSVeO9xcDn/iehHHIMD6yxMPQDVTQ+0= 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 1695836143132656.5688459905847; Wed, 27 Sep 2023 10:35:43 -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-43-bJGNQkxcOA6v3HbyTiAwEw-1; Wed, 27 Sep 2023 13:35:39 -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 CD25F858F19; Wed, 27 Sep 2023 17:35:36 +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 7B8FD40C2064; Wed, 27 Sep 2023 17:35:36 +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 46F2E1946588; Wed, 27 Sep 2023 17:35:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B68DB19466F7 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 98AC61054FD1; Wed, 27 Sep 2023 16:19:52 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C71B1054FC8 for ; Wed, 27 Sep 2023 16:19:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695836142; 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=YUWkElk5c2/An9wcYCuf+d5m6CFW5tFik1L/Mc9TwV4=; b=QNlsXFG/SrvOzgeLO4AHdWV+21Z2SlKWVWpfIL2OFy/GzU+nbDha8AlPceDaYrP5EAmr8j dM9j1VUFATFQFphMajGAZIOvWSaNtxKDSL23jTbU+9N53dCxbxFrJJvAKtDDUQZfOSc+uy RyWoWVrqRFtfkXzPrN92U8V9NLBY5AI= X-MC-Unique: bJGNQkxcOA6v3HbyTiAwEw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 22/33] systemd: Drop @deps@ Date: Wed, 27 Sep 2023 18:19:23 +0200 Message-ID: <20230927161934.181728-23-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1695836143910100001 Content-Type: text/plain; charset="utf-8"; x-default="true" It's no longer used anywhere. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 2 -- src/remote/libvirtd-admin.socket.in | 1 - src/remote/libvirtd-ro.socket.in | 1 - src/remote/libvirtd-tcp.socket.in | 1 - src/remote/libvirtd-tls.socket.in | 1 - src/remote/libvirtd.socket.in | 1 - 6 files changed, 7 deletions(-) diff --git a/src/meson.build b/src/meson.build index 541ca61101..144f24e526 100644 --- a/src/meson.build +++ b/src/meson.build @@ -201,7 +201,6 @@ guest_unit_files =3D [] # * 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) -# * deps - socket dependencies (optional, default '') virt_daemon_units =3D [] =20 # openrc_init_files @@ -817,7 +816,6 @@ if conf.has('WITH_LIBVIRTD') 'service': unit['service'], 'SERVICE': unit['service'].to_upper(), 'sockprefix': unit.get('sockprefix', unit['service']), - 'deps': unit.get('deps', ''), 'sockmode': sockmode, }) =20 diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index 01e1a08939..39bb0badea 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -3,7 +3,6 @@ Description=3D@name@ admin socket Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket -@deps@ =20 [Socket] ListenStream=3D@runstatedir@/libvirt/@sockprefix@-admin-sock diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index 58ae1beb95..b7b7ae0dd8 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -3,7 +3,6 @@ Description=3D@name@ local read-only socket Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket -@deps@ =20 [Socket] ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock-ro diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so= cket.in index 6949df315e..7c8bcdb525 100644 --- a/src/remote/libvirtd-tcp.socket.in +++ b/src/remote/libvirtd-tcp.socket.in @@ -3,7 +3,6 @@ Description=3D@name@ non-TLS IP socket Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket -@deps@ =20 [Socket] ListenStream=3D16509 diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so= cket.in index ada2b871f0..c6dceb2d4e 100644 --- a/src/remote/libvirtd-tls.socket.in +++ b/src/remote/libvirtd-tls.socket.in @@ -3,7 +3,6 @@ Description=3D@name@ TLS IP socket Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket -@deps@ =20 [Socket] ListenStream=3D16514 diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index e6e903a8ce..aec0708fd4 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -1,7 +1,6 @@ [Unit] Description=3D@name@ local socket Before=3D@service@.service -@deps@ =20 [Socket] ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833652; cv=none; d=zohomail.com; s=zohoarc; b=ONntQH2HzUsrbxmowoPBblVopwPJdPMYb7jVMAshS6TTy9yLAgHnlSNLD9MyYJLOJTA04dVihkr7wwWQDRXayh9USN5GCaGFO9zPHylk/de4ew40G3DnOJTZ+/HLuAXGDoNAslQ6Fuxm/r++EJI9yS53cZYLgQYWZ6rkVWn/MQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833652; 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=o5Pjnu7M0NRbfs0t8VtvCnDYMH6n50gTLsxRhorwCNM=; b=cYE3II/W7EuwMooNWpxlbapnUoQlIYVxFdwfgVKns05WgpjKMLbyjtm8KbFsVG06zfFZhxZ7eBtE2NJxe2g//des8MGzc415/R3wrpgcB85T8oUQrDTfpHxM78zqcZwZlmRnGpCRcfAvA+uNkjHDCj15TBHdORQak3k2k1kdnY4= 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 1695833652617531.9864991569474; Wed, 27 Sep 2023 09:54:12 -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-256-JJFZYsp4MMm0n9czTJiUZQ-1; Wed, 27 Sep 2023 12:54:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 7EFD2805B36; Wed, 27 Sep 2023 16:54:05 +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 6877E40C6EA8; Wed, 27 Sep 2023 16:54:05 +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 9164919465BA; Wed, 27 Sep 2023 16:53:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B33E219466F4 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 53A941054FD2; Wed, 27 Sep 2023 16:19:53 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DBC6D1054FC8 for ; Wed, 27 Sep 2023 16:19:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833651; 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=o5Pjnu7M0NRbfs0t8VtvCnDYMH6n50gTLsxRhorwCNM=; b=UaLVlp3jsiNU5gMy3xILcZ5scqTk34s87MxzCVVIYFOMVT8zpjwgvnbK8TVuUx2SGKFg9t to0BGagSNSTE9X7N0qqllyFVHLuQPta2ywTUt+zYPIr9DqbbPc2YZV6ry7ngwleUpM6U+f zcjtQMfUd+tBjMCO3Os3CpJY8XG9wmY= X-MC-Unique: JJFZYsp4MMm0n9czTJiUZQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 23/33] systemd: Drop parametrization from libvirtd sockets Date: Wed, 27 Sep 2023 18:19:24 +0200 Message-ID: <20230927161934.181728-24-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.2 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: 1695833654730100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Up until now the files have been used as template for most services, but now that those have been converted to common templates we can drop parametrization and make it clear that these files are for libvirtd only. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/remote/libvirtd-admin.socket.in | 10 +++++----- src/remote/libvirtd-ro.socket.in | 10 +++++----- src/remote/libvirtd-tcp.socket.in | 8 ++++---- src/remote/libvirtd-tls.socket.in | 8 ++++---- src/remote/libvirtd.socket.in | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index 39bb0badea..8d927db63b 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -1,12 +1,12 @@ [Unit] Description=3D@name@ admin socket -Before=3D@service@.service -BindsTo=3D@service@.socket -After=3D@service@.socket +Before=3Dlibvirtd.service +BindsTo=3Dlibvirtd.socket +After=3Dlibvirtd.socket =20 [Socket] -ListenStream=3D@runstatedir@/libvirt/@sockprefix@-admin-sock -Service=3D@service@.service +ListenStream=3D@runstatedir@/libvirt/libvirt-admin-sock +Service=3Dlibvirtd.service SocketMode=3D0600 =20 [Install] diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index b7b7ae0dd8..cc10190ab4 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -1,12 +1,12 @@ [Unit] Description=3D@name@ local read-only socket -Before=3D@service@.service -BindsTo=3D@service@.socket -After=3D@service@.socket +Before=3Dlibvirtd.service +BindsTo=3Dlibvirtd.socket +After=3Dlibvirtd.socket =20 [Socket] -ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock-ro -Service=3D@service@.service +ListenStream=3D@runstatedir@/libvirt/libvirt-sock-ro +Service=3Dlibvirtd.service SocketMode=3D0666 =20 [Install] diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so= cket.in index 7c8bcdb525..bc35f19c06 100644 --- a/src/remote/libvirtd-tcp.socket.in +++ b/src/remote/libvirtd-tcp.socket.in @@ -1,12 +1,12 @@ [Unit] Description=3D@name@ non-TLS IP socket -Before=3D@service@.service -BindsTo=3D@service@.socket -After=3D@service@.socket +Before=3Dlibvirtd.service +BindsTo=3Dlibvirtd.socket +After=3Dlibvirtd.socket =20 [Socket] ListenStream=3D16509 -Service=3D@service@.service +Service=3Dlibvirtd.service =20 [Install] WantedBy=3Dsockets.target diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so= cket.in index c6dceb2d4e..868a0be318 100644 --- a/src/remote/libvirtd-tls.socket.in +++ b/src/remote/libvirtd-tls.socket.in @@ -1,12 +1,12 @@ [Unit] Description=3D@name@ TLS IP socket -Before=3D@service@.service -BindsTo=3D@service@.socket -After=3D@service@.socket +Before=3Dlibvirtd.service +BindsTo=3Dlibvirtd.socket +After=3Dlibvirtd.socket =20 [Socket] ListenStream=3D16514 -Service=3D@service@.service +Service=3Dlibvirtd.service =20 [Install] WantedBy=3Dsockets.target diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index aec0708fd4..ea0554546a 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -1,10 +1,10 @@ [Unit] Description=3D@name@ local socket -Before=3D@service@.service +Before=3Dlibvirtd.service =20 [Socket] -ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock -Service=3D@service@.service +ListenStream=3D@runstatedir@/libvirt/libvirt-sock +Service=3Dlibvirtd.service SocketMode=3D@sockmode@ RemoveOnStop=3Dyes =20 --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695832619; cv=none; d=zohomail.com; s=zohoarc; b=TdxCOa/+snvSzWpjoMFQc3d3W++ysmAkL5IyqLIBduGnrlO8JvvUw2SjJGGrD3gPg2BQaTZfs7yrgSv+jQxFlE9n/StBfAdrnIcf8xB8W5Y+7JwbAP5rDUeufWg2W1sWhnAY4y1vbz0+bGA4/4cloBKxsez5chGOzSd//1LbxFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695832619; 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=pJ3u2MZuC6tqtnPyzl7STdCCCtcVLA7vUS76DGaLmuo=; b=Q6BtqR0lNLAs+O/sksRAeBbO2xNxZ9JB1TttM5eW88E/KSb8tTCG8Mn2OuyTcq1JOBsnrUtmciEZoh9iHfnXtureOxvr0K4wKWTWii0IypUfGw2ydHpFpsLlFVT1LZdtab4KGc91XJbup88faL6OnEaoi5oHBdQUinj7h/TZYjk= 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 1695832619660638.3161359372457; Wed, 27 Sep 2023 09:36:59 -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-179-ZqsxAc6dPB-9Sc0HnCXGJA-1; Wed, 27 Sep 2023 12:36:55 -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 4E53785A5BD; Wed, 27 Sep 2023 16:36:53 +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 3A40F40C2064; Wed, 27 Sep 2023 16:36:53 +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 5F7E519466E9; Wed, 27 Sep 2023 16:36:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B542B19466F6 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0DF481054FC8; Wed, 27 Sep 2023 16:19:54 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9618A1054FD3 for ; Wed, 27 Sep 2023 16:19:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695832618; 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=pJ3u2MZuC6tqtnPyzl7STdCCCtcVLA7vUS76DGaLmuo=; b=I7/BiSX4YJVbS1Ckd9T4a8fa/pDy88nc9QzTx/qUktnp56CDKI4meS+9qfoqD8fm36DI6g 8L/ZW032Y7XiBsyLlnyhAxjcftVWLEeGOD/RBEqo5IZkZRIpIqBQow5i4r8ecUx9qjAwPP Qzgm7UOZ/FbKQLcBA+gGrfb/4l70lyg= X-MC-Unique: ZqsxAc6dPB-9Sc0HnCXGJA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 24/33] systemd: Make modular daemons conflict with libvirtd Date: Wed, 27 Sep 2023 18:19:25 +0200 Message-ID: <20230927161934.181728-25-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695832621947100001 We want to make sure that, at any given time, we have either the modular daemons or the monolithic one running, never both. In order to achieve that, make every single modular unit conflict with the corresponding libvirtd unit. We set both Conflicts=3Dlibvirtd.unit and After=3Dlibvirtd.unit: this tells systemd that, whenever virtfood.unit and libvirtd.unit are part of the same transaction, the former should win out. Thanks to this, if both the modular daemons and the monolithic one have been enabled because of outdated automation or a simple mistake of the administrator, the request to start libvirtd at boot will be ignored and the result will be a regular modular deployment. If the request to start libvirtd is made when the modular daemons are already running, we have no way to prevent systemd from complying with that request; however, thanks to the way the conflict relationship has been declared, they will be shut down cleanly before libvirtd is started. From the user's point of view, the transition from modular to monolithic will be completely transparent: it's basically the same scenario as a regular package upgrade, just with an extra twist. Note that, while switching from modular to monolithic at runtime happens automatically, going back requires manual intervention, i.e. starting all the necessary sockets one by one. That's okay: the goal here is to prevent misconfiguration and force of habit to accidentally disrupt a working setup, not to encourage the scenario. In a correctly configured and managed host, it should never occur. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/virtd-admin.socket.in | 2 ++ src/virtd-ro.socket.in | 2 ++ src/virtd-tcp.socket.in | 2 ++ src/virtd-tls.socket.in | 2 ++ src/virtd.service.in | 3 ++- src/virtd.socket.in | 2 ++ 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in index 39bb0badea..42cc1f670f 100644 --- a/src/virtd-admin.socket.in +++ b/src/virtd-admin.socket.in @@ -3,6 +3,8 @@ Description=3D@name@ admin socket Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket +Conflicts=3Dlibvirtd-admin.socket +After=3Dlibvirtd-admin.socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/@sockprefix@-admin-sock diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in index b7b7ae0dd8..7b8cbdba20 100644 --- a/src/virtd-ro.socket.in +++ b/src/virtd-ro.socket.in @@ -3,6 +3,8 @@ Description=3D@name@ local read-only socket Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket +Conflicts=3Dlibvirtd-ro.socket +After=3Dlibvirtd-ro.socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock-ro diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in index 7c8bcdb525..9fe90ed0a0 100644 --- a/src/virtd-tcp.socket.in +++ b/src/virtd-tcp.socket.in @@ -3,6 +3,8 @@ Description=3D@name@ non-TLS IP socket Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket +Conflicts=3Dlibvirtd-tcp.socket +After=3Dlibvirtd-tcp.socket =20 [Socket] ListenStream=3D16509 diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in index c6dceb2d4e..bb89daddb5 100644 --- a/src/virtd-tls.socket.in +++ b/src/virtd-tls.socket.in @@ -3,6 +3,8 @@ Description=3D@name@ TLS IP socket Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket +Conflicts=3Dlibvirtd-tls.socket +After=3Dlibvirtd-tls.socket =20 [Socket] ListenStream=3D16514 diff --git a/src/virtd.service.in b/src/virtd.service.in index 76f9c60351..60ab122cbc 100644 --- a/src/virtd.service.in +++ b/src/virtd.service.in @@ -1,9 +1,10 @@ [Unit] Description=3D@name@ daemon -Conflicts=3Dlibvirtd.service Requires=3D@service@.socket Requires=3D@service@-ro.socket Requires=3D@service@-admin.socket +Conflicts=3Dlibvirtd.service +After=3Dlibvirtd.service After=3Dnetwork.target After=3Ddbus.service After=3Dapparmor.service diff --git a/src/virtd.socket.in b/src/virtd.socket.in index aec0708fd4..053dc1c782 100644 --- a/src/virtd.socket.in +++ b/src/virtd.socket.in @@ -1,6 +1,8 @@ [Unit] Description=3D@name@ local socket Before=3D@service@.service +Conflicts=3Dlibvirtd.socket +After=3Dlibvirtd.socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833705; cv=none; d=zohomail.com; s=zohoarc; b=WoSRpgF0xAoJqdh9RgXqSAwM/265WrvACVIjIU5bnSA0vunUqeev6Q4vANAlgxu3AQh5nTAPPKsi8XN5vrZS/6KXzazoRItml1oYL7CkKvt+VD9a5G/us232Jt4mgrdaDzUFyTiwgD7hAEZlBo6NjYXYOY+e6tsJJ6nTwVL6fxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833705; 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=RDa4fFqAGTfltrK3rhlUlPrDSCjrBhbhFEvJiI3EMcw=; b=XurRb4UA+00TLu2RsXOBaRCEthBjoGHhuVQz8Aq2bm1Mw2ppT4w2+ryn9PcJIIWmZgUxrl1nNhQ7ox7fWw0Ff1GHDi9VnYEFqAve0bwdUM4+DamD/wcCWv+UY8HO7MywY2W5sVFs2TfIk16ES/qPZHdDXQ6GjyIHu4hddu+hxUo= 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 1695833705323653.9221368865623; Wed, 27 Sep 2023 09:55:05 -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-367-PJECE263OWq6EgUavH93sw-1; Wed, 27 Sep 2023 12:54:50 -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 69FF4280FED1; Wed, 27 Sep 2023 16:54:47 +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 502CC2026D68; Wed, 27 Sep 2023 16:54:47 +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 2CEC61946A54; Wed, 27 Sep 2023 16:54:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E547219465A8 for ; Wed, 27 Sep 2023 16:21:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BCD3E1054FD4; Wed, 27 Sep 2023 16:19:54 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5106A1054FD3 for ; Wed, 27 Sep 2023 16:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833704; 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=RDa4fFqAGTfltrK3rhlUlPrDSCjrBhbhFEvJiI3EMcw=; b=bvW/3VccgFBo09nJTJRdQNEGMQqadWkCp+kq4m8l3WSERAYr7PtyAR9R3ysQa7RT4R1Bga 7ee5bdBYffgLyZTkHwbpInD70GG7Lavo5+E15oALzDl8kfrpbcD5Eq26gSNUgd1+/UpZqK 4tCAFSfPPhgNakd/OXJRXCVxCl4TsYg= X-MC-Unique: PJECE263OWq6EgUavH93sw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 25/33] systemd: Replace Requires with BindTo+After for main socket Date: Wed, 27 Sep 2023 18:19:26 +0200 Message-ID: <20230927161934.181728-26-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1695833706262100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This is the strongest relationship that can be declared between two units, and causes the service to be terminated immediately if its main socket disappears. This is the behavior we want. Note that we don't do the same for the read-only/admin sockets, because those are not as critical for the core functionality of services as the main socket it. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd.service.in | 3 ++- src/logging/virtlogd.service.in | 3 ++- src/virtd.service.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index 9e91fa3261..35924a2ad7 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,7 +1,8 @@ [Unit] Description=3DVirtual machine lock manager -Requires=3Dvirtlockd.socket +BindsTo=3Dvirtlockd.socket Requires=3Dvirtlockd-admin.socket +After=3Dvirtlockd.socket Before=3Dlibvirtd.service Documentation=3Dman:virtlockd(8) Documentation=3Dhttps://libvirt.org diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 97c942ffb0..79d34bc73e 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -1,7 +1,8 @@ [Unit] Description=3DVirtual machine log manager -Requires=3Dvirtlogd.socket +BindsTo=3Dvirtlogd.socket Requires=3Dvirtlogd-admin.socket +After=3Dvirtlogd.socket Before=3Dlibvirtd.service Documentation=3Dman:virtlogd(8) Documentation=3Dhttps://libvirt.org diff --git a/src/virtd.service.in b/src/virtd.service.in index 60ab122cbc..e7f08b4da9 100644 --- a/src/virtd.service.in +++ b/src/virtd.service.in @@ -1,8 +1,9 @@ [Unit] Description=3D@name@ daemon -Requires=3D@service@.socket +BindsTo=3D@service@.socket Requires=3D@service@-ro.socket Requires=3D@service@-admin.socket +After=3D@service@.socket Conflicts=3Dlibvirtd.service After=3Dlibvirtd.service After=3Dnetwork.target --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833407; cv=none; d=zohomail.com; s=zohoarc; b=g457rkd9i1QciEAUcBeMit2Boj+AgFBKaci5ASC2GXzu0qMYspN0BoUKAXtjl+FIWhQJP/DcB1F7UAGUX2/dyUv5NAHneAVbMqG5IqtOewbF31V/sCchXvuqzju6BzZmEJe7QoDTfOY93ueFfHRXjZfmg1kHmH4czv9V0zSrMbk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833407; 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=PryE0VTul3U5fSWSOc1LQNe5jb+Z/XVI2pibAtQVst0=; b=ZEZjseRuHVOt97wrtEL63eStlEzhgPvzKsSDF3RDNeaUItuLW8y7/lPFxzZLpMSFKG7uw/Q+JGTrmn6qVjjD4rf4khYicLD2XKFs6yyIF4sN86mC9sdwlC5BCHS+F3xXlhzpzK9yC4Nrl1XiUWTEszoZV1RL5w3ucweDOyfF1wo= 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 1695833407929928.102185421909; Wed, 27 Sep 2023 09:50:07 -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-684-VG8A3JEPODGTLbwyrWxmgw-1; Wed, 27 Sep 2023 12:50:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 20D6B101B040; Wed, 27 Sep 2023 16:50:01 +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 D0126176E0; Wed, 27 Sep 2023 16:50:00 +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 9561D194658F; Wed, 27 Sep 2023 16:50:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DF27A19465A4 for ; Wed, 27 Sep 2023 16:21:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 77DCB1054FD5; Wed, 27 Sep 2023 16:19:55 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0BCF11054FD3 for ; Wed, 27 Sep 2023 16:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833407; 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=PryE0VTul3U5fSWSOc1LQNe5jb+Z/XVI2pibAtQVst0=; b=GaybduZtyxguqQOqOyErPWultbiXx79pnbNtqG4yEug0gdSigXzqLu6RNGlgeHnzr7c3+b +MDWvrX/IGZTWwz5xzcBqsYna/5xEcl89BFJ2B4LB1vRwh/5GoEPLRmRsFXfCBAm0AozLn xDUrb8bJ9x+bUemyP26ZgE5ewsSlKY0= X-MC-Unique: VG8A3JEPODGTLbwyrWxmgw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 26/33] systemd: Downgrade read-only/admin sockets to Wants Date: Wed, 27 Sep 2023 18:19:27 +0200 Message-ID: <20230927161934.181728-27-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.5 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: 1695833409832100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Only the main socket is actually necessary for the service to be usable. In the past, we've had security issues that could be exploited via access to the read-only socket, so a security-minded administrator might consider disabling all optional sockets. This change makes such a setup possible. Note that the services will still try to activate all their sockets on startup, even if they have been disabled. To make sure that the optional sockets are never started, they will have to be masked. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd.service.in | 2 +- src/logging/virtlogd.service.in | 2 +- src/virtd.service.in | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index 35924a2ad7..fcf479c3c6 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,7 +1,7 @@ [Unit] Description=3DVirtual machine lock manager BindsTo=3Dvirtlockd.socket -Requires=3Dvirtlockd-admin.socket +Wants=3Dvirtlockd-admin.socket After=3Dvirtlockd.socket Before=3Dlibvirtd.service Documentation=3Dman:virtlockd(8) diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 79d34bc73e..3265ecd6af 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -1,7 +1,7 @@ [Unit] Description=3DVirtual machine log manager BindsTo=3Dvirtlogd.socket -Requires=3Dvirtlogd-admin.socket +Wants=3Dvirtlogd-admin.socket After=3Dvirtlogd.socket Before=3Dlibvirtd.service Documentation=3Dman:virtlogd(8) diff --git a/src/virtd.service.in b/src/virtd.service.in index e7f08b4da9..f4f1bc217d 100644 --- a/src/virtd.service.in +++ b/src/virtd.service.in @@ -1,8 +1,8 @@ [Unit] Description=3D@name@ daemon BindsTo=3D@service@.socket -Requires=3D@service@-ro.socket -Requires=3D@service@-admin.socket +Wants=3D@service@-ro.socket +Wants=3D@service@-admin.socket After=3D@service@.socket Conflicts=3Dlibvirtd.service After=3Dlibvirtd.service --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833698; cv=none; d=zohomail.com; s=zohoarc; b=NB0+43uhk3bYOUsyTe/KBUex6sxNtJTJ8XwB9SvhKyxb5Yup65fpJiBDECHWkxNFbmybGWloivpXokTa9bVe2kfwCmnbHzuKCpjTsNpHWGN3/mRdY1522SVTVeWwJpirOF676jbu/KURLCB9uC6qnCWArKEwPGN+wqj+qi1ZhEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833698; 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=+utsbAxLBNeK3PrKqQUlMqk88zdrgf6sBPjq7rvOK2w=; b=BuQo07SlsF1P5VCP2Smr6NutwaP/GEz7ikzyR+/4gqG3NGgz5WpOfvBhy3jV7fYTGfxhKXu2uKVtWb8hKLmlU6iip7NE+RAMMSqJKtuq9WuElH2T0NafIPggj8ap1uafOJMHacSIi3PXfRIGjBNenvgjMT0PDdcn6eR4UDD6/Lo= 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 1695833698907846.4882505678171; Wed, 27 Sep 2023 09:54:58 -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-141-8sbZ3MopOdy8c3bvVBHgAQ-1; Wed, 27 Sep 2023 12:54:55 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 37DD5805BA7; Wed, 27 Sep 2023 16:54:53 +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 2299E21CAC6B; Wed, 27 Sep 2023 16:54:53 +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 56A3D19465A0; Wed, 27 Sep 2023 16:54:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F268919465A8 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 331211054FD6; Wed, 27 Sep 2023 16:19:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB2541054FD3 for ; Wed, 27 Sep 2023 16:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833697; 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=+utsbAxLBNeK3PrKqQUlMqk88zdrgf6sBPjq7rvOK2w=; b=NTm/axijf5nM9mDJAi9aRJMjvwFvg7QDjn03RbCmq1m8GR1I3Wa48Mk7hUnbU7N7IPhm3r B+5tzrPZzeq8uXNgEEG11yJ8SuNYrgq99bm6SQj/LyW6kzH39EKQYUJYorn6tKyfc7zGuE gvLQXYODyz42pBf1Y29EPrpYCW30QKg= X-MC-Unique: 8sbZ3MopOdy8c3bvVBHgAQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 27/33] systemd: Augment Requires/Wants with After Date: Wed, 27 Sep 2023 18:19:28 +0200 Message-ID: <20230927161934.181728-28-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695833700811100001 Requires/Wants only tells systemd that the corresponding unit should be started when the current one is, but that could very well happen in parallel. For virtlogd/virtlockd, we want the socket to be already active when the hypervisor driver is started. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/libxl/virtxend.service.extra.in | 1 + src/locking/virtlockd.service.in | 1 + src/logging/virtlogd.service.in | 1 + src/qemu/virtqemud.service.extra.in | 2 ++ src/remote/libvirtd.service.in | 7 ++++++- src/virtd.service.in | 2 ++ 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/libxl/virtxend.service.extra.in b/src/libxl/virtxend.servi= ce.extra.in index ba38ba9160..55783aa3d5 100644 --- a/src/libxl/virtxend.service.extra.in +++ b/src/libxl/virtxend.service.extra.in @@ -1,5 +1,6 @@ [Unit] Wants=3Dvirtlockd.socket +After=3Dvirtlockd.socket After=3Dremote-fs.target After=3Dxencommons.service Conflicts=3Dxendomains.service diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index fcf479c3c6..e0a7040ad3 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -3,6 +3,7 @@ Description=3DVirtual machine lock manager BindsTo=3Dvirtlockd.socket Wants=3Dvirtlockd-admin.socket After=3Dvirtlockd.socket +After=3Dvirtlockd-admin.socket Before=3Dlibvirtd.service Documentation=3Dman:virtlockd(8) Documentation=3Dhttps://libvirt.org diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 3265ecd6af..eab0d2c27c 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -3,6 +3,7 @@ Description=3DVirtual machine log manager BindsTo=3Dvirtlogd.socket Wants=3Dvirtlogd-admin.socket After=3Dvirtlogd.socket +After=3Dvirtlogd-admin.socket Before=3Dlibvirtd.service Documentation=3Dman:virtlogd(8) Documentation=3Dhttps://libvirt.org diff --git a/src/qemu/virtqemud.service.extra.in b/src/qemu/virtqemud.servi= ce.extra.in index eaf616f575..585e1e82eb 100644 --- a/src/qemu/virtqemud.service.extra.in +++ b/src/qemu/virtqemud.service.extra.in @@ -1,6 +1,8 @@ [Unit] Requires=3Dvirtlogd.socket Wants=3Dvirtlockd.socket +After=3Dvirtlogd.socket +After=3Dvirtlockd.socket Wants=3Dsystemd-machined.service After=3Dsystemd-machined.service After=3Dremote-fs.target diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 8839c00a15..a2c3c8f8fa 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -1,13 +1,18 @@ [Unit] Description=3DVirtualization daemon -Requires=3Dvirtlogd.socket # Use Wants instead of Requires so that users # can disable these three .socket units to revert # to a traditional non-activation deployment setup Wants=3Dlibvirtd.socket Wants=3Dlibvirtd-ro.socket Wants=3Dlibvirtd-admin.socket +After=3Dlibvirtd.socket +After=3Dlibvirtd-ro.socket +After=3Dlibvirtd-admin.socket +Requires=3Dvirtlogd.socket Wants=3Dvirtlockd.socket +After=3Dvirtlogd.socket +After=3Dvirtlockd.socket Wants=3Dsystemd-machined.service After=3Dnetwork.target After=3Ddbus.service diff --git a/src/virtd.service.in b/src/virtd.service.in index f4f1bc217d..e1a5814b13 100644 --- a/src/virtd.service.in +++ b/src/virtd.service.in @@ -4,6 +4,8 @@ BindsTo=3D@service@.socket Wants=3D@service@-ro.socket Wants=3D@service@-admin.socket After=3D@service@.socket +After=3D@service@-ro.socket +After=3D@service@-admin.socket Conflicts=3Dlibvirtd.service After=3Dlibvirtd.service After=3Dnetwork.target --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695835664; cv=none; d=zohomail.com; s=zohoarc; b=NLIrk+T8pNv3KZBVX4pspq+lJ8g9eme/kktToLb/6SxhtQJW+/gTkeEIut5YlI8HB7MEimbP75Xdwk5/b9WFN723kVyTEVat8CupI9ftB76WbRf7bYrvx1v2/5lhe50HJcyLTn0yVUgQYGW5h5czRQjmN97wCzohmqBzByy0msk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695835664; 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=c17pQu5c9q8nAaX62P9jkyOB8ffDrZwjWn3lakx76B4=; b=mot/AsYxx4oePXs2/eY/Jzcop7LdGq9bdb9nJ60WuWsFEEj7yunK6eIGm66AS3emfqkiqtqNxUPWqsOejQo47ePggkR4AfKO6WYcQFKWMfUNy2k3L61LVSNdsR/pVbpOvQiaB2Zp0cOw3Tkzwhhk9ozYb99sdWEywpidahbNAV0= 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 1695835664610561.0055910239531; Wed, 27 Sep 2023 10:27:44 -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-184-qHIufdIUNEKI-Q34tShVqA-1; Wed, 27 Sep 2023 13:27:41 -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 70CB2185A78E; Wed, 27 Sep 2023 17:27:38 +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 5CB0040C2064; Wed, 27 Sep 2023 17:27:38 +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 EEB7C194658D; Wed, 27 Sep 2023 17:27:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C4AC219466ED for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E1F5E1054FD3; Wed, 27 Sep 2023 16:19:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 758F11054FD7 for ; Wed, 27 Sep 2023 16:19:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695835663; 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=c17pQu5c9q8nAaX62P9jkyOB8ffDrZwjWn3lakx76B4=; b=AssOtUsUNsnznRFCjEpxYs8a0+VHpCBCU0Xx77bT1RCXhbS4FDR3AvfaIP8IWjeA7isPTs CisaDTQvrbFGvtxvUF8OjKlu5+ks6K0o8BofmkEEaSqzMzMn20yGga6ig02m8sFfBPmJE/ utbHAXlvC1qGU3czG6+dOGXVNk9+tkU= X-MC-Unique: qHIufdIUNEKI-Q34tShVqA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 28/33] systemd: Drop Before=libvirtd from virtlogd/virtlockd Date: Wed, 27 Sep 2023 18:19:29 +0200 Message-ID: <20230927161934.181728-29-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695835665633100001 We have already declared the mirror relationship, so this one is now redundant. Moreover, this version was incomplete: it only ever worked for the monolithic daemon, but the modular daemons for QEMU and Xen also want the sockets to be active. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd-admin.socket.in | 1 - src/locking/virtlockd.service.in | 1 - src/locking/virtlockd.socket.in | 1 - src/logging/virtlogd-admin.socket.in | 1 - src/logging/virtlogd.service.in | 1 - src/logging/virtlogd.socket.in | 1 - 6 files changed, 6 deletions(-) diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-= admin.socket.in index c66e0f9693..d5ebd7f60b 100644 --- a/src/locking/virtlockd-admin.socket.in +++ b/src/locking/virtlockd-admin.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3DVirtual machine lock manager admin socket -Before=3Dlibvirtd.service BindsTo=3Dvirtlockd.socket After=3Dvirtlockd.socket =20 diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index e0a7040ad3..20b4b26f35 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -4,7 +4,6 @@ BindsTo=3Dvirtlockd.socket Wants=3Dvirtlockd-admin.socket After=3Dvirtlockd.socket After=3Dvirtlockd-admin.socket -Before=3Dlibvirtd.service Documentation=3Dman:virtlockd(8) Documentation=3Dhttps://libvirt.org =20 diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket= .in index 4ce75391ae..d2cc2a06a3 100644 --- a/src/locking/virtlockd.socket.in +++ b/src/locking/virtlockd.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3DVirtual machine lock manager socket -Before=3Dlibvirtd.service =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlockd-sock diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-ad= min.socket.in index 5c0fb1880e..67259803ca 100644 --- a/src/logging/virtlogd-admin.socket.in +++ b/src/logging/virtlogd-admin.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3DVirtual machine log manager socket -Before=3Dlibvirtd.service BindsTo=3Dvirtlogd.socket After=3Dvirtlogd.socket =20 diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index eab0d2c27c..776d753e9a 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -4,7 +4,6 @@ BindsTo=3Dvirtlogd.socket Wants=3Dvirtlogd-admin.socket After=3Dvirtlogd.socket After=3Dvirtlogd-admin.socket -Before=3Dlibvirtd.service Documentation=3Dman:virtlogd(8) Documentation=3Dhttps://libvirt.org =20 diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in index ff3e66e09b..7b3fc73773 100644 --- a/src/logging/virtlogd.socket.in +++ b/src/logging/virtlogd.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3DVirtual machine log manager socket -Before=3Dlibvirtd.service =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlogd-sock --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833687; cv=none; d=zohomail.com; s=zohoarc; b=VVfPCvHRsDfQFmowaVYpKIDJwy2WPk/l4fjXTtIF1/dG7H7YRCZ3b9/x1r0WjuKw+b0tbP3kNo68NG4qwIyk07Fo738Oi5WKmXTne/VdLmnwQwL8kHCznqwYYtROGKDzCKn51zf+H2+uXVuQo32Xya8pRYrFJHqhODsM2EefLO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833687; 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=MvlcBDY8l4YkT2Qgz0V9+wHIn7BCC0/rE00Fy60VW2c=; b=j7A8xzvBYA8+CKtewCcNQFb9b2i9yQv2g/NDVbhtSSUDo9RKryNAvJ5e6d1bllWx0osV/yruJ0/RmnvrfweGiY5Y0d2FopS4qCzUPZU4e01btxqUnF8mvmITgo4nXPsQZrHl35HdxEDIrCgYusIOUnemFENpwIKdQJ79vm8QlmA= 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 1695833687342160.247189956297; Wed, 27 Sep 2023 09:54:47 -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-281-sCqppVRbMDWBr2zyk7ft4A-1; Wed, 27 Sep 2023 12:54:40 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 6D772185A79C; Wed, 27 Sep 2023 16:54:38 +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 5428440C6E77; Wed, 27 Sep 2023 16:54:38 +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 167AF1946A4B; Wed, 27 Sep 2023 16:54:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F210E19465A4 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9DFBB1054F80; Wed, 27 Sep 2023 16:19:57 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 316F21054FD7 for ; Wed, 27 Sep 2023 16:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833686; 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=MvlcBDY8l4YkT2Qgz0V9+wHIn7BCC0/rE00Fy60VW2c=; b=ABFiUMz0t/jRqcm8ipROELDPMcsup00eUIvzxtniFL2ZhiV0rND0zG21pS1xqKP0v6mBdn DCBJgq5zs4yU8ds14P4Z5IAeOOm16N4Zfxxqgpihngcbky4nZ+mRvVGf/IEpXeNerBjD1a gRs2FIzpgb5I0ol6YBLxXNGRgDP1+3Q= X-MC-Unique: sCqppVRbMDWBr2zyk7ft4A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 29/33] systemd: Drop Before=foo.service from sockets Date: Wed, 27 Sep 2023 18:19:30 +0200 Message-ID: <20230927161934.181728-30-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695833687894100001 systemd will automatically infer this dependency based on the socket's Service=3Dfoo.service setting. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/remote/libvirtd-admin.socket.in | 1 - src/remote/libvirtd-ro.socket.in | 1 - src/remote/libvirtd-tcp.socket.in | 1 - src/remote/libvirtd-tls.socket.in | 1 - src/remote/libvirtd.socket.in | 1 - src/virtd-admin.socket.in | 1 - src/virtd-ro.socket.in | 1 - src/virtd-tcp.socket.in | 1 - src/virtd-tls.socket.in | 1 - src/virtd.socket.in | 1 - 10 files changed, 10 deletions(-) diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index 8d927db63b..098e372971 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ admin socket -Before=3Dlibvirtd.service BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index cc10190ab4..101555e8a0 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ local read-only socket -Before=3Dlibvirtd.service BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so= cket.in index bc35f19c06..8b8fbcd01a 100644 --- a/src/remote/libvirtd-tcp.socket.in +++ b/src/remote/libvirtd-tcp.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ non-TLS IP socket -Before=3Dlibvirtd.service BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so= cket.in index 868a0be318..fefda22c6b 100644 --- a/src/remote/libvirtd-tls.socket.in +++ b/src/remote/libvirtd-tls.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ TLS IP socket -Before=3Dlibvirtd.service BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index ea0554546a..3019821df3 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ local socket -Before=3Dlibvirtd.service =20 [Socket] ListenStream=3D@runstatedir@/libvirt/libvirt-sock diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in index 42cc1f670f..63db2be5fe 100644 --- a/src/virtd-admin.socket.in +++ b/src/virtd-admin.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ admin socket -Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket Conflicts=3Dlibvirtd-admin.socket diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in index 7b8cbdba20..32e4789b8b 100644 --- a/src/virtd-ro.socket.in +++ b/src/virtd-ro.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ local read-only socket -Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket Conflicts=3Dlibvirtd-ro.socket diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in index 9fe90ed0a0..10480d64e3 100644 --- a/src/virtd-tcp.socket.in +++ b/src/virtd-tcp.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ non-TLS IP socket -Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket Conflicts=3Dlibvirtd-tcp.socket diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in index bb89daddb5..83a1e343bc 100644 --- a/src/virtd-tls.socket.in +++ b/src/virtd-tls.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ TLS IP socket -Before=3D@service@.service BindsTo=3D@service@.socket After=3D@service@.socket Conflicts=3Dlibvirtd-tls.socket diff --git a/src/virtd.socket.in b/src/virtd.socket.in index 053dc1c782..d0a0bb3b1c 100644 --- a/src/virtd.socket.in +++ b/src/virtd.socket.in @@ -1,6 +1,5 @@ [Unit] Description=3D@name@ local socket -Before=3D@service@.service Conflicts=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695831704; cv=none; d=zohomail.com; s=zohoarc; b=JlMIaNwjAsISsIXcIW/QnlSXIZzvoFgSpuTaE7J6CL4i2z33O4Ex1+Wqscb4PuPTzI7IN+aRlqtE4r49anlbmQB3Sxk8oFQIkf4e6PXO5HONVvBcaC1CJxi1tdpslN8vtbJcfgxP7O5BKXmvMsvTmRCvZiRi4Drv/dOqOkCo3lE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695831704; 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=wgZC/rSPLivo2Ro7aFn3F5eRVqgeO7DCMWFg4nkN0p8=; b=C0BNgSJbTSyrLUVwcxI09tRNd85OffzjltquK2WPWBJHK7gF401USnH/MPjcuISRL+nzILGo+1gviV+dFVI1TJOuC6s1+K9/TXu+Ddrx7/UB/jRXgKr2TzvZnpS2QN+AZRu7t6Gct67HGxS+g6EIDBYnztmsM6Gxp8KQHJQGUjM= 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 1695831704305574.4847397009185; Wed, 27 Sep 2023 09:21:44 -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-695-MKuTneUSP5uBM5TQB5Joqw-1; Wed, 27 Sep 2023 12:21:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 887721C00BAB; Wed, 27 Sep 2023 16:21:37 +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 72AA9C154CA; Wed, 27 Sep 2023 16:21:37 +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 324F51946589; Wed, 27 Sep 2023 16:21:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C6B9919466FC for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5AB371054F83; Wed, 27 Sep 2023 16:19:58 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E09081054F81 for ; Wed, 27 Sep 2023 16:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695831703; 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=wgZC/rSPLivo2Ro7aFn3F5eRVqgeO7DCMWFg4nkN0p8=; b=LaNJCgN58IyzdPZNg46ku5QDZyKCFV+UovRWSDhOlQLEUmwpU/clvcsWVJtsYvkIAgReNQ WwrpGZzwFjCkqcLpD4mvQrS7EhpSuigXZZYT4O69zbn1fQAPG09EJoBOOMJGwuXz0y4DUO tXSL9d5gor6Tx3ZjOZOyuzOkepunoNM= X-MC-Unique: MKuTneUSP5uBM5TQB5Joqw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 30/33] systemd: Add Also between sockets Date: Wed, 27 Sep 2023 18:19:31 +0200 Message-ID: <20230927161934.181728-31-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.8 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: 1695831704708100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This results in all sockets for a service being enabled when a single one of them is. The -tcp and -tls sockets are intentionally excluded, because enabling them should require explicit action on the administrator's part; moreover, disabling them should not result in the local sockets being disabled too. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd-admin.socket.in | 1 + src/locking/virtlockd.socket.in | 1 + src/logging/virtlogd-admin.socket.in | 1 + src/logging/virtlogd.socket.in | 1 + src/remote/libvirtd-admin.socket.in | 2 ++ src/remote/libvirtd-ro.socket.in | 2 ++ src/remote/libvirtd.socket.in | 2 ++ src/virtd-admin.socket.in | 2 ++ src/virtd-ro.socket.in | 2 ++ src/virtd.socket.in | 2 ++ 10 files changed, 16 insertions(+) diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-= admin.socket.in index d5ebd7f60b..d05ba982d9 100644 --- a/src/locking/virtlockd-admin.socket.in +++ b/src/locking/virtlockd-admin.socket.in @@ -10,3 +10,4 @@ SocketMode=3D0600 =20 [Install] WantedBy=3Dsockets.target +Also=3Dvirtlockd.socket diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket= .in index d2cc2a06a3..98aabb2511 100644 --- a/src/locking/virtlockd.socket.in +++ b/src/locking/virtlockd.socket.in @@ -8,3 +8,4 @@ SocketMode=3D0600 =20 [Install] WantedBy=3Dsockets.target +Also=3Dvirtlockd-admin.socket diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-ad= min.socket.in index 67259803ca..75ec7bd5fa 100644 --- a/src/logging/virtlogd-admin.socket.in +++ b/src/logging/virtlogd-admin.socket.in @@ -10,3 +10,4 @@ SocketMode=3D0600 =20 [Install] WantedBy=3Dsockets.target +Also=3Dvirtlogd.socket diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in index 7b3fc73773..b044d62e7c 100644 --- a/src/logging/virtlogd.socket.in +++ b/src/logging/virtlogd.socket.in @@ -8,3 +8,4 @@ SocketMode=3D0600 =20 [Install] WantedBy=3Dsockets.target +Also=3Dvirtlogd-admin.socket diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index 098e372971..6df038d95a 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -10,3 +10,5 @@ SocketMode=3D0600 =20 [Install] WantedBy=3Dsockets.target +Also=3Dlibvirtd.socket +Also=3Dlibvirtd-ro.socket diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index 101555e8a0..6797517c50 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -10,3 +10,5 @@ SocketMode=3D0666 =20 [Install] WantedBy=3Dsockets.target +Also=3Dlibvirtd.socket +Also=3Dlibvirtd-admin.socket diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index 3019821df3..f483facdf3 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -9,3 +9,5 @@ RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target +Also=3Dlibvirtd-ro.socket +Also=3Dlibvirtd-admin.socket diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in index 63db2be5fe..5a5f577041 100644 --- a/src/virtd-admin.socket.in +++ b/src/virtd-admin.socket.in @@ -12,3 +12,5 @@ SocketMode=3D0600 =20 [Install] WantedBy=3Dsockets.target +Also=3D@service@.socket +Also=3D@service@-ro.socket diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in index 32e4789b8b..692279665d 100644 --- a/src/virtd-ro.socket.in +++ b/src/virtd-ro.socket.in @@ -12,3 +12,5 @@ SocketMode=3D0666 =20 [Install] WantedBy=3Dsockets.target +Also=3D@service@.socket +Also=3D@service@-admin.socket diff --git a/src/virtd.socket.in b/src/virtd.socket.in index d0a0bb3b1c..7a8c4bf0c2 100644 --- a/src/virtd.socket.in +++ b/src/virtd.socket.in @@ -11,3 +11,5 @@ RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target +Also=3D@service@-ro.socket +Also=3D@service@-admin.socket --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695835659; cv=none; d=zohomail.com; s=zohoarc; b=MOy7AZi0YlbvCnmfEmgBGOH/4nUpaA+w6t1SdIj3QebWcOvZRC5NBiShnqpXrncB392khmr7PvBK3+WVai54Ot3E53PMOVpMySYgykz9vTSI6L3qwMdQX45yzZiIiByaflSTi/Dpe6HlsjJzjJPOuIMMW9JEIlh256DzfXD5ypY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695835659; 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=FhGyrm2+faNknUTbFtfAMY1lbC3F/tHdepPSl7un/s4=; b=kzx89KBvk+rG/q9LU9Hz17AE7TLgS/uqo1muHmQ0pxVdMG/vZZZPebyGQ6RhQT1lj8uSg/V9ku6MnOdv+trvtSIACUqyk8kqIKBHWvJ3QFFg9sy8INv0HDLsuOuKWi/YqErJJG9T+nsX4jJuy1fMoL78Bf9x85/8ALN+Oa7qTzk= 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 1695835659585139.37917422657483; Wed, 27 Sep 2023 10:27:39 -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-613-AapiSViAOuu48hst5AJ2wg-1; Wed, 27 Sep 2023 13:27:35 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 7552A280FEDC; Wed, 27 Sep 2023 17:27:33 +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 5E8A440107B; Wed, 27 Sep 2023 17:27:33 +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 456001946594; Wed, 27 Sep 2023 17:27:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C4A271946597 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 15BB31054F84; Wed, 27 Sep 2023 16:19:59 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9D5771054F81 for ; Wed, 27 Sep 2023 16:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695835658; 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=FhGyrm2+faNknUTbFtfAMY1lbC3F/tHdepPSl7un/s4=; b=Wowal8KhnVCw+wsfRBhpmyK9qARSq1s4Wi2FOx9B+MK6/sTJOHIrYNMbO23eZs+XLpmVj/ 3JEJstx62hGo7dtpeuW5KjY0Xd9BbvRIt6jbYo1IOvDypP4tnzbkhBWLT/4rCC1GQucSLc IaLsJ1aLMpvCdk9BN3tGr/Jo4qLqUP8= X-MC-Unique: AapiSViAOuu48hst5AJ2wg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 31/33] systemd: Add RemoveOnStop=yes to all sockets Date: Wed, 27 Sep 2023 18:19:32 +0200 Message-ID: <20230927161934.181728-32-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.9 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: 1695835660253100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Currently we only set this for the main sockets, which means that $ systemctl stop virtqemud.socket will make the socket disappear from the filesystem while $ systemctl stop virtqemud-ro.socket won't. Get rid of this inconsistency. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd-admin.socket.in | 1 + src/locking/virtlockd.socket.in | 1 + src/logging/virtlogd-admin.socket.in | 1 + src/logging/virtlogd.socket.in | 1 + src/remote/libvirtd-admin.socket.in | 1 + src/remote/libvirtd-ro.socket.in | 1 + src/virtd-admin.socket.in | 1 + src/virtd-ro.socket.in | 1 + 8 files changed, 8 insertions(+) diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-= admin.socket.in index d05ba982d9..0452a0cfdb 100644 --- a/src/locking/virtlockd-admin.socket.in +++ b/src/locking/virtlockd-admin.socket.in @@ -7,6 +7,7 @@ After=3Dvirtlockd.socket ListenStream=3D@runstatedir@/libvirt/virtlockd-admin-sock Service=3Dvirtlockd.service SocketMode=3D0600 +RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket= .in index 98aabb2511..31a576aa16 100644 --- a/src/locking/virtlockd.socket.in +++ b/src/locking/virtlockd.socket.in @@ -5,6 +5,7 @@ Description=3DVirtual machine lock manager socket ListenStream=3D@runstatedir@/libvirt/virtlockd-sock Service=3Dvirtlockd.service SocketMode=3D0600 +RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-ad= min.socket.in index 75ec7bd5fa..ddb9a1393b 100644 --- a/src/logging/virtlogd-admin.socket.in +++ b/src/logging/virtlogd-admin.socket.in @@ -7,6 +7,7 @@ After=3Dvirtlogd.socket ListenStream=3D@runstatedir@/libvirt/virtlogd-admin-sock Service=3Dvirtlogd.service SocketMode=3D0600 +RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in index b044d62e7c..084cbe179d 100644 --- a/src/logging/virtlogd.socket.in +++ b/src/logging/virtlogd.socket.in @@ -5,6 +5,7 @@ Description=3DVirtual machine log manager socket ListenStream=3D@runstatedir@/libvirt/virtlogd-sock Service=3Dvirtlogd.service SocketMode=3D0600 +RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index 6df038d95a..e0bbf9b1ac 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -7,6 +7,7 @@ After=3Dlibvirtd.socket ListenStream=3D@runstatedir@/libvirt/libvirt-admin-sock Service=3Dlibvirtd.service SocketMode=3D0600 +RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index 6797517c50..c8adc8109b 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -7,6 +7,7 @@ After=3Dlibvirtd.socket ListenStream=3D@runstatedir@/libvirt/libvirt-sock-ro Service=3Dlibvirtd.service SocketMode=3D0666 +RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in index 5a5f577041..818d4ab84f 100644 --- a/src/virtd-admin.socket.in +++ b/src/virtd-admin.socket.in @@ -9,6 +9,7 @@ After=3Dlibvirtd-admin.socket ListenStream=3D@runstatedir@/libvirt/@sockprefix@-admin-sock Service=3D@service@.service SocketMode=3D0600 +RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in index 692279665d..57b313e016 100644 --- a/src/virtd-ro.socket.in +++ b/src/virtd-ro.socket.in @@ -9,6 +9,7 @@ After=3Dlibvirtd-ro.socket ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock-ro Service=3D@service@.service SocketMode=3D0666 +RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695833241; cv=none; d=zohomail.com; s=zohoarc; b=EpsdAZOJZbGqs49qag33q/xwCWwEUdx1TxyurprHJI24Km1lgvZqaSvm0y8d/RjBIUr+GxoLGc3L9bWTTUw2M3p/5HPo9Zi75P5krVJAUl9eRa5kS9skvbvkHpq2MQjnZvTTKQciWtmvKCcbrquWVE4tqnxirA47zSEH94paLVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695833241; 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=FqgTVCdcgmfVwFCon0CFqchQbtbk4EtnM5qKNmCRoSY=; b=QbjEwXPZlZjhYOH+AyDEnk3JfMPcTC7yPqj1ngJBVSQFNrMjYwLxqjSn2ZoMGqQEeeAN+IIdluZMvYLVeXVSz5B13uO8xOSUb6WYcVdpmcq9LthUd9+6tTF6GKBEXAfoJBJcIA+YIOkSIrVQAKbsWSmWd9xOgPkD9Y9KCAR2Bbc= 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 1695833241597564.1308849770685; Wed, 27 Sep 2023 09:47:21 -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-616-myGjPkTTMe2H8b5G3GbAUQ-1; Wed, 27 Sep 2023 12:47:16 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 CBD651C00D19; Wed, 27 Sep 2023 16:47:13 +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 B1274100650B; Wed, 27 Sep 2023 16:47:13 +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 E12F419466F1; Wed, 27 Sep 2023 16:47:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F2A8819465B5 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C5E171054F81; Wed, 27 Sep 2023 16:19:59 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 595241054F85 for ; Wed, 27 Sep 2023 16:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695833240; 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=FqgTVCdcgmfVwFCon0CFqchQbtbk4EtnM5qKNmCRoSY=; b=JCDZvK9wCjxjEBfyW8Idm/MF7y6eCfB5EJac/0eJteXyEVE83jKZWRfyN/BOa4pappw38I xyjzIev1aaACEmI+KakZOI6NBxCxUHPlsopVRJRQnwEQJaZtnsu8jD9AV4mGJyW2nHapRv mUJPkwqY2EU4WbhkyYeHAuBm+UVS70Y= X-MC-Unique: myGjPkTTMe2H8b5G3GbAUQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 32/33] systemd: Improve and unify unit descriptions Date: Wed, 27 Sep 2023 18:19:33 +0200 Message-ID: <20230927161934.181728-33-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.3 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: 1695833243843100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Hypervisors are referred to by their user-facing name rather than the name of their libvirt driver, the monolithic daemon is explicitly referred to as legacy, and a consistent format is used throughout. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/ch/meson.build | 2 +- src/interface/meson.build | 2 +- src/libxl/meson.build | 2 +- src/locking/meson.build | 2 +- src/locking/virtlockd-admin.socket.in | 2 +- src/locking/virtlockd.service.in | 2 +- src/locking/virtlockd.socket.in | 2 +- src/logging/meson.build | 2 +- src/logging/virtlogd-admin.socket.in | 2 +- src/logging/virtlogd.service.in | 2 +- src/logging/virtlogd.socket.in | 2 +- src/lxc/meson.build | 2 +- src/network/meson.build | 2 +- src/node_device/meson.build | 2 +- src/nwfilter/meson.build | 2 +- src/qemu/meson.build | 2 +- src/remote/libvirtd-admin.socket.in | 2 +- src/remote/libvirtd-ro.socket.in | 2 +- src/remote/libvirtd-tcp.socket.in | 2 +- src/remote/libvirtd-tls.socket.in | 2 +- src/remote/libvirtd.service.in | 2 +- src/remote/libvirtd.socket.in | 2 +- src/remote/meson.build | 4 ++-- src/secret/meson.build | 2 +- src/storage/meson.build | 2 +- src/vbox/meson.build | 2 +- src/virtd-admin.socket.in | 2 +- src/virtd-ro.socket.in | 2 +- src/virtd-tcp.socket.in | 2 +- src/virtd-tls.socket.in | 2 +- src/virtd.service.in | 2 +- src/virtd.socket.in | 2 +- src/vz/meson.build | 2 +- 33 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/ch/meson.build b/src/ch/meson.build index 0ef7288257..df246ef9b0 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -57,7 +57,7 @@ if conf.has('WITH_CH') =20 virt_daemon_units +=3D { 'service': 'virtchd', - 'name': 'Libvirt ch', + 'name': 'Cloud Hypervisor', 'service_extra_in': files('virtchd.service.extra.in'), } =20 diff --git a/src/interface/meson.build b/src/interface/meson.build index 54c0b1a935..b1617d83e6 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -44,7 +44,7 @@ if conf.has('WITH_INTERFACE') =20 virt_daemon_units +=3D { 'service': 'virtinterfaced', - 'name': 'Libvirt interface', + 'name': 'interface', } =20 openrc_init_files +=3D { diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 171d6ca005..8e6f455139 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -66,7 +66,7 @@ if conf.has('WITH_LIBXL') =20 virt_daemon_units +=3D { 'service': 'virtxend', - 'name': 'Libvirt libxl', + 'name': 'Xen', 'service_extra_in': files('virtxend.service.extra.in'), 'socket_extra_in': files('virtxend.socket.extra.in'), } diff --git a/src/locking/meson.build b/src/locking/meson.build index 2ccc822ed3..6b3cd781d1 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -144,7 +144,7 @@ if conf.has('WITH_LIBVIRTD') virt_daemon_units +=3D { 'service': 'virtlockd', 'service_in': files('virtlockd.service.in'), - 'name': 'Libvirt locking', + 'name': 'locking', 'sockets': [ 'main', 'admin' ], 'socket_in': files('virtlockd.socket.in'), 'socket_admin_in': files('virtlockd-admin.socket.in'), diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-= admin.socket.in index 0452a0cfdb..ed5b94edba 100644 --- a/src/locking/virtlockd-admin.socket.in +++ b/src/locking/virtlockd-admin.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3DVirtual machine lock manager admin socket +Description=3Dlibvirt locking daemon admin socket BindsTo=3Dvirtlockd.socket After=3Dvirtlockd.socket =20 diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index 20b4b26f35..290a2887a5 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,5 +1,5 @@ [Unit] -Description=3DVirtual machine lock manager +Description=3Dlibvirt locking daemon BindsTo=3Dvirtlockd.socket Wants=3Dvirtlockd-admin.socket After=3Dvirtlockd.socket diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket= .in index 31a576aa16..4eec90a95e 100644 --- a/src/locking/virtlockd.socket.in +++ b/src/locking/virtlockd.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3DVirtual machine lock manager socket +Description=3Dlibvirt locking daemon socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlockd-sock diff --git a/src/logging/meson.build b/src/logging/meson.build index 95d2ef2a3f..1527f91faf 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -91,7 +91,7 @@ if conf.has('WITH_LIBVIRTD') virt_daemon_units +=3D { 'service': 'virtlogd', 'service_in': files('virtlogd.service.in'), - 'name': 'Libvirt logging', + 'name': 'logging', 'sockets': [ 'main', 'admin' ], 'socket_in': files('virtlogd.socket.in'), 'socket_admin_in': files('virtlogd-admin.socket.in'), diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-ad= min.socket.in index ddb9a1393b..7207878008 100644 --- a/src/logging/virtlogd-admin.socket.in +++ b/src/logging/virtlogd-admin.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3DVirtual machine log manager socket +Description=3Dlibvirt logging daemon admin socket BindsTo=3Dvirtlogd.socket After=3Dvirtlogd.socket =20 diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 776d753e9a..4289ef1cb4 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -1,5 +1,5 @@ [Unit] -Description=3DVirtual machine log manager +Description=3Dlibvirt logging daemon BindsTo=3Dvirtlogd.socket Wants=3Dvirtlogd-admin.socket After=3Dvirtlogd.socket diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in index 084cbe179d..e1d6e30e4d 100644 --- a/src/logging/virtlogd.socket.in +++ b/src/logging/virtlogd.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3DVirtual machine log manager socket +Description=3Dlibvirt logging daemon socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlogd-sock diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 84e6c313ea..5eb23fbbbf 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -164,7 +164,7 @@ if conf.has('WITH_LXC') =20 virt_daemon_units +=3D { 'service': 'virtlxcd', - 'name': 'Libvirt lxc', + 'name': 'LXC', 'service_extra_in': files('virtlxcd.service.extra.in'), } =20 diff --git a/src/network/meson.build b/src/network/meson.build index ed7707c714..d0383cca1c 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -62,7 +62,7 @@ if conf.has('WITH_NETWORK') =20 virt_daemon_units +=3D { 'service': 'virtnetworkd', - 'name': 'Libvirt network', + 'name': 'network', 'service_extra_in': files('virtnetworkd.service.extra.in'), } =20 diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 2614ff8b9c..d1e349bc5e 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -52,7 +52,7 @@ if conf.has('WITH_NODE_DEVICES') =20 virt_daemon_units +=3D { 'service': 'virtnodedevd', - 'name': 'Libvirt nodedev', + 'name': 'nodedev', } =20 openrc_init_files +=3D { diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index c091bc3f1b..1b914f2360 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -50,7 +50,7 @@ if conf.has('WITH_NWFILTER') =20 virt_daemon_units +=3D { 'service': 'virtnwfilterd', - 'name': 'Libvirt nwfilter', + 'name': 'nwfilter', } =20 openrc_init_files +=3D { diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 1afc301a6d..64c62e584f 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -183,7 +183,7 @@ if conf.has('WITH_QEMU') =20 virt_daemon_units +=3D { 'service': 'virtqemud', - 'name': 'Libvirt qemu', + 'name': 'QEMU', 'service_extra_in': files('virtqemud.service.extra.in'), } =20 diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index e0bbf9b1ac..37efc11357 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ admin socket +Description=3Dlibvirt legacy monolithic daemon admin socket BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index c8adc8109b..6e1fad2272 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ local read-only socket +Description=3Dlibvirt legacy monolithic daemon read-only socket BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so= cket.in index 8b8fbcd01a..9bdb47285e 100644 --- a/src/remote/libvirtd-tcp.socket.in +++ b/src/remote/libvirtd-tcp.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ non-TLS IP socket +Description=3Dlibvirt legacy monolithic daemon non-TLS IP socket BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so= cket.in index fefda22c6b..3b10c3e4c2 100644 --- a/src/remote/libvirtd-tls.socket.in +++ b/src/remote/libvirtd-tls.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ TLS IP socket +Description=3Dlibvirt legacy monolithic daemon TLS IP socket BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index a2c3c8f8fa..9e303f29c8 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -1,5 +1,5 @@ [Unit] -Description=3DVirtualization daemon +Description=3Dlibvirt legacy monolithic daemon # Use Wants instead of Requires so that users # can disable these three .socket units to revert # to a traditional non-activation deployment setup diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index f483facdf3..9cd37dc766 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ local socket +Description=3Dlibvirt legacy monolithic daemon socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/libvirt-sock diff --git a/src/remote/meson.build b/src/remote/meson.build index 5ee6d4e61c..e14541f09e 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -191,7 +191,7 @@ if conf.has('WITH_REMOTE') virt_daemon_units +=3D { 'service': 'libvirtd', 'service_in': files('libvirtd.service.in'), - 'name': 'Libvirt', + 'name': 'legacy monolithic', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], 'socket_in': files('libvirtd.socket.in'), @@ -224,7 +224,7 @@ if conf.has('WITH_REMOTE') =20 virt_daemon_units +=3D { 'service': 'virtproxyd', - 'name': 'Libvirt proxy', + 'name': 'proxy', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], } diff --git a/src/secret/meson.build b/src/secret/meson.build index e05b46abea..791ce1a024 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -33,7 +33,7 @@ if conf.has('WITH_SECRETS') =20 virt_daemon_units +=3D { 'service': 'virtsecretd', - 'name': 'Libvirt secret', + 'name': 'secret', } =20 openrc_init_files +=3D { diff --git a/src/storage/meson.build b/src/storage/meson.build index fb7feea81d..023353c1d6 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -111,7 +111,7 @@ if conf.has('WITH_STORAGE') =20 virt_daemon_units +=3D { 'service': 'virtstoraged', - 'name': 'Libvirt storage', + 'name': 'storage', 'service_extra_in': files('virtstoraged.service.extra.in'), } =20 diff --git a/src/vbox/meson.build b/src/vbox/meson.build index ee6efbdb42..a72c1833f1 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -57,7 +57,7 @@ if conf.has('WITH_VBOX') =20 virt_daemon_units +=3D { 'service': 'virtvboxd', - 'name': 'Libvirt vbox', + 'name': 'VirtualBox', 'service_extra_in': files('virtvboxd.service.extra.in'), } =20 diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in index 818d4ab84f..63eabd70f8 100644 --- a/src/virtd-admin.socket.in +++ b/src/virtd-admin.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ admin socket +Description=3Dlibvirt @name@ daemon admin socket BindsTo=3D@service@.socket After=3D@service@.socket Conflicts=3Dlibvirtd-admin.socket diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in index 57b313e016..3284af5a4a 100644 --- a/src/virtd-ro.socket.in +++ b/src/virtd-ro.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ local read-only socket +Description=3Dlibvirt @name@ daemon read-only socket BindsTo=3D@service@.socket After=3D@service@.socket Conflicts=3Dlibvirtd-ro.socket diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in index 10480d64e3..f58cb0b358 100644 --- a/src/virtd-tcp.socket.in +++ b/src/virtd-tcp.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ non-TLS IP socket +Description=3Dlibvirt @name@ daemon non-TLS IP socket BindsTo=3D@service@.socket After=3D@service@.socket Conflicts=3Dlibvirtd-tcp.socket diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in index 83a1e343bc..135bf6e137 100644 --- a/src/virtd-tls.socket.in +++ b/src/virtd-tls.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ TLS IP socket +Description=3Dlibvirt @name@ daemon TLS IP socket BindsTo=3D@service@.socket After=3D@service@.socket Conflicts=3Dlibvirtd-tls.socket diff --git a/src/virtd.service.in b/src/virtd.service.in index e1a5814b13..91ac4478bd 100644 --- a/src/virtd.service.in +++ b/src/virtd.service.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ daemon +Description=3Dlibvirt @name@ daemon BindsTo=3D@service@.socket Wants=3D@service@-ro.socket Wants=3D@service@-admin.socket diff --git a/src/virtd.socket.in b/src/virtd.socket.in index 7a8c4bf0c2..502c792e7d 100644 --- a/src/virtd.socket.in +++ b/src/virtd.socket.in @@ -1,5 +1,5 @@ [Unit] -Description=3D@name@ local socket +Description=3Dlibvirt @name@ daemon socket Conflicts=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 diff --git a/src/vz/meson.build b/src/vz/meson.build index 842cdb6136..ce2cbae454 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -48,7 +48,7 @@ if conf.has('WITH_VZ') =20 virt_daemon_units +=3D { 'service': 'virtvzd', - 'name': 'Libvirt vz', + 'name': 'vz', 'service_extra_in': files('virtvzd.service.extra.in'), } =20 --=20 2.41.0 From nobody Sat May 18 03:09:03 2024 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=1695835657; cv=none; d=zohomail.com; s=zohoarc; b=dW7lGmv4ZqmlyfaLZjqYuYXIOfY9RJZQiRqYYCC/eITnu4zKyEQChK6vTUNcqPzaQCXgA6B7ZwnOnm965jRNUGZctz746JWZhxf7uo6/JmXCNDe6lEWcvwD3WpgiExOVrn0PZpgCbXqYB0Hn+amnpIq1ln6USFuYdS1qyer7CZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695835657; 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=TpFRWvdv8BistnQSQEBbpMyd0KK3NTe8Hvvd7pzvNh4=; b=H6wRou1V+B1EiD93HWftHHMXr92jYdU+GuQgNWG8UOVsdn1vNDbSc4h0eoZ/uErHBabOOEYDYzND6oQ0qxgL7sZF14qAvLRxM0Vfp8xKRMSWVEOZohbHxjIZ0aBZzF+8Wsaa0Ah6t0lo4adZlnWJ9l9NzfMvYKpH4KYVRqKuPpo= 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 1695835657183977.2193129807562; Wed, 27 Sep 2023 10:27:37 -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-88-kYg-1GV7PeazVSzDnwknbA-1; Wed, 27 Sep 2023 13:27:33 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 5FCF53C17711; Wed, 27 Sep 2023 17:27:31 +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 4A94214171B6; Wed, 27 Sep 2023 17:27: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 B03111946A42; Wed, 27 Sep 2023 17:26:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C51B519466FA for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 815291054F86; Wed, 27 Sep 2023 16:20:00 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 14DC61054F85 for ; Wed, 27 Sep 2023 16:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695835656; 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=TpFRWvdv8BistnQSQEBbpMyd0KK3NTe8Hvvd7pzvNh4=; b=Ud9JFtA9zbChogwMt5etJR/UYZVmikUPG3I/aBJREjrpmLenFOGyp9g6KaOQXGKST22Ypr MjkottedFAeEFAJenIgYBYZbqnueIvMs2jLkprzjYe9P5Mmcm6RubjvHMEFyYfg8w1N/Ou eX2AR0Lfgk+7b9QG6vxJG9AS40xENgA= X-MC-Unique: kYg-1GV7PeazVSzDnwknbA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 33/33] systemd: Move Documentation lines Date: Wed, 27 Sep 2023 18:19:34 +0200 Message-ID: <20230927161934.181728-34-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695835657425100001 Like the Description, these are intended to be displayed to the user, so it makes sense to have them towards the top of the file before all the information that systemd will parse to calculate dependencies. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd.service.in | 4 ++-- src/logging/virtlogd.service.in | 4 ++-- src/remote/libvirtd.service.in | 4 ++-- src/virtd.service.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index 290a2887a5..ce00b6def9 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,11 +1,11 @@ [Unit] Description=3Dlibvirt locking daemon +Documentation=3Dman:virtlockd(8) +Documentation=3Dhttps://libvirt.org/ BindsTo=3Dvirtlockd.socket Wants=3Dvirtlockd-admin.socket After=3Dvirtlockd.socket After=3Dvirtlockd-admin.socket -Documentation=3Dman:virtlockd(8) -Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 4289ef1cb4..52c9e5bb9e 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -1,11 +1,11 @@ [Unit] Description=3Dlibvirt logging daemon +Documentation=3Dman:virtlogd(8) +Documentation=3Dhttps://libvirt.org/ BindsTo=3Dvirtlogd.socket Wants=3Dvirtlogd-admin.socket After=3Dvirtlogd.socket After=3Dvirtlogd-admin.socket -Documentation=3Dman:virtlogd(8) -Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 9e303f29c8..24a6712b75 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -1,5 +1,7 @@ [Unit] Description=3Dlibvirt legacy monolithic daemon +Documentation=3Dman:libvirtd(8) +Documentation=3Dhttps://libvirt.org/ # Use Wants instead of Requires so that users # can disable these three .socket units to revert # to a traditional non-activation deployment setup @@ -22,8 +24,6 @@ After=3Dremote-fs.target After=3Dsystemd-machined.service After=3Dxencommons.service Conflicts=3Dxendomains.service -Documentation=3Dman:libvirtd(8) -Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify diff --git a/src/virtd.service.in b/src/virtd.service.in index 91ac4478bd..651a8d82d7 100644 --- a/src/virtd.service.in +++ b/src/virtd.service.in @@ -1,5 +1,7 @@ [Unit] Description=3Dlibvirt @name@ daemon +Documentation=3Dman:@service@(8) +Documentation=3Dhttps://libvirt.org/ BindsTo=3D@service@.socket Wants=3D@service@-ro.socket Wants=3D@service@-admin.socket @@ -11,8 +13,6 @@ After=3Dlibvirtd.service After=3Dnetwork.target After=3Ddbus.service After=3Dapparmor.service -Documentation=3Dman:@service@(8) -Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify --=20 2.41.0