From nobody Fri May 17 20:40:53 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=1695668346; cv=none; d=zohomail.com; s=zohoarc; b=JpyQVfUxDkkJV6tZnaO3XBsBtOOy6WfJgNlLj0YJ08I3K+H8f/Dh1Nifw9hvEwMqpxgy6Pr9UovEg7p4M7WekOtZs//p34DLNyOyqtf5WFW19j32ZwD0a5HFFYwu7eNsXlV2ZQ6NdukCwFQCZ7RXl4FckfNWR546Jy8NQAHmK6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668346; 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=XpYQ6nYx+CJjrkYmLt9sAH6pU/V8sIiFlNj+50+Wz/8=; b=Q37R/wKT9YpxmFsLxIph5Jd4dlTpfMDOymxhLSy0LTHJRHSpyN1B0nEiEW76Y1zhEzcqttuBP/iMjaJENBSmuCZVIT/zdDyseMmG4NAxQQcUB23ZWh4kBxxBoSb4yai+9sCQAlzzufvcc3X7VAXMG2EEwNUdHo91V6AInkuf/nE= 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 1695668345999931.0130720917982; Mon, 25 Sep 2023 11:59: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-374-R8N-B9DRO5S6jW0sDgbzzA-1; Mon, 25 Sep 2023 14:59: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 4BFA13C176F2; Mon, 25 Sep 2023 18:58: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 696342026D4B; Mon, 25 Sep 2023 18:58:57 +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 151C4194658F; Mon, 25 Sep 2023 18:58:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 36E66194658C for ; Mon, 25 Sep 2023 18:58:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 254A2711294; Mon, 25 Sep 2023 18:58:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC383711293 for ; Mon, 25 Sep 2023 18:58:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668345; 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=XpYQ6nYx+CJjrkYmLt9sAH6pU/V8sIiFlNj+50+Wz/8=; b=Q7p8PmOvPytfWMEqejiJIv4UfFGU6k11wuBP4+7pZ3AA9Fsu4ZxoGTA588nLMq7lnKGWtR iOTGBj86jvUDZrNI6CO+IEiSCSwBRzwe2XA9xSsbmpl8tzoDcGxsMZbetGeWiiwKtGn2Sl QCvUC+x5ktmL1giyLdfRAXNVZLA4JVw= X-MC-Unique: R8N-B9DRO5S6jW0sDgbzzA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 01/42] systemd: Add missing Also for admin socket Date: Mon, 25 Sep 2023 20:57:59 +0200 Message-ID: <20230925185840.880191-2-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668347495100001 Content-Type: text/plain; charset="utf-8"; x-default="true" When libvirtd, virtlog and virtlockd are enabled, we want their admin sockets to be enabled as well. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd.service.in | 1 + src/logging/virtlogd.service.in | 1 + src/remote/libvirtd.service.in | 1 + 3 files changed, 3 insertions(+) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index dd0bbab083..18873f86a6 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -22,3 +22,4 @@ LimitNOFILE=3D1024:524288 =20 [Install] Also=3Dvirtlockd.socket +Also=3Dvirtlockd-admin.socket diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 8e245ddb43..14a991f348 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -22,3 +22,4 @@ LimitNOFILE=3D1024:524288 =20 [Install] Also=3Dvirtlogd.socket +Also=3Dvirtlogd-admin.socket diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 84f1613adc..8839c00a15 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -50,3 +50,4 @@ Also=3Dvirtlockd.socket Also=3Dvirtlogd.socket Also=3Dlibvirtd.socket Also=3Dlibvirtd-ro.socket +Also=3Dlibvirtd-admin.socket --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668349; cv=none; d=zohomail.com; s=zohoarc; b=I684lO5OI0u1oceR5QmOY2CK+A+4TPcROsmpgztSfLm1OJghKS8Ji7kFpa5/TUZU2OURVCaM4smFsmm54ChfJnrklmgeVjA05RuyYxuJpUJxK27XpSO0uGipg9xPdBk96YyaGT/FB/AmRei5OpqWZ+fy9a51Rvw8tqODJIz2jWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668349; 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=U4DntmQQGKi2WU2FDsHoYi+15TarjniWH6NsyPzZ+BI=; b=c4qrlFdzdziu3e45Fn57tfqht2MQiwu3aXqW55yt2W4iPxS7FZTXqa232jRHGwZvHj1yFv0xSI1THxxj2E3H9oOPOAM1OgUgjSbDvvPtTwjeV6t5FIc9mdQvNg+v+e5xTvWbqpDtT79w/fN9BcE9wmmsyPT5EgeW2JT9i/OOmWw= 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 1695668349925990.1644745872275; Mon, 25 Sep 2023 11:59: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-208-SoFVQYfKO5ymQMPbtTBU9Q-1; Mon, 25 Sep 2023 14:59:05 -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 8E8EE1C06502; Mon, 25 Sep 2023 18:59: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 77A9C2026D4B; Mon, 25 Sep 2023 18:59: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 51AF0194658F; Mon, 25 Sep 2023 18:59:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0F4DC194658C for ; Mon, 25 Sep 2023 18:58:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D62E9711297; Mon, 25 Sep 2023 18:58:58 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 68994711286 for ; Mon, 25 Sep 2023 18:58:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668349; 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=U4DntmQQGKi2WU2FDsHoYi+15TarjniWH6NsyPzZ+BI=; b=Wu7TtNrUSfPfWmOECvElsFEqiDIUUUMLErnT9DlpSZcvHdLnTmKu288mmAUoS6Wka8UbUh WQ4K2VXPb/SohXgzuuX9teOnMMPvWvP89aHj7SJLIsS17DMtfSRqeDzuJYlyXeoMnJqyd+ OqCHjtkh6MAx7X0grgxHQn0Df6y3ANk= X-MC-Unique: SoFVQYfKO5ymQMPbtTBU9Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 02/42] systemd: Add missing WantedBy for virtlogd/virtlockd Date: Mon, 25 Sep 2023 20:58:00 +0200 Message-ID: <20230925185840.880191-3-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668350177100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This annotation being missing resulted in virtlogd and virtlockd being marked as "indirect" services, i.e. services that cannot be started directly but have to be socket activated instead. While this is our preferred configuration, we shouldn't prevent the admin to start them at boot if they want to. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd.service.in | 1 + src/logging/virtlogd.service.in | 1 + 2 files changed, 2 insertions(+) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index 18873f86a6..f12c3040e9 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -21,5 +21,6 @@ OOMScoreAdjust=3D-900 LimitNOFILE=3D1024:524288 =20 [Install] +WantedBy=3Dmulti-user.target Also=3Dvirtlockd.socket Also=3Dvirtlockd-admin.socket diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 14a991f348..e665e8a02e 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -21,5 +21,6 @@ OOMScoreAdjust=3D-900 LimitNOFILE=3D1024:524288 =20 [Install] +WantedBy=3Dmulti-user.target Also=3Dvirtlogd.socket Also=3Dvirtlogd-admin.socket --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668353; cv=none; d=zohomail.com; s=zohoarc; b=gZQ+Fmrzs90XBCpOJPqtIZ/nFtZByd8nVtkon1AmAHNBYK1izslBeGliEIrtD8UIefsFOC8jtj/ofUZdjav07St6dh2pZkM37hv/M5LFFpdPKkD1dPNAyg4fXGPR0oS4NhJbDPjLCWjJ8w2EsKJ2MMHRjg3NSwcjbGi0iGLe0UM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668353; 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=DDLVZXHWr2kG6MqoXYjQ3m2YaFn3ZCOvl+SNf48MN5A=; b=Cab3cHZtxDN6Wf7g8khMkJzzUxvcnOzrSA65lQvoGOaHYbWugfUj3IwXUcoIAaPhwCNLz7rTKyj0p/qWkVpLzHakqkP/iuZVtjKKHv+ppvzlgBtfmjwMFQlznxRkXpvIDvWQ4X+dApSeJz9Bm5DpDm0vzkUn//b9K4ZNv2PutLk= 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 1695668353634507.01122106226944; Mon, 25 Sep 2023 11:59:13 -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-rDzCbWGnOIaF5vZb-1HuBA-1; Mon, 25 Sep 2023 14:59:10 -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 CB1DF185A78E; Mon, 25 Sep 2023 18:59:07 +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 B62AC40C6EA8; Mon, 25 Sep 2023 18:59:07 +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 984C3194658F; Mon, 25 Sep 2023 18:59:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BE839194658C for ; Mon, 25 Sep 2023 18:58:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AC6AA711286; Mon, 25 Sep 2023 18:58:59 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 25482711295 for ; Mon, 25 Sep 2023 18:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668352; 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=DDLVZXHWr2kG6MqoXYjQ3m2YaFn3ZCOvl+SNf48MN5A=; b=BfAOtGFNBgOQ034O6Wcv0HU2U1cawKAaSFOaAEiIxrKy+swt+/BOs64BBpqEFPWGbhUQjb Xm7kFby/w7qo76ZbpeGWL8BGNSlybf5JbjG5TrMqxoo1G5f4HK+4n1Vb/2Hr82cbduGMwS YuU35OesKgSCyQ6xPSHqn+xqjSP65cE= X-MC-Unique: rDzCbWGnOIaF5vZb-1HuBA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 03/42] systemd: Add missing Service for virtlogd/virtlockd Date: Mon, 25 Sep 2023 20:58:01 +0200 Message-ID: <20230925185840.880191-4-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668354247100001 Content-Type: text/plain; charset="utf-8"; x-default="true" While systemd will automatically match foo.socket with foo.service based on their names, it's nicer to connect the two explicitly. This is what we do for all services, with virtlogd and virtlockd being the only exceptions. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd.socket.in | 1 + src/logging/virtlogd.socket.in | 1 + 2 files changed, 2 insertions(+) diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket= .in index 52014f45ec..4ce75391ae 100644 --- a/src/locking/virtlockd.socket.in +++ b/src/locking/virtlockd.socket.in @@ -4,6 +4,7 @@ Before=3Dlibvirtd.service =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlockd-sock +Service=3Dvirtlockd.service SocketMode=3D0600 =20 [Install] diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in index 9749a33197..ff3e66e09b 100644 --- a/src/logging/virtlogd.socket.in +++ b/src/logging/virtlogd.socket.in @@ -4,6 +4,7 @@ Before=3Dlibvirtd.service =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlogd-sock +Service=3Dvirtlogd.service SocketMode=3D0600 =20 [Install] --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668523; cv=none; d=zohomail.com; s=zohoarc; b=QSi3yyx+NUtxKLcoKwu2hg8TLVd+T4yrwRCO2PzjMcMMrFtxA2+PTjxQMw2IG2pqaxdpaRj3IEQQOwVjjwPsIRuQLfv8T5qqDqBIRMuayKm84864oQ5wh9nYgAS17CP8KP/otUbQ/XjsBFcZjyhXhkQZM1eCEPIDH24f+S7LC7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668523; 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=20o4aBI70EwCf2DXOf6GS1CTY86aJBAU2WU3/5+bfAc=; b=arpaJnCsEijMArcLOJLTAAHefzn+0MKl6L0Ae8PURRiRqey44Km7MLO9nTNyem9RZNwKOaTQatLrllPIqwpCo1J3dkHD/bPzDvDL5jbc6xsT2Jmsj5AIZIMy/qIfdds58renvuA/zoMERCYKtAEHV0Swuqg+JYhNR3FRz1MBCbo= 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 1695668523747778.9063003131798; Mon, 25 Sep 2023 12:02:03 -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-622-tpDj-gVRM-em-Zu7XNugEA-1; Mon, 25 Sep 2023 14:59:51 -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 801D08039C1; Mon, 25 Sep 2023 18:59: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 6C52040C2070; Mon, 25 Sep 2023 18:59: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 C39A8194658F; Mon, 25 Sep 2023 18:59:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 81C2A194658F for ; Mon, 25 Sep 2023 18:59:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5A47D711286; Mon, 25 Sep 2023 18:59:00 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E17BD711295 for ; Mon, 25 Sep 2023 18:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668522; 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=20o4aBI70EwCf2DXOf6GS1CTY86aJBAU2WU3/5+bfAc=; b=hXfJfBReCXcUFaBd1/2eaDb//QwR2SmlakizknCesYMbOA656GtMoORIaTUQDeTpB5fOxZ srPXifI1syvQCclibTco9tGPUZLwD2Dldl24VSTuvUWMpDkjIQ3PXt+h6uOZYp3yHSsSrt t0cojGUeo6IkDseVmSGLE3D9iptGI78= X-MC-Unique: tpDj-gVRM-em-Zu7XNugEA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 04/42] systemd: Set Type=notify for virtlogd/virtlockd Date: Mon, 25 Sep 2023 20:58:02 +0200 Message-ID: <20230925185840.880191-5-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695668525476100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This tells systemd that the services in question support the native socket activation protocol. virtlogd and virtlockd, just like all the other daemons, implement the necessary handshake. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd.service.in | 1 + src/logging/virtlogd.service.in | 1 + 2 files changed, 2 insertions(+) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index f12c3040e9..9e91fa3261 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -7,6 +7,7 @@ Documentation=3Dman:virtlockd(8) Documentation=3Dhttps://libvirt.org =20 [Service] +Type=3Dnotify Environment=3DVIRTLOCKD_ARGS=3D EnvironmentFile=3D-@initconfdir@/virtlockd ExecStart=3D@sbindir@/virtlockd $VIRTLOCKD_ARGS diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index e665e8a02e..97c942ffb0 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -7,6 +7,7 @@ Documentation=3Dman:virtlogd(8) Documentation=3Dhttps://libvirt.org =20 [Service] +Type=3Dnotify Environment=3DVIRTLOGD_ARGS=3D EnvironmentFile=3D-@initconfdir@/virtlogd ExecStart=3D@sbindir@/virtlogd $VIRTLOGD_ARGS --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668373; cv=none; d=zohomail.com; s=zohoarc; b=dZp2wdIqkHbO2KfZF0nbsuybgCGh0Ac3czMSMt1oBIRPDEbZ2n2JcHG46O/9bqmmZLMi7o1pHostVESBddKrAl5YE/19S53fV4tBkLcao4NfUO3ErFeBNEQx/6QhF616avI7d0hKU8Wixr/3b9fpHcHs+1NB2ymhTTeg5HpD+Qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668373; 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=6uupwo1bKPPCFpnaOq5cXr6jpoZNBgzKZ2woMKqfdjU=; b=BWThy/ZOhcLxWxNXHoOV2dgBNcU8McD2DnAqZVy5BfrXAoUAbdBC2uE2BIzDjsTIz3Lzyv0fN3G7LcaMQA54Js1z3IuIlLc0q8JeD9n1d8QK+5cH1bZHoUsWYb79XfZD5Eq1mHcyojWRKiAWt0143izD5jcsIm8RUJJ2a1QwzjU= 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 1695668373378706.825074332434; Mon, 25 Sep 2023 11:59:33 -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-213-qTLxB9kBPlWu5OcmzaVgDg-1; Mon, 25 Sep 2023 14:59:21 -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 A496929ABA2A; Mon, 25 Sep 2023 18:59:18 +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 8E01151E3; Mon, 25 Sep 2023 18:59:18 +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 86D331946A4F; Mon, 25 Sep 2023 18:59:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 378A2194658C for ; Mon, 25 Sep 2023 18:59:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1925A711294; Mon, 25 Sep 2023 18:59:01 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F3F1711295 for ; Mon, 25 Sep 2023 18:59:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668372; 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=6uupwo1bKPPCFpnaOq5cXr6jpoZNBgzKZ2woMKqfdjU=; b=b6slWX9A4l1wAE8vu88I6dWgTqznRnKfAcj4HHTmFHklLRzWKfkChKwaos8whytzN6n3FQ UQegUbRi6XGzX7q9OT/4HC+CAs+IrAqGjiZ2BAuyyYj2Wdngqd/7IzRtoKZ2tUAujtzeGU Al9buem09GU3ZGjKHDu2r84U31O3nwY= X-MC-Unique: qTLxB9kBPlWu5OcmzaVgDg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 05/42] systemd: Set @name@ for virtlogd/virtlockd Date: Mon, 25 Sep 2023 20:58:03 +0200 Message-ID: <20230925185840.880191-6-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668374796100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The information is not used anywhere right now, but the documentation for virt_daemon_units claims it's mandatory. More importantly, we're going to start actually using it later on. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/meson.build | 2 +- src/logging/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/meson.build b/src/locking/meson.build index 57764b0da6..b7ba342171 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': '', + 'name': 'Libvirt locking', 'sockprefix': '', 'sockets': [ 'main', 'admin' ], 'socket_in': files('virtlockd.socket.in'), diff --git a/src/logging/meson.build b/src/logging/meson.build index fa6af50fa6..aa8affb52c 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': '', + 'name': 'Libvirt logging', 'sockprefix': '', 'sockets': [ 'main', 'admin' ], 'socket_in': files('virtlogd.socket.in'), --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668354; cv=none; d=zohomail.com; s=zohoarc; b=KZ5a5t5ri3Qf86E+nLptUYMo6iHH5td6CeBZg4vcM/V6wYMEUc/TYJGki8DSJoYQRp7jVXSkcw67gzFJMAOljwtx2fGNhMOBgiJ1oT7OyoFznmwv0H3Na+m3Nbf0ukLgs5mCi2FgjFWhNqxKcwQWU6AIRnRguEwORR61UpxPtTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668354; 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=YJaQErf067KPnM5vf6If8yIYmydp9bTKdiuw1E+iQrU=; b=mrbbK9G2agFStJk38rQ8ugG2IROTpMD4BphNWeogSHVRMm10WNSRrCZyv9Rcp+erbBaCnr/vbsviJL6iqS0Y8EobZKcae9jpEn37T/SiotUXNMl7BCzJNmaSPYQQRdzFAMFm/lk5B7yeI8xbtkd9f3ZmcMmT5BFq885W5XrNO0s= 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 1695668354251928.8139707574081; Mon, 25 Sep 2023 11:59:14 -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-594-SNfomfv7NOyWGw2Kx2ItiA-1; Mon, 25 Sep 2023 14:59:10 -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 6A3EA805B36; Mon, 25 Sep 2023 18:59:08 +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 5342049BB9A; Mon, 25 Sep 2023 18:59:08 +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 D2D4919466EE; Mon, 25 Sep 2023 18:59:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 029F5194658C for ; Mon, 25 Sep 2023 18:59:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CA9DA711296; Mon, 25 Sep 2023 18:59:01 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DA2A711294 for ; Mon, 25 Sep 2023 18:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668353; 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=YJaQErf067KPnM5vf6If8yIYmydp9bTKdiuw1E+iQrU=; b=Il0ntNETyl1p+W15Ar0qyUkSvCewc95Oy9/Va8vaCROx+VWYh30wC1jyOo8O8O9NQn9ZrO P5Dyyq1m/u2JJn99bQx4qG81/AlRBH9510xOlTj4lUy6zyeS5/X3kmaTDNIJS+oKdLnS+k jQ8Civ6+AlaJmXED2eehuRqh8bsj6u4= X-MC-Unique: SNfomfv7NOyWGw2Kx2ItiA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 06/42] systemd: Rename socket_in_def -> socket_in_default Date: Mon, 25 Sep 2023 20:58:04 +0200 Message-ID: <20230925185840.880191-7-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668354539100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The meaning of the _def suffix might not be immediately obvious, especially since it's also used to refer to the output of the meson-gen-def.py script elsewhere in the same file. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index 28e4d0cc4e..7b6ce6d32f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -826,12 +826,12 @@ if conf.has('WITH_LIBVIRTD') =20 foreach socket : unit.get('sockets', [ 'main', 'ro', 'admin' ]) if socket =3D=3D 'main' - socket_in_def =3D 'remote' / 'libvirtd.socket.in' - socket_in =3D unit.get('socket_in', socket_in_def) + socket_in_default =3D 'remote' / 'libvirtd.socket.in' + socket_in =3D unit.get('socket_in', socket_in_default) socket_out =3D '@0@.socket'.format(unit['service']) else - socket_in_def =3D 'remote' / 'libvirtd-@0@.socket.in'.format(soc= ket) - socket_in =3D unit.get('socket_@0@_in'.format(socket), socket_in= _def) + socket_in_default =3D 'remote' / 'libvirtd-@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 configure_file( --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668357; cv=none; d=zohomail.com; s=zohoarc; b=RNdxAYGE5i9rqT7GSaiIR51FvS7gIsGxHUUNo0ExHy6sRm131ZzfRIUOhPGpTkeuugWC1sOADnnT/bMZSOJTOZaCRM3meKAmNAhwL1GaJ7AKYzhPF0UXfMeS5QXqHsdnPnrkg0/HRkMtj1JByQG9dOerRm/imfUhx5sTAFFPt3k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668357; 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=C6kT67CFlFGxrnurTd7sr78zPmaph1m49YPbLBaHyj8=; b=T4O9QL72hjJwmAcQKBqJCB1rJv04JchYcorrFeIVLQBcdIkkupEIRHLKPxssf12VdwibmEFZWfrSOzR6p1nxO2aO0Gcqv1TIBzMl6/25nxkMSCVSyUgFiWYNi5VSSGwFaub6fFgyc1WhoiPMYDSqvtVbZ5Ja3zpU3qlm5uXObfU= 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 1695668357920975.2366754501186; Mon, 25 Sep 2023 11:59:17 -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-uQBydSutNVezsUlyj6ZCxw-1; Mon, 25 Sep 2023 14:59:12 -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 ABDB129AB45F; Mon, 25 Sep 2023 18:59:08 +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 934DA711294; Mon, 25 Sep 2023 18:59:08 +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 16CC419466FF; Mon, 25 Sep 2023 18:59:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8AA3919466EC for ; Mon, 25 Sep 2023 18:59:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 86985711296; Mon, 25 Sep 2023 18:59:02 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A0B5711295 for ; Mon, 25 Sep 2023 18:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668357; 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=C6kT67CFlFGxrnurTd7sr78zPmaph1m49YPbLBaHyj8=; b=ciJGdvxp6opTUxyu0UdWM9sUOv7/3PkGrHXi80/S9PkXzzGM03wuusgC1q4x/dalXxD5EN DssiZKvZyocsBIGHVjrHtDyfUl6JoNb2WYhybpgp3EZvjV4LDy5DWfT+E5qxp7LHgF4EYC JKq/T+h+a2oJoL2ObN7jafbapsgGRdM= X-MC-Unique: uQBydSutNVezsUlyj6ZCxw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 07/42] systemd: Rename @mode@ -> @sockmode@ Date: Mon, 25 Sep 2023 20:58:05 +0200 Message-ID: <20230925185840.880191-8-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668359629100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 6 +++--- src/remote/libvirtd.socket.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index 7b6ce6d32f..3fae80d67c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -799,9 +799,9 @@ if conf.has('WITH_LIBVIRTD') =20 foreach unit : virt_daemon_units if conf.has('WITH_POLKIT') - mode =3D '0666' + sockmode =3D '0666' else - mode =3D '0600' + sockmode =3D '0600' endif =20 unit_conf =3D configuration_data({ @@ -813,7 +813,7 @@ if conf.has('WITH_LIBVIRTD') 'service': unit['service'], 'sockprefix': unit['sockprefix'], 'deps': unit.get('deps', ''), - 'mode': mode, + 'sockmode': sockmode, }) =20 configure_file( diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index 4842712648..e6e903a8ce 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -6,7 +6,7 @@ Before=3D@service@.service [Socket] ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock Service=3D@service@.service -SocketMode=3D@mode@ +SocketMode=3D@sockmode@ RemoveOnStop=3Dyes =20 [Install] --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668416; cv=none; d=zohomail.com; s=zohoarc; b=nCvBypABZiDLWe81x5uJfvdxyc0b9SygdkGJQAdSmeNl99TXGvFxTxdSuVXB1705AG0bEtANiKboaVgqq495T3/PRpDN7F4A8WRdEx6ql0GR9HtuinbvzA8q6AxfaNp6iAEVlKVV9vFCQr3rWT4GOP5AaWYvV8LX2VoD9NxDfEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668416; 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=0EOmR0SCXpXGHX2gsX4veXqJtC6aE/S9MOtUxSNDxvY=; b=O4zDCEdHGj2/NcnFzre9Y2EYXncShGs4J0iLe8Svn/Vi2x+neoCUvGPxnwKgrUuwk436I/JIFuZr2+a1ijaZbWJPDZQTQ1QRKlWimz5ISmGAeU5WYjYtv/iFcsM7uRyzHkbi1l0Bexsz9PC2gqtSsPNKL9/vl+75kkQy79vfgyc= 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 1695668416841130.40508230164562; Mon, 25 Sep 2023 12:00:16 -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-437-vZi_FCnWNEiL4e6fV2g7_Q-1; Mon, 25 Sep 2023 14:59:14 -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 8A3F9802D35; Mon, 25 Sep 2023 18:59:11 +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 7341449BB9A; Mon, 25 Sep 2023 18:59:11 +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 5594919465A3; Mon, 25 Sep 2023 18:59:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 46769194658F for ; Mon, 25 Sep 2023 18:59:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 421C0711293; Mon, 25 Sep 2023 18:59:03 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA15A711295 for ; Mon, 25 Sep 2023 18:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668415; 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=0EOmR0SCXpXGHX2gsX4veXqJtC6aE/S9MOtUxSNDxvY=; b=PDrZbos8bPB0cygEPdJnKb755clncjTryVPj657b4tphZs5E/0KovxpGKJP+jg8vmqyu5N F9kzvCKSpWSr5vNhWT16IJTXUVVueQRgfX57ym0Uaq/mMrp04fFP+S2/HvTZtRNmYUz6tG 8y8ZHOXNqqF8Uybo3YhDrjBBLJYWS+c= X-MC-Unique: vZi_FCnWNEiL4e6fV2g7_Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 08/42] systemd: Only set @sockmode@ once Date: Mon, 25 Sep 2023 20:58:06 +0200 Message-ID: <20230925185840.880191-9-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668418749100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The decision is based only on whether Polkit support is enabled, so there's no need to go through it again for every single service. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/meson.build b/src/meson.build index 3fae80d67c..9d5085a8aa 100644 --- a/src/meson.build +++ b/src/meson.build @@ -797,13 +797,13 @@ if conf.has('WITH_LIBVIRTD') install_dir: systemd_unit_dir, ) =20 - foreach unit : virt_daemon_units - if conf.has('WITH_POLKIT') - sockmode =3D '0666' - else - sockmode =3D '0600' - endif + if conf.has('WITH_POLKIT') + sockmode =3D '0666' + else + sockmode =3D '0600' + endif =20 + foreach unit : virt_daemon_units unit_conf =3D configuration_data({ 'runstatedir': runstatedir, 'sbindir': sbindir, --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668379; cv=none; d=zohomail.com; s=zohoarc; b=BUVl8LqHSqjnuh6ecPHoJfM3MRCZYeJs7VVvEhr5KNJlNfVW138Ss5tXUIPo58E4BK35h9JyHLwuZknbbU5+sOBxgFak2KIV3BNcG0NNL9r+Z0rttK0RTyLIu5X4vWqj/BuYYGBgpQC2RQ6tsG3bni/ktaO8ZQmi4pU5Hi8fels= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668379; 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=3tSigzch18WMto76XCrAYKH5f2p2Wj48yRBqVbEQL80=; b=iV/S3kfWpErXsqaFJ2d5/7mgZDV0eRDr3TArDdbTghU1MkGJ9i3FiseP6QfREKa8Nj3h/crRn16xuRDHQV27NqrnqhSE+sM/WQ6VZjoa/F9Iub+R2ibMmxfXN5/nZx0AE4L+5r/5zDNGwFqcQWWjuND75N5Ub+MOSyzctVTGdFo= 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 1695668379289108.13928666940456; Mon, 25 Sep 2023 11:59: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-549-N0aSLhV6OHSI0hz_1fHjew-1; Mon, 25 Sep 2023 14:59:33 -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 4E5EF29ABA1C; Mon, 25 Sep 2023 18:59:24 +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 3A4F1711294; Mon, 25 Sep 2023 18:59:24 +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 0942619465B6; Mon, 25 Sep 2023 18:59:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0C97419466FD for ; Mon, 25 Sep 2023 18:59:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F2F9C711293; Mon, 25 Sep 2023 18:59:07 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 866CF711297 for ; Mon, 25 Sep 2023 18:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668378; 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=3tSigzch18WMto76XCrAYKH5f2p2Wj48yRBqVbEQL80=; b=h5pn4VQqkoLoSA9mw8lRwrpS6pSAsMdTEinKj72Fwd5pcf6NHwqT9wVgpghQRRBPYf1K4M CHm3ni1hcwkFtBJLODsSjRiAKJmumN/pzWxSgnxNrEGQWBLjjoY9DGI5jM9s/UFzFAeSUa 4K/23v9nVkgfg9Fb/DUBYIhj4PmUXKA= X-MC-Unique: N0aSLhV6OHSI0hz_1fHjew-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 09/42] systemd: Drop unnecessary uses of @sockets@ Date: Mon, 25 Sep 2023 20:58:07 +0200 Message-ID: <20230925185840.880191-10-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668381074100003 Content-Type: text/plain; charset="utf-8"; x-default="true" For most services, the value provided explicitly matches the documented default. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/ch/meson.build | 1 - src/interface/meson.build | 1 - src/libxl/meson.build | 1 - src/lxc/meson.build | 1 - src/network/meson.build | 1 - src/node_device/meson.build | 1 - src/nwfilter/meson.build | 1 - src/qemu/meson.build | 1 - src/secret/meson.build | 1 - src/storage/meson.build | 1 - src/vbox/meson.build | 1 - src/vz/meson.build | 1 - 12 files changed, 12 deletions(-) diff --git a/src/ch/meson.build b/src/ch/meson.build index 66b77907b0..5d1c3f6ca0 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -60,7 +60,6 @@ if conf.has('WITH_CH') 'service_in': files('virtchd.service.in'), 'name': 'Libvirt ch', 'sockprefix': 'virtchd', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 virt_install_dirs +=3D [ diff --git a/src/interface/meson.build b/src/interface/meson.build index 828f274422..3df9bbc9a4 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -47,7 +47,6 @@ if conf.has('WITH_INTERFACE') 'service_in': files('virtinterfaced.service.in'), 'name': 'Libvirt interface', 'sockprefix': 'virtinterfaced', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 0cc277db82..967b6b587c 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -69,7 +69,6 @@ if conf.has('WITH_LIBXL') 'service_in': files('virtxend.service.in'), 'name': 'Libvirt libxl', 'sockprefix': 'virtxend', - 'sockets': [ 'main', 'ro', 'admin' ], 'deps': 'ConditionPathExists=3D/proc/xen/capabilities', } =20 diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 99d4a34213..49cc5e6b26 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -167,7 +167,6 @@ if conf.has('WITH_LXC') 'service_in': files('virtlxcd.service.in'), 'name': 'Libvirt lxc', 'sockprefix': 'virtlxcd', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { diff --git a/src/network/meson.build b/src/network/meson.build index 0888d1beac..121172cafe 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -65,7 +65,6 @@ if conf.has('WITH_NETWORK') 'service_in': files('virtnetworkd.service.in'), 'name': 'Libvirt network', 'sockprefix': 'virtnetworkd', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 1c95975c37..2610822d28 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -55,7 +55,6 @@ if conf.has('WITH_NODE_DEVICES') 'service_in': files('virtnodedevd.service.in'), 'name': 'Libvirt nodedev', 'sockprefix': 'virtnodedevd', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 55cf8fcce4..bb03a47f8f 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -53,7 +53,6 @@ if conf.has('WITH_NWFILTER') 'service_in': files('virtnwfilterd.service.in'), 'name': 'Libvirt nwfilter', 'sockprefix': 'virtnwfilterd', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 607b597c8c..2d55cd30cb 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -186,7 +186,6 @@ if conf.has('WITH_QEMU') 'service_in': files('virtqemud.service.in'), 'name': 'Libvirt qemu', 'sockprefix': 'virtqemud', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { diff --git a/src/secret/meson.build b/src/secret/meson.build index 1bda59849b..882ed2ac70 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -36,7 +36,6 @@ if conf.has('WITH_SECRETS') 'service_in': files('virtsecretd.service.in'), 'name': 'Libvirt secret', 'sockprefix': 'virtsecretd', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { diff --git a/src/storage/meson.build b/src/storage/meson.build index a8b173db96..49fd4072d5 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -114,7 +114,6 @@ if conf.has('WITH_STORAGE') 'service_in': files('virtstoraged.service.in'), 'name': 'Libvirt storage', 'sockprefix': 'virtstoraged', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 1b0dad3336..f19d375c4b 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -60,7 +60,6 @@ if conf.has('WITH_VBOX') 'service_in': files('virtvboxd.service.in'), 'name': 'Libvirt vbox', 'sockprefix': 'virtvboxd', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { diff --git a/src/vz/meson.build b/src/vz/meson.build index d102696943..db3d8bb203 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -51,7 +51,6 @@ if conf.has('WITH_VZ') 'service_in': files('virtvzd.service.in'), 'name': 'Libvirt vz', 'sockprefix': 'virtvzd', - 'sockets': [ 'main', 'ro', 'admin' ], } =20 openrc_init_files +=3D { --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668366; cv=none; d=zohomail.com; s=zohoarc; b=itqJw/BwKBQZv0WI5uxPy5RYqUOBRSjGIfkWzhJugXB7U+AP/VojP5oQdbgoDlHag74kfEwZGwQwQDTY8TsKywNUyieVCpph87MRLzXgnWXqx8a0fcu+Ks8dvkpp7dwNtmQ9ns7VHg5ySOUj7C1XZawGxOA0suEW8mbZBfDrzAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668366; 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=NyNgs4f+g2rL/mNlKWOimaVYlMT9jTMD4yXjHEv+xSw=; b=SW2Uq8PPEtjeRZjntRGRBf0mm6iy81XXPhxXWTvJFzmlvqhDrS5vOZjGYD+nzA/fDcqEuAHUp6NNhmPONLvTc9dvn8L4uBFTV1qQwFHiExf9QRQP14rlqBU/G/iox67/x79yO0y3H5r1bWaXaOYAt+sWzCgi8vxM54OpGQoyqEs= 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 1695668366622847.7835220596003; Mon, 25 Sep 2023 11:59:26 -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-135-EdnHqo-aPsW7w-L77LMkqg-1; Mon, 25 Sep 2023 14:59:21 -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 4690A1019DE4; Mon, 25 Sep 2023 18:59:18 +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 3219340C200E; Mon, 25 Sep 2023 18:59:18 +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 46A5B19466FD; Mon, 25 Sep 2023 18:59:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C435B19465B5 for ; Mon, 25 Sep 2023 18:59:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AE3C9711286; Mon, 25 Sep 2023 18:59:08 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42045711296 for ; Mon, 25 Sep 2023 18:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668365; 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=NyNgs4f+g2rL/mNlKWOimaVYlMT9jTMD4yXjHEv+xSw=; b=C7x5KJRZWahPG2SLF6DTSzcIYUEPDplRsAIOsG6NJMKeeMrOexBi09yeWC2I8OqJtkUt5i 7Ai6sCHnHrUuURbQR799oG2XrgRpX1scGILXYiimVYDQedzDzOKd4KsHMvKwz6IE13B+Te 8cXV3IJCQSTYfGdBWza54caq5dvQg3U= X-MC-Unique: EdnHqo-aPsW7w-L77LMkqg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 10/42] systemd: Make @sockprefix@ optional Date: Mon, 25 Sep 2023 20:58:08 +0200 Message-ID: <20230925185840.880191-11-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695668368260100003 Content-Type: text/plain; charset="utf-8"; x-default="true" For most services, the socket paths can be derived trivially from the name of the daemon: for virtqemud, for example, they will be /run/libvirt/virtqemud-sock /run/libvirt/virtqemud-sock-ro /run/libvirt/virtqemud-admin-sock libvirtd and virtproxyd are the exceptions, since their socket paths will be /run/libvirt/libvirt-sock /run/libvirt/libvirt-sock-ro /run/libvirt/libvirt-admin-sock So we still need to be able to provide a custom @sockprefix@ in those cases, but in the most common scenario we can do away with the requirement by introducing a sensible default. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build index 9d5085a8aa..6c85cc9b9b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -196,7 +196,7 @@ guest_unit_files =3D [] # * service - name of the service (required) # * service_in - service source file (required) # * name - socket description (required) -# * sockprefix - socket prefix name (required) +# * sockprefix - socket prefix name (optional, default unit['service']) # * sockets - array of additional sockets (optional, default [ 'main', '= ro', 'admin' ]) # * socket_$name_in - additional socket source files (optional, default = remote/libvirtd.socket.in ) # * deps - socket dependencies (optional, default '') @@ -811,7 +811,7 @@ if conf.has('WITH_LIBVIRTD') 'initconfdir': initconfdir, 'name': unit['name'], 'service': unit['service'], - 'sockprefix': unit['sockprefix'], + 'sockprefix': unit.get('sockprefix', unit['service']), 'deps': unit.get('deps', ''), 'sockmode': sockmode, }) --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668523; cv=none; d=zohomail.com; s=zohoarc; b=eOJ1JJlCsRw2Rlx6DwFPpC5uyJXRF/v1lv3anktp8kcIouTtoLMYgTcUrdKamphHVndAe+5Fea/BlPlXM2UQlc3P1T/MpivZLsxA2ltld2ArnvwnATUncb4SdJzk5k+Ull2tQgQMSG2BEPoXdftUwuBnul/4fjuf7X63vTcTE6s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668523; 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=MesLiPgmJT17Iju9ZRxhkxTwCtbZY71LqeSYKlh2EnE=; b=DzZEfikVr6cbP0rLsvZ/30E/AUpUXVX5pnao5coPzUWju5R+nB1NJH+OBW572LWC8Em//F9KPJ+E9dn4gbfO/v4Fabr3l88rpfr3mZoaYeRzrFyQj/mg/CKQcUpiaIlrBluu6Xo8nbE1Ewz4FEaIlatVfpsXNVuuMoUyryo7qb0= 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 1695668523244141.73036625745124; Mon, 25 Sep 2023 12:02:03 -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-227-d95cYW1oP-ql2pI0oZLj-g-1; Mon, 25 Sep 2023 14:59:47 -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 10632805B29; Mon, 25 Sep 2023 18:59: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 F0E421054FC1; Mon, 25 Sep 2023 18:59: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 0BE7A1946A46; Mon, 25 Sep 2023 18:59:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7CA4C194658C for ; Mon, 25 Sep 2023 18:59:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6B6AA711296; Mon, 25 Sep 2023 18:59:09 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F300E711293 for ; Mon, 25 Sep 2023 18:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668522; 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=MesLiPgmJT17Iju9ZRxhkxTwCtbZY71LqeSYKlh2EnE=; b=Z6LmwefGdhWkY9zMWVANyRCNRUGT32iSqNlwjoTdXdmCD2bDnoDc2H6jxGz5reD20eE3FF NzSE9Jud7H2lBqJ6lpY3/8icwNGF/sFH/prqRguWVrFpKE+lq5Um1QpSmzlxgmtB1su8/t 4TkaytpDzyp1CY3dJ382m56n+oninMA= X-MC-Unique: d95cYW1oP-ql2pI0oZLj-g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 11/42] systemd: Drop unnecessary uses of @sockprefix@ Date: Mon, 25 Sep 2023 20:58:09 +0200 Message-ID: <20230925185840.880191-12-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668525510100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that providing the value is optional, we can remove almost all uses. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/ch/meson.build | 1 - src/interface/meson.build | 1 - src/libxl/meson.build | 1 - src/locking/meson.build | 1 - src/logging/meson.build | 1 - src/lxc/meson.build | 1 - src/network/meson.build | 1 - src/node_device/meson.build | 1 - src/nwfilter/meson.build | 1 - src/qemu/meson.build | 1 - src/secret/meson.build | 1 - src/storage/meson.build | 1 - src/vbox/meson.build | 1 - src/vz/meson.build | 1 - 14 files changed, 14 deletions(-) diff --git a/src/ch/meson.build b/src/ch/meson.build index 5d1c3f6ca0..936b9bc95a 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -59,7 +59,6 @@ if conf.has('WITH_CH') 'service': 'virtchd', 'service_in': files('virtchd.service.in'), 'name': 'Libvirt ch', - 'sockprefix': 'virtchd', } =20 virt_install_dirs +=3D [ diff --git a/src/interface/meson.build b/src/interface/meson.build index 3df9bbc9a4..06c5241fa3 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -46,7 +46,6 @@ if conf.has('WITH_INTERFACE') 'service': 'virtinterfaced', 'service_in': files('virtinterfaced.service.in'), 'name': 'Libvirt interface', - 'sockprefix': 'virtinterfaced', } =20 openrc_init_files +=3D { diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 967b6b587c..db8ccde38e 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -68,7 +68,6 @@ if conf.has('WITH_LIBXL') 'service': 'virtxend', 'service_in': files('virtxend.service.in'), 'name': 'Libvirt libxl', - 'sockprefix': 'virtxend', 'deps': 'ConditionPathExists=3D/proc/xen/capabilities', } =20 diff --git a/src/locking/meson.build b/src/locking/meson.build index b7ba342171..2ccc822ed3 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -145,7 +145,6 @@ if conf.has('WITH_LIBVIRTD') 'service': 'virtlockd', 'service_in': files('virtlockd.service.in'), 'name': 'Libvirt locking', - 'sockprefix': '', 'sockets': [ 'main', 'admin' ], 'socket_in': files('virtlockd.socket.in'), 'socket_admin_in': files('virtlockd-admin.socket.in'), diff --git a/src/logging/meson.build b/src/logging/meson.build index aa8affb52c..95d2ef2a3f 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -92,7 +92,6 @@ if conf.has('WITH_LIBVIRTD') 'service': 'virtlogd', 'service_in': files('virtlogd.service.in'), 'name': 'Libvirt logging', - 'sockprefix': '', 'sockets': [ 'main', 'admin' ], 'socket_in': files('virtlogd.socket.in'), 'socket_admin_in': files('virtlogd-admin.socket.in'), diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 49cc5e6b26..a8773f64a5 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -166,7 +166,6 @@ if conf.has('WITH_LXC') 'service': 'virtlxcd', 'service_in': files('virtlxcd.service.in'), 'name': 'Libvirt lxc', - 'sockprefix': 'virtlxcd', } =20 openrc_init_files +=3D { diff --git a/src/network/meson.build b/src/network/meson.build index 121172cafe..40abfaef7e 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -64,7 +64,6 @@ if conf.has('WITH_NETWORK') 'service': 'virtnetworkd', 'service_in': files('virtnetworkd.service.in'), 'name': 'Libvirt network', - 'sockprefix': 'virtnetworkd', } =20 openrc_init_files +=3D { diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 2610822d28..47d9f63600 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -54,7 +54,6 @@ if conf.has('WITH_NODE_DEVICES') 'service': 'virtnodedevd', 'service_in': files('virtnodedevd.service.in'), 'name': 'Libvirt nodedev', - 'sockprefix': 'virtnodedevd', } =20 openrc_init_files +=3D { diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index bb03a47f8f..5efdee7189 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -52,7 +52,6 @@ if conf.has('WITH_NWFILTER') 'service': 'virtnwfilterd', 'service_in': files('virtnwfilterd.service.in'), 'name': 'Libvirt nwfilter', - 'sockprefix': 'virtnwfilterd', } =20 openrc_init_files +=3D { diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 2d55cd30cb..afa9139d9a 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -185,7 +185,6 @@ if conf.has('WITH_QEMU') 'service': 'virtqemud', 'service_in': files('virtqemud.service.in'), 'name': 'Libvirt qemu', - 'sockprefix': 'virtqemud', } =20 openrc_init_files +=3D { diff --git a/src/secret/meson.build b/src/secret/meson.build index 882ed2ac70..49f6972f36 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -35,7 +35,6 @@ if conf.has('WITH_SECRETS') 'service': 'virtsecretd', 'service_in': files('virtsecretd.service.in'), 'name': 'Libvirt secret', - 'sockprefix': 'virtsecretd', } =20 openrc_init_files +=3D { diff --git a/src/storage/meson.build b/src/storage/meson.build index 49fd4072d5..d0d0b72228 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -113,7 +113,6 @@ if conf.has('WITH_STORAGE') 'service': 'virtstoraged', 'service_in': files('virtstoraged.service.in'), 'name': 'Libvirt storage', - 'sockprefix': 'virtstoraged', } =20 openrc_init_files +=3D { diff --git a/src/vbox/meson.build b/src/vbox/meson.build index f19d375c4b..9f2fb0f938 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -59,7 +59,6 @@ if conf.has('WITH_VBOX') 'service': 'virtvboxd', 'service_in': files('virtvboxd.service.in'), 'name': 'Libvirt vbox', - 'sockprefix': 'virtvboxd', } =20 openrc_init_files +=3D { diff --git a/src/vz/meson.build b/src/vz/meson.build index db3d8bb203..4c8747e3eb 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -50,7 +50,6 @@ if conf.has('WITH_VZ') 'service': 'virtvzd', 'service_in': files('virtvzd.service.in'), 'name': 'Libvirt vz', - 'sockprefix': 'virtvzd', } =20 openrc_init_files +=3D { --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668410; cv=none; d=zohomail.com; s=zohoarc; b=n5VSqUAwY4dRpv8FbWVbsGbNnzgtUvie0WfJJvmC3bmH454/rmSykgbOLLXRT34WYiCdtocb6LvTpJZMw1vS3cUl9z/TdyaVlg2gLIRxY/41JDE0BJaioZWEYsXfpwVGYCL0DEFmCyPcBq53FHausvrvpsFku5Zm9kP3sE/rpY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668410; 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=DvOEjmL19y7I385e/NjXbkx0pKsnlHANu9ag6+TgrUY=; b=g1fIYbzlwN1Gxq/x6GOMUOtusXAsncoi+u/BvQbB9h3u0c28sPChsSdY2uJi+eZbUIeijpXalfzWlEQkKTLFwGOrBtGwTUVVGEE+kYSCR9jmnT/yWhKjMQJwxEmzWGbxoqScUttOyEVF8AK0ZfQZCaJIPv8NvHuuJH7hKE5xOgI= 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 169566841044193.96316465809798; Mon, 25 Sep 2023 12:00:10 -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-184-R5rr_vwYNqC03I2ymIZ9LA-1; Mon, 25 Sep 2023 14:59:23 -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 8684929ABA0D; Mon, 25 Sep 2023 18:59: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 70B641054FC1; Mon, 25 Sep 2023 18:59: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 ABCD91946A49; Mon, 25 Sep 2023 18:59:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4AA50194658C for ; Mon, 25 Sep 2023 18:59:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 27A35711293; Mon, 25 Sep 2023 18:59:11 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF457711296 for ; Mon, 25 Sep 2023 18:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668409; 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=DvOEjmL19y7I385e/NjXbkx0pKsnlHANu9ag6+TgrUY=; b=d+xqClCV2DOP8hJz5CWOqcvkqRZzyZVh3n3pTFU8D0PO/9jixER3sdn3SCr7MkQM/sVl/c B0soXqmu7bjO+ckNicsyJFJAbobSkltnzr5/b1zydFiTrgNEkWt0BSYD7/skAmpTXplNTb Ut/XAkwGW0BsbmWdHAVnGiD+PQ0sRW4= X-MC-Unique: R5rr_vwYNqC03I2ymIZ9LA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 12/42] systemd: Make @service_in@ optional Date: Mon, 25 Sep 2023 20:58:10 +0200 Message-ID: <20230925185840.880191-13-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668410961100001 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 6c85cc9b9b..b1dd9e5422 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, @@ -817,7 +819,7 @@ if conf.has('WITH_LIBVIRTD') }) =20 configure_file( - input: unit['service_in'], + input: unit.get('service_in', service_in_default), output: '@0@.service'.format(unit['service']), configuration: unit_conf, install: true, --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668366; cv=none; d=zohomail.com; s=zohoarc; b=A3quXyinjlroX8idQV9LL4ezk19uoGtISEAljA7epQ5j1CoEnOBjNMt6tVILYzrHPc0w75sRHE0zRS3JSNcl45K0IWF8TUsgrtF5A5sGQy4kXeGgvUaM3PkQxirKOncL1ov93HmYc2cpzWuEtK7Ul1/laS5qO5RESDqJjgtxKhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668366; 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=xOnNEzO1Az2ktPC5UMwEFZ4X6qx7YuqYQIAvlyCp6UE=; b=LLBOMFNv4GWyxdmLO//CGfrAdjdsdK5gUlUJIuxsIiH9BD3g1aFP2UmguyraHOIFyaUyXAi5n9RU8kLr0e4SSJNIFv4SNNErZr1EEn1wwjhwWBrGhiXjF3OZtSCx8Qx//4Vn1ehhjCre3hmc3EZbEbnL34GwtXra/pOaP7uMtXg= 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 1695668366846649.3885957708031; Mon, 25 Sep 2023 11:59:26 -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-479-4YRwVc7RM9GIwIS-i_qlMA-1; Mon, 25 Sep 2023 14:59:21 -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 26180858281; Mon, 25 Sep 2023 18:59:18 +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 11C6B100651E; Mon, 25 Sep 2023 18:59:18 +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 C6786194658F; Mon, 25 Sep 2023 18:59:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EE8EF194658C for ; Mon, 25 Sep 2023 18:59:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D97B4711296; Mon, 25 Sep 2023 18:59:11 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6CD4E711294 for ; Mon, 25 Sep 2023 18:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668364; 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=xOnNEzO1Az2ktPC5UMwEFZ4X6qx7YuqYQIAvlyCp6UE=; b=JhEwm59JeOr71BAaoiiGwL/JIHIGHXMU9l8952UiM5d5zxSM4q6KFP/NXzt4mUZC/8Nvgg 3BooxOrFdzsO3CB/u1N9tDShRE4j6gskXjoH3epuPBSpskM+W6i9UBAs3RYj3rnsq3rMn3 i6i8R49KtqxH6BTG/nUf1WY1CUl7SvM= X-MC-Unique: 4YRwVc7RM9GIwIS-i_qlMA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 13/42] systemd: Introduce temporary libvirtd_socket*_in values Date: Mon, 25 Sep 2023 20:58:11 +0200 Message-ID: <20230925185840.880191-14-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668367476100001 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 --- src/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/meson.build b/src/meson.build index b1dd9e5422..fdd15906b9 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 Fri May 17 20:40:53 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=1695668527; cv=none; d=zohomail.com; s=zohoarc; b=nwSHguK2VlgudgabTLk55kUaeTKnV97uZMJfZXqNBWyRYANIo5lTtDWc5/Wkn5HXH8ID0DFmolRD4JKlm9hX/a1QJv7NMwt5bC3xK2bh1GQP846NixNQrPkyrKXJZT9C+ANaQ0BglNr87435L/K5NmLZtxefZQGeXH2Hk4oHukA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668527; 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=lgZMC28NJERFytk6JAueD54WfekZ3d7gr9gFgm6u4CE=; b=WKevYzwahXimKO8d8MC4ABrtjzdtLbk+dxDgBGe8Prb55xRHRQe/mQlyqf0pVMisWl42vRmDUzCos97ngus0gu2mtTgwhFJjUGiNgoluStVk1Jml3EOtHfkNNADqdOadTc3hKRgcTC2SL000SNmdKfrxhQzPiL2uaUcxThu35pc= 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 1695668527159151.4870680699728; Mon, 25 Sep 2023 12:02:07 -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-605-4XW2xaMkOFucXVL3rMzZwg-1; Mon, 25 Sep 2023 14:59:54 -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 2FA491C01E94; Mon, 25 Sep 2023 18:59: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 1831C2156701; Mon, 25 Sep 2023 18:59: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 066A419465A3; Mon, 25 Sep 2023 18:59:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9AA5C194658F for ; Mon, 25 Sep 2023 18:59:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 96A0E711295; Mon, 25 Sep 2023 18:59:12 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2934C711296 for ; Mon, 25 Sep 2023 18:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668526; 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=lgZMC28NJERFytk6JAueD54WfekZ3d7gr9gFgm6u4CE=; b=QkQeHh6F+As9XVCgJKaEHXmkF/PYOzRycwCoPgBplBDOOrA3r0LlLDllhPYa0KYSNX0RGv L3oTnRa+CbrWFLvnc9U/IBANAtMTJ+6obHXcVxmNSvT6XYN3oBC87yOzw2LirdFPQKKqnN WN9YERcdPrEf4mBCsHAtk6b6jDNIJPo= X-MC-Unique: 4XW2xaMkOFucXVL3rMzZwg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 14/42] systemd: Provide all input files explicitly Date: Mon, 25 Sep 2023 20:58:12 +0200 Message-ID: <20230925185840.880191-15-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668527497100008 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 --- 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 eb4f7a0068..365d632095 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -196,6 +196,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 { @@ -225,6 +230,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'), 'deps': 'Conflicts=3D' + libvirtd_socket_conflicts, } =20 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 Fri May 17 20:40:53 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=1695668383; cv=none; d=zohomail.com; s=zohoarc; b=e+KQvJ9CDskpRgWKpy/un8mu3GEqRg/5YbUmwb9QyaxqQUyE9ctrD6N11cHLQ4dDUT5vF7v53Yw50n4ZzD73dlAbU4zDk2vgK+g1V5+507EJxurVsz3ctoTeXI0GSzYPax6h0e6Edd3+6XlkP2UL9peyTcdOqf8MlpLsBS3CccA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668383; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xwNMrGNE/p63WO+mWyMzSVijN1pT91DeSHf+ecP42iI=; b=KCvY4pPkKS3G+t4Vw+NjhYXCfjOINK8DAvg1QAy81OwaCgh2Lkd8abkC0EuPmaxjSNfAF1m0Gu2IGxrAuOD2mtH1XcGwkJFvE0Hw/ID06x10wWIQ/jVeFEv5SoxrqWGn8eYHdKRvaa1VBKhzgGTBikPY85CKh1ajnOIvYhObPP8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1695668383149267.96171534679524; Mon, 25 Sep 2023 11:59:43 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-214-43OamwyiNi-xtV7CE2Ka_Q-1; Mon, 25 Sep 2023 14:59:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06A8A3822557; Mon, 25 Sep 2023 18:59:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E52AD40C2070; Mon, 25 Sep 2023 18:59:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A19421946A4F; Mon, 25 Sep 2023 18:59:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7D4201946A4A for ; Mon, 25 Sep 2023 18:59:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 51D06711294; Mon, 25 Sep 2023 18:59:14 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9CB2711293 for ; Mon, 25 Sep 2023 18:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668382; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xwNMrGNE/p63WO+mWyMzSVijN1pT91DeSHf+ecP42iI=; b=bsZMkW31ZQmHOFgzN9CuzVUYo/P5aXaCHG2+ATZk464MU7wUd5nkLs8hQGsnPqE8HqdWKX IIN2QNo0UriXKPS8inCgpKsm047GtP9QpA8yDRlyiYtSOl5rqA+KQfUVcoYuQDYa4WGbwk fO3bzdqQwNSTx/4fkMWMxvB0Zvr/FVI= X-MC-Unique: 43OamwyiNi-xtV7CE2Ka_Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 15/42] systemd: Introduce common templates Date: Mon, 25 Sep 2023 20:58:13 +0200 Message-ID: <20230925185840.880191-16-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695668384367100002 Content-Type: text/plain; charset="utf-8"; x-default="true" These contain the part that is common to all existing service and socket definitions. Each section of each template ends with a placeholder, which marks the spot where additional, service-specific lines should be injected. Signed-off-by: Andrea Bolognani --- src/meson.build | 10 ++++++++++ src/virtd-admin.socket.in | 16 ++++++++++++++++ src/virtd-ro.socket.in | 16 ++++++++++++++++ src/virtd-tcp.socket.in | 15 +++++++++++++++ src/virtd-tls.socket.in | 15 +++++++++++++++ src/virtd.service.in | 28 ++++++++++++++++++++++++++++ src/virtd.socket.in | 15 +++++++++++++++ 7 files changed, 115 insertions(+) create mode 100644 src/virtd-admin.socket.in create mode 100644 src/virtd-ro.socket.in create mode 100644 src/virtd-tcp.socket.in create mode 100644 src/virtd-tls.socket.in create mode 100644 src/virtd.service.in create mode 100644 src/virtd.socket.in diff --git a/src/meson.build b/src/meson.build index fdd15906b9..d7133d1293 100644 --- a/src/meson.build +++ b/src/meson.build @@ -203,6 +203,8 @@ libvirtd_socket_admin_in =3D files('remote' / 'libvirtd= -admin.socket.in') # * sockets - array of additional sockets (optional, default [ 'main', '= ro', 'admin' ]) # * service_in - service source file (optional, default remote/libvirtd.= service.in) # * socket_$name_in - additional socket source files (optional, default = remote/libvirtd.socket.in ) +# * service_$name_extra - additional lines for service's [$name] section= (optional, default []) +# * socket_$name_extra - additional lines for socket's [$name] section (= optional, default []) # * deps - socket dependencies (optional, default '') virt_daemon_units =3D [] =20 @@ -817,11 +819,19 @@ if conf.has('WITH_LIBVIRTD') 'initconfdir': initconfdir, 'name': unit['name'], 'service': unit['service'], + 'SERVICE': unit['service'].to_upper(), 'sockprefix': unit.get('sockprefix', unit['service']), 'deps': unit.get('deps', ''), 'sockmode': sockmode, }) =20 + foreach extra : [ 'service_unit', 'service_service', 'service_instal= l', + 'socket_unit', 'socket_socket', 'socket_install' ] + extra_key =3D '@0@_extra'.format(extra) + extra_value =3D '\n'.join(unit.get(extra_key, [])) + unit_conf.set(extra_key, extra_value) + endforeach + configure_file( input: unit.get('service_in', service_in_default), output: '@0@.service'.format(unit['service']), diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in new file mode 100644 index 0000000000..3a09951b12 --- /dev/null +++ b/src/virtd-admin.socket.in @@ -0,0 +1,16 @@ +[Unit] +Description=3D@name@ admin socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@socket_unit_extra@ + +[Socket] +ListenStream=3D@runstatedir@/libvirt/@sockprefix@-admin-sock +Service=3D@service@.service +SocketMode=3D0600 +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in new file mode 100644 index 0000000000..e882f25a7b --- /dev/null +++ b/src/virtd-ro.socket.in @@ -0,0 +1,16 @@ +[Unit] +Description=3D@name@ local read-only socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@socket_unit_extra@ + +[Socket] +ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock-ro +Service=3D@service@.service +SocketMode=3D0666 +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in new file mode 100644 index 0000000000..26c6dfa75b --- /dev/null +++ b/src/virtd-tcp.socket.in @@ -0,0 +1,15 @@ +[Unit] +Description=3D@name@ non-TLS IP socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@socket_unit_extra@ + +[Socket] +ListenStream=3D16509 +Service=3D@service@.service +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in new file mode 100644 index 0000000000..077c320cce --- /dev/null +++ b/src/virtd-tls.socket.in @@ -0,0 +1,15 @@ +[Unit] +Description=3D@name@ TLS IP socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@socket_unit_extra@ + +[Socket] +ListenStream=3D16514 +Service=3D@service@.service +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ diff --git a/src/virtd.service.in b/src/virtd.service.in new file mode 100644 index 0000000000..c9afecad73 --- /dev/null +++ b/src/virtd.service.in @@ -0,0 +1,28 @@ +[Unit] +Description=3D@name@ daemon +Conflicts=3Dlibvirtd.service +Requires=3D@service@.socket +Requires=3D@service@-ro.socket +Requires=3D@service@-admin.socket +After=3Dnetwork.target +After=3Ddbus.service +After=3Dapparmor.service +Documentation=3Dman:@service@(8) +Documentation=3Dhttps://libvirt.org +@service_unit_extra@ + +[Service] +Type=3Dnotify +Environment=3D@SERVICE@_ARGS=3D"--timeout 120" +EnvironmentFile=3D-@initconfdir@/@service@ +ExecStart=3D@sbindir@/@service@ $@SERVICE@_ARGS +ExecReload=3D/bin/kill -HUP $MAINPID +Restart=3Don-failure +@service_service_extra@ + +[Install] +WantedBy=3Dmulti-user.target +Also=3D@service@.socket +Also=3D@service@-ro.socket +Also=3D@service@-admin.socket +@service_install_extra@ diff --git a/src/virtd.socket.in b/src/virtd.socket.in new file mode 100644 index 0000000000..278f59ef1c --- /dev/null +++ b/src/virtd.socket.in @@ -0,0 +1,15 @@ +[Unit] +Description=3D@name@ local socket +Before=3D@service@.service +@socket_unit_extra@ + +[Socket] +ListenStream=3D@runstatedir@/libvirt/@sockprefix@-sock +Service=3D@service@.service +SocketMode=3D@sockmode@ +RemoveOnStop=3Dyes +@socket_socket_extra@ + +[Install] +WantedBy=3Dsockets.target +@socket_install_extra@ --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668470; cv=none; d=zohomail.com; s=zohoarc; b=MGMOcbbCxX9IGo6hiTm6cz4K98A9gqGnD+EVGoIPUUGjstXnAInwI9m2fskB0dB0C3Yqq8+4sck8xHl+8DFqD7LMd/D30BtbW7y5IXzfbvyzllVRDFauHI9zSJWMPgXM6VCMF2waBOKOeF4di7DIBqamcYhpZ8duo07nrmZ4Z+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668470; 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=JR+O9/kBlBZpZ2cFG/JjV3a5/RBw1lLNyxBc/Cv+QFU=; b=JzHhkp0BCdJPeujTSKtF/pNo7aLbKT0GoRyXvhkFvB6rbXGuFnfgrYzgrHkwMGVpXhTY0AKesiXJQTAUaK0QCXJe/Jssboofj47jwtcemeScdCVIowAVX82oWkELyfZyTdwlj0BJjHtPJdOIccEQ6zmymcDo75E+BVPEoitEsHE= 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 169566847063447.61072904366483; Mon, 25 Sep 2023 12:01:10 -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-577-yEqv0d3pPXi-vgRiCBGcnA-1; Mon, 25 Sep 2023 14:59:53 -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 E0BD3811E7D; Mon, 25 Sep 2023 18:59:46 +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 C93FD140273E; Mon, 25 Sep 2023 18:59:46 +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 B30BA19465B9; Mon, 25 Sep 2023 18:59:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2B99F19466E8 for ; Mon, 25 Sep 2023 18:59:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0E6E4711293; Mon, 25 Sep 2023 18:59:15 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 95DF6711286 for ; Mon, 25 Sep 2023 18:59:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668469; 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=JR+O9/kBlBZpZ2cFG/JjV3a5/RBw1lLNyxBc/Cv+QFU=; b=hrdRmqK1zG5d//MAL5FLP7OwSXWN1smyksI64jkQll6VBkYOC7I+Uq3f5VYYociuW4Fyek lg8faIBGWJD7lbIhoNSSuHKZpRLXLkTY5Crs3FNgNVLVYWImhFIhsiH4be7XCoDqMjpT0h mnSPQQ8jtYvJtpZjIpACu1qeOlZg9cs= X-MC-Unique: yEqv0d3pPXi-vgRiCBGcnA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 16/42] systemd: Use common templates by default Date: Mon, 25 Sep 2023 20:58:14 +0200 Message-ID: <20230925185840.880191-17-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668471248100001 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 --- src/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/meson.build b/src/meson.build index d7133d1293..b00895fd07 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_$name_extra - additional lines for service's [$name] section= (optional, default []) # * socket_$name_extra - additional lines for socket's [$name] section (= optional, default []) # * deps - socket dependencies (optional, default '') @@ -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({ @@ -842,11 +842,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 Fri May 17 20:40:53 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=1695668397; cv=none; d=zohomail.com; s=zohoarc; b=FUw0twxuRzOyZ31FIuJYtBl7S3zDBzndiNRzsSBtbijS6PbPLodV3Dd8jL7a2djNMdwrFrj16jR/4nF8fPSyE9TTI8/OF5hUcMqTZOzz/uD8h1mpMRkLqGFEy1AOWZU5xWR7I2fzs7FlR5rMGBdeTLmS2FT1IFUdEweuifNQLh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668397; 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=gTk2m656Sri4/h6dg2JSxbJ8aFJX1WA6YJLdDUSRRtIPmOAzSKS0Fbgr5Ov5ABzzsQk+jzigk+0nmsKu8xIjpCRjpm8U70xFdlNPauqBZQ5iiNv7pi8HPU49NHvKWpaUaXFPantH8v6WBZPxMuYUQWshJT8ks8Mv+Fpzt1Ku6AA= 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 1695668397370324.05204753727696; Mon, 25 Sep 2023 11:59:57 -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-421-zCTTbXlyNe2xQaWj_ad0vg-1; Mon, 25 Sep 2023 14:59:53 -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 97BF33802017; Mon, 25 Sep 2023 18:59: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 80078711293; Mon, 25 Sep 2023 18:59: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 57A7E19465A8; Mon, 25 Sep 2023 18:59:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DD6BA19466E8 for ; Mon, 25 Sep 2023 18:59:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BE7AF711294; Mon, 25 Sep 2023 18:59:15 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51C71711286 for ; Mon, 25 Sep 2023 18:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668396; 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=W7ECvfjWI6HVgTu35Fa66y6aoSphJb8c977Ux9EUqAGTOdPRQ27iQyOEqufPYF8d6fKYu7 aLI2ciG9twAlGCFNrUxWjw27eaetQF2m1O0+EGfSxI9AkXhE05UpG79a2aX3cXEABfPFWr 2xekGSpxCNikc9OgHiQygzQ6BQ6qsjQ= X-MC-Unique: zCTTbXlyNe2xQaWj_ad0vg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 17/42] systemd: Switch virtnodedevd to common templates Date: Mon, 25 Sep 2023 20:58:15 +0200 Message-ID: <20230925185840.880191-18-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668398387100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- 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 Fri May 17 20:40:53 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=1695668498; cv=none; d=zohomail.com; s=zohoarc; b=FhN2G7D9ae8zwG+pxk4sHhFy3xEBYbjI9sIyb5QRjmlHJeTbbJ5dbGM2p47riVVr1ihYug1iN0fB6wql1zb2EyvYHLUku3rXlPitjG0QyxH3R5J3Utu2OzggZsCFXufEwcyrr05rXVykzcB5SDzag/MJkPPGDCUOHl5oSskaXzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668498; 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=RpoSz51xQ9CvvxNDhm5NRNKP5WsQGR8dbRCPnOk7hu9O2XVcE+ih8RVE1zb0/86c0d11ha3LVTzSSZjSkRvizcBFRSGz8rUQ1X7LLrp/KmGuna0KZ32eKU4SF9X+hWxvM7c/NZBylKdnQlgJbIFCxW1ks9uSrXQmMy76+2Ef2ME= 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 1695668498150435.1157456127737; Mon, 25 Sep 2023 12:01:38 -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-110-N-Q6ks_mOkez0ryc_ZAj0A-1; Mon, 25 Sep 2023 14:59:28 -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 A4CE2858F19; Mon, 25 Sep 2023 18:59:20 +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 915261054FC1; Mon, 25 Sep 2023 18:59:20 +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 CD58D1946A5E; Mon, 25 Sep 2023 18:59:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CAE7B1946A52 for ; Mon, 25 Sep 2023 18:59:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7A1AA711286; Mon, 25 Sep 2023 18:59:16 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DF0D711294 for ; Mon, 25 Sep 2023 18:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668497; 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=dqCeG1X7V7RazmQ2wESjLr2FvO47XAaA7EWRJED6gvh8se+TbH+pPwiZLZGgJD2yYQOwYX JUpkhwy18WXrgwPsiM08SYdFjKM1nY9kOOepEKjPpDPtP0Gn54MQVxUbutRIS5hsZEKcjP yNCk/YSAgEs/f67nx2H35qqRQoyOSTg= X-MC-Unique: N-Q6ks_mOkez0ryc_ZAj0A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 18/42] systemd: Switch virtinterfaced to common templates Date: Mon, 25 Sep 2023 20:58:16 +0200 Message-ID: <20230925185840.880191-19-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668498943100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- 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 Fri May 17 20:40:53 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=1695668375; cv=none; d=zohomail.com; s=zohoarc; b=BnfRIvq17ZfSdHYFMxvT9zxVRZpKFrZX/cFR6CnhUVNqyupf5GuMuev1KYNcm+y62MHgI3EmAURMsViIq9H8f/pKgqfitWGX2ypMp3SpCHwNBjOXaiMj2B4k07+uJiG2RtqXzJzUgcmyiDcCHJjB7jeGd1wESHP1G1LcDc55th0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668375; 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=csDZM+m9szQAM4mK+Jssh+iEdoOVi3Y4NsHeqoJYhUUuKdWbLe1ReNn6ldb441y4xeDZVRODOeyYsme1xpmqkXa/wenFTb5mQspjin/CnJNdligEAN5C679jKZgJgOiq+Y+PtFqgVsmXjY1yA9jFRQAa9geF6T8C5F6UTXXu43w= 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 1695668375475518.461439556611; Mon, 25 Sep 2023 11:59:35 -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-591-4h8qsPfyNWyYWKHZlI-l1A-1; Mon, 25 Sep 2023 14:59:32 -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 BCD2C18172CB; Mon, 25 Sep 2023 18:59:23 +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 A6B761054FC9; Mon, 25 Sep 2023 18:59:23 +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 1A52519466EB; Mon, 25 Sep 2023 18:59:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 402C3194658F for ; Mon, 25 Sep 2023 18:59:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 35BE5711293; Mon, 25 Sep 2023 18:59:21 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDDCC711286 for ; Mon, 25 Sep 2023 18:59:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668374; 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=O3IhDzDoolE5M6b1yje0u4ircrZV1hMRljp12TSc+y1bByIYSs7zICOAedsvJ3wnqanW3K 4xlQIYRRWlk55DLe1bRAPXHSLJFSnox1DiqOR5UxB7CN/o/BkeJUnouoi1pvEuvHQx2MYY Xafi+DdfgPmNYvkIpfmr0lUw2/8UDFk= X-MC-Unique: 4h8qsPfyNWyYWKHZlI-l1A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 19/42] systemd: Switch virtnwfilterd to common templates Date: Mon, 25 Sep 2023 20:58:17 +0200 Message-ID: <20230925185840.880191-20-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668376286100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- 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 Fri May 17 20:40:53 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=1695668420; cv=none; d=zohomail.com; s=zohoarc; b=Xo5KwFEGncwJuIzkvpXy1MCGFdhCZ3WRLHWLVYe8Ezu1L5vZaF2bhDcoa4m4Q1hJkpi5F7F2+eB9PMMRJmlYZ51IiTIAmpaF06VW6XNJ8CmDVRs2Vl7HJOCznksJUKLn1sh0N/M5li594bjBvHfN71y/y2u+xh8VM6bSkxRDTZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668420; 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=dirD5Ca03sxff9HO7qbqL8GkcZ1cjmLgwDajDo8YOZbZkiX+2H+x1Dr8JltMEY2DWkLWrMFEmeHQNMiwQmZdQYGmEodg0zu9IM8hBedPEpdfDZzPC1qocS59RgXot3uVEkNEhl0gXOWD4XvnzMbNjHTjWmoZGtCw3WOcoJewKQY= 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 1695668420050390.78923712657274; Mon, 25 Sep 2023 12:00:20 -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-682-gSRh1_XsNQePma06BxQqrg-1; Mon, 25 Sep 2023 15:00:15 -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 563781C01518; Mon, 25 Sep 2023 19:00: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 3F86440C200B; Mon, 25 Sep 2023 19:00:01 +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 A1E8619466FE; Mon, 25 Sep 2023 19:00:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 00447194658C for ; Mon, 25 Sep 2023 18:59:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E5A1D711286; Mon, 25 Sep 2023 18:59:21 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 79689711294 for ; Mon, 25 Sep 2023 18:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668419; 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=IhG4GrzvUp3K8mYJyHRWqVNV+kDWfE4s1vtxvMAO1ZyM42Se/RnJjIqnZtkCfm1Fvr00JM 2L7CldWD//I6mizOb0u7/jrVIO+tOeVabBaZLJMER6wn95S8Y6kiZedNCT3v3yGJwVPPA+ qjmXZ6Rst7tQ0UBNBM81C3bxgJuuyw0= X-MC-Unique: gSRh1_XsNQePma06BxQqrg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 20/42] systemd: Switch virtsecretd to common templates Date: Mon, 25 Sep 2023 20:58:18 +0200 Message-ID: <20230925185840.880191-21-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695668422293100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- 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 Fri May 17 20:40:53 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=1695668378; cv=none; d=zohomail.com; s=zohoarc; b=gr4c9uMRiE0AJZsbOkl8sQpUx7L3YcmyZ20+GK1H09qfS0001cdcdovRXBuRVjRu7KagM+l9lSR3dKhhqciIW5mlIjAx8RvIo02G+grRZWt+KZGnZPZtVxwQDFjgUx5wr82ViGodrdTwev29mRqgyv/VenB5TY5HL0RZRwDTJf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668378; 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=5CxeSn2nADJe4guRWjF+u9AjbIIsMXMZSF4xfof7G8g=; b=AjHSj9jfhrJ6MZMnwiYhWarzegxJtg60/l+6D55bQL2RKJ9QVvpVteod4JS9dSKxQ0tCmsbRLVsxQhip8ReUQLyjbXhJZLJJi1ZHqSNyX5QvROKIqNRUO7da9AnGul7y0hwn6XPhllAzmwas5Owehcxg27Gsol/X6lZoOMzgrPo= 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 1695668378674705.2867815840193; Mon, 25 Sep 2023 11:59:38 -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-402-RYdc480fNKuNzdq7T3MmEA-1; Mon, 25 Sep 2023 14:59:33 -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 7C581101B049; Mon, 25 Sep 2023 18:59:27 +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 64D3740C2012; Mon, 25 Sep 2023 18:59:27 +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 82A4719465A8; Mon, 25 Sep 2023 18:59:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BF38C194658C for ; Mon, 25 Sep 2023 18:59:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A23EC711294; Mon, 25 Sep 2023 18:59:23 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36190711286 for ; Mon, 25 Sep 2023 18:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668377; 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=5CxeSn2nADJe4guRWjF+u9AjbIIsMXMZSF4xfof7G8g=; b=CAHar/W0J+uf6+Yg2yTPKaJGvTNgP+p9uAgwbv7aE6+HPu0wlBULvc9NBylwb9iA7KNSnv goeurEXGDFxS6PrLREk1EXWRDFqBSYcQvZm1TCZ/xyn6Q4XF6iFSYRZXwiT9mDRZ5ntooY /c+w0s6R5A2LFCJlIJ5+WBoZHu8IMMo= X-MC-Unique: RYdc480fNKuNzdq7T3MmEA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 21/42] systemd: Switch virtnetworkd to common templates Date: Mon, 25 Sep 2023 20:58:19 +0200 Message-ID: <20230925185840.880191-22-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695668379859100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/network/meson.build | 7 +++---- src/network/virtnetworkd.service.in | 26 -------------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 src/network/virtnetworkd.service.in diff --git a/src/network/meson.build b/src/network/meson.build index 2e51d5d47b..d1a2338d1b 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -62,11 +62,10 @@ 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_service_extra': [ + 'KillMode=3Dprocess', + ], } =20 openrc_init_files +=3D { 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 Fri May 17 20:40:53 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=1695668382; cv=none; d=zohomail.com; s=zohoarc; b=MTbSFaqRh/jLh31IxyYB5Ou7pw+Krinjvvlbvpp7UgxoAEgoQ/ERsvY7UWwHww+XhvqpERYPGc5gzVR9i+ookMi+gGfhvasAazPDfBZ6Ewf3sIRckQvuW22oWq8yYr0GmfBJbw37EuFLzYMRvWdphnIzJZpwK/ZSFG6er6GbFPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668382; 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=foV7h9HS1392ynDwIgGcItYuV7baM+rZntjLoqtQKTw=; b=kHihhlmg8GLOrRhR57bByLpR4a7PVduhQrFbmO6bxPFFchVzAFPYvWNzBURh9skZoo/9cr/vIDTKEZsXYd7TF7Osd8FmItKxSWcA9zfBk81zF3V1VPNN40L2doIZtJbevqs0PwiX1YT1RfjW65kd8OkVdmI75IuUBUZ4hPBWuI0= 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 169566838283214.425899008796591; Mon, 25 Sep 2023 11:59: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-130-iNaWBakXMAeW4CPCXgzHlg-1; Mon, 25 Sep 2023 14:59:37 -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 4A50488B7AE; Mon, 25 Sep 2023 18:59:29 +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 358CF1055466; Mon, 25 Sep 2023 18:59:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5B9001946A41; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 762F7194658C for ; Mon, 25 Sep 2023 18:59:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 63F1D711286; Mon, 25 Sep 2023 18:59:24 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB96371129C for ; Mon, 25 Sep 2023 18:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668381; 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=foV7h9HS1392ynDwIgGcItYuV7baM+rZntjLoqtQKTw=; b=ibgRb3Fk0X2/rAscuKRh98U8mhkLjFpg1iPZCEjbdWPZkMLE7CKWByfS+8NQLbP8wWr2wL cmzL9NrfQSJI+ie3ufjKcNG8IiZs4Wm2FPs7hY6CVnq9HnXzmjhZ5rUvj5KIgmOTrtdLdn qjBPMYzXSAJgLPSzX0zpBRX+h7EkYIQ= X-MC-Unique: iNaWBakXMAeW4CPCXgzHlg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 22/42] systemd: Switch virtstoraged to common templates Date: Mon, 25 Sep 2023 20:58:20 +0200 Message-ID: <20230925185840.880191-23-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668384314100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/storage/meson.build | 8 ++++---- src/storage/virtstoraged.service.in | 27 --------------------------- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 src/storage/virtstoraged.service.in diff --git a/src/storage/meson.build b/src/storage/meson.build index e0a1e9f4de..90b8af4e41 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -111,11 +111,11 @@ 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_unit_extra': [ + 'After=3Discsid.service', + 'After=3Dremote-fs.target', + ], } =20 openrc_init_files +=3D { 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 Fri May 17 20:40:53 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=1695668387; cv=none; d=zohomail.com; s=zohoarc; b=P6Bsp2y7Uy7fZB1YPb8u84AyL+aQ4ANXj5mdiKxJJz2pGpjbO6QRpwsZXEZZ6JtSQvPwmxqQ499w/1hcJH5SLvcoGwK47khQSQBkrXdVcJzZwozAd7XR6m4rOqauJrc8Y4RFe+omhUMzgu8XkoRCDxQPFB9DKQ4SqDI5/K3nTXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668387; 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=PpvNstLS+dOhKUlbwf/rIvJPcVm01hOdcKXt50v8wwg=; b=QCyecc+3rjRm901E2G7+xXYtYgm5TBoSPKdi2fXzofQ+VnEcK7bwcFpLhhzto7CPGLfburWlcgby+ivTw7wUhj8FnKbs1t8iv8OcLASxNQ3bfNV6gpqZ9PhDi4WhZZCC7SXwi2k38KX+knphAbCbN+08F195ecXtLmAA4CxaRD4= 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 1695668387231230.32338375026814; Mon, 25 Sep 2023 11:59:47 -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-602-kF05ql3JNmm_dopciOhlig-1; Mon, 25 Sep 2023 14:59:41 -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 AC6083C1E9E7; Mon, 25 Sep 2023 18:59: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 97D282156701; Mon, 25 Sep 2023 18:59: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 DDA211946A69; Mon, 25 Sep 2023 18:59:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3FE6E1946A41 for ; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 20D4C711293; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A86A7711286 for ; Mon, 25 Sep 2023 18:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668386; 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=PpvNstLS+dOhKUlbwf/rIvJPcVm01hOdcKXt50v8wwg=; b=g90a9+nxIjCFV7V1NjIU7caWUoGLRJ+Q6WcnLdxCegwccMPobGdGDDsaMP76zrhub9zpkI IT5Pwmx3e5z7hkYwvWgiPnIDHJuUV/9BQPkc2eqfUMoJTmi3qoVQxkql+UuSRScsRr3lN4 0wT7bq48BZLXu4tJqJoV0IcIoRnKeSE= X-MC-Unique: kF05ql3JNmm_dopciOhlig-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 23/42] systemd: Switch virtproxyd to common templates Date: Mon, 25 Sep 2023 20:58:21 +0200 Message-ID: <20230925185840.880191-24-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668388343100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/remote/meson.build | 10 +++------- src/remote/virtproxyd.service.in | 25 ------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 src/remote/virtproxyd.service.in diff --git a/src/remote/meson.build b/src/remote/meson.build index 365d632095..73a9f0a986 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -226,16 +226,12 @@ 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'), - 'deps': 'Conflicts=3D' + libvirtd_socket_conflicts, + 'socket_unit_extra': [ + 'Conflicts=3D' + libvirtd_socket_conflicts, + ], } =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 Fri May 17 20:40:53 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=1695668433; cv=none; d=zohomail.com; s=zohoarc; b=GvoT+9Z4ji9pd7EkQ+v3LmB/tcCWAW3+0sX9OgTOM8MvSKmyOXaEEjBpettEa/rd9v58CatAMlsNQlb2/omWTrc8iFXO+Tcu07xEQWHTFawG/f+ckfPzql9bh2an/ySEmQcYkI95xvbK/svVfGK5UhYzPMT5eMHvcXH5+i5eSic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668433; 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=DhqAphZT9pJVE0gEQLVlLbVL+N6M49hlkLkJAvBQC/Y=; b=eK/aySEJ11ja8AAF7lNqhK0L7YQ4RdkkkGwhRB4855N1pNIYMJUDPBO4de9C4w2XZzh/lHQK9dFVB/Bvh8a9xvM4X4ZS8CyuQRLkf8xqugrM0sk8q/tR5Ki725sgYEfKMr6ISSDqI8g+t9EX4il+QWyRYG5sQEwgnKUkjTTZr18= 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 1695668433292945.2832320306196; Mon, 25 Sep 2023 12:00:33 -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-249-AR7J4QG6P22JnFb2I83vcA-1; Mon, 25 Sep 2023 15:00:17 -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 5CD301C0151B; Mon, 25 Sep 2023 19:00: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 3F03310EA0; Mon, 25 Sep 2023 19:00:01 +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 D626819466FC; Mon, 25 Sep 2023 19:00:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F1AF91946A4B for ; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D21A6711296; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65580711293 for ; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668432; 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=DhqAphZT9pJVE0gEQLVlLbVL+N6M49hlkLkJAvBQC/Y=; b=gRNeYHj0M/JX2S6H/ecIiuDCOfU/W5NIfPDJt1ncQkCBcxBEF7J/Mxx85m1hd8BlAb2+Mb owwLIZ6O33MrNSqWvfTYE/s8osJK1kGp6Nsl5orEnnEm/G5EjuYa7mApFM7DJEpN4GpMEG xkvj99OUsYMtK4jLInfdq53PQnyUNeU= X-MC-Unique: AR7J4QG6P22JnFb2I83vcA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 24/42] systemd: Switch virtvboxd to common templates Date: Mon, 25 Sep 2023 20:58:22 +0200 Message-ID: <20230925185840.880191-25-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668434494100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/vbox/meson.build | 7 +++---- src/vbox/virtvboxd.service.in | 26 -------------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 src/vbox/virtvboxd.service.in diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 2d6b71ab8f..e07c87eaaa 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -57,11 +57,10 @@ 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_unit_extra': [ + 'After=3Dremote-fs.target', + ], } =20 openrc_init_files +=3D { 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 Fri May 17 20:40:53 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=1695668394; cv=none; d=zohomail.com; s=zohoarc; b=nHOqHCdS8mFk9koZHR2vEjl5eApmA8e4KbqgvOYNq+FK6lZ1Ov9ixJJUNmR2TnrHrFoIPrAYbsT4WQV7gnhN3fOyVn3RwL0WXWSgN0rZgjeRL1N6rLibCfYAtKUl9kYqoMcsMacXr2hduUE+JaXXLr5TpsW0hQb2w2f4jq7Yavk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668394; 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=7GRizKfZ6AKVfIYs+jh6sBTvIgA17EoDncwg11/TP0k=; b=J9demgbsPRwm1tljZ9trHPwRHA1nCIFMRQDQ0uHNMTQRKIk5Ikj4Nezycwr7wOW7HKubsSSyPkLP3o+nwdfd9j9kQ0R7C209sGqh6sncqXXI9U4ioMi4wvddGbniRaF5+TNgE4v3Yz/9eDhCtluA5B+NuwNT9gXxBGqgWF6MMEI= 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 1695668394904196.7975763631266; Mon, 25 Sep 2023 11:59:54 -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-467-axpJRo3MMTe2SoVB83DyUw-1; Mon, 25 Sep 2023 14:59:49 -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 4EE2829ABA02; Mon, 25 Sep 2023 18:59:40 +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 38900140273E; Mon, 25 Sep 2023 18:59:40 +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 3C8A619465B6; Mon, 25 Sep 2023 18:59:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 99EA7194658C for ; Mon, 25 Sep 2023 18:59:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9049E711286; Mon, 25 Sep 2023 18:59:28 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 235EB711293 for ; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668394; 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=7GRizKfZ6AKVfIYs+jh6sBTvIgA17EoDncwg11/TP0k=; b=LRL84LoSMreTdYzRCRcP1xdu0hT1bPTGVD37URgGj5QPXkgtJogqmLy7Gs5RmwtyWVpkx0 ImwbE+xrvON/vTbvEFDJq946i8yO0uaVxbaxJuZITEkEeuJPiaH50/65i5bSeh6SJIE/Je c79edQLZ/20cLkC9i2zQuTUg/TkgGNE= X-MC-Unique: axpJRo3MMTe2SoVB83DyUw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 25/42] systemd: Switch virtvzd to common templates Date: Mon, 25 Sep 2023 20:58:23 +0200 Message-ID: <20230925185840.880191-26-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668396354100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/vz/meson.build | 7 +++---- src/vz/virtvzd.service.in | 26 -------------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 src/vz/virtvzd.service.in diff --git a/src/vz/meson.build b/src/vz/meson.build index 9c2eb90463..dceea1aaac 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -48,11 +48,10 @@ 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_unit_extra': [ + 'After=3Dremote-fs.target', + ], } =20 openrc_init_files +=3D { 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 Fri May 17 20:40:53 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=1695668412; cv=none; d=zohomail.com; s=zohoarc; b=N3uW4gY3SIpcSQtiSrDQa+VdDaFbuv0UhgvCoezYFsZmX4/VasLHQsZpKrX7PxU1Mjt6EWnEQXMbG0Ho+ek0B+4lpBluyMIteyL7R4eExPoLU94+B6xRujlf0w1lKmLcsnHYcjbi28lyQbI1SqVuyZJvYaK5tDLMrJ/lnDZBpBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668412; 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=y2CfhKiZsD3VNE2s6hxcIlPBu07N4UOBnKKEulVsd+8=; b=oH8LUZURzzfbbw2a58HBOds1EKNMORsHQnhGEMxS1TUiLKzog3KbLXh5solEtSjmeSTa8a/G5sJApnFM4Bn4cFNlphRr7+JSDBUbixzcawzTsAmYQ9t3rHI7eNxXNBiP8yfyWpAd4BL4g2XAwDxNGLtcPd4FuUMJdmjec1sr348= 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 1695668412868425.35588168787945; Mon, 25 Sep 2023 12:00: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-610-1bMQ1SmEPc6YCi3-GEhNoQ-1; Mon, 25 Sep 2023 14:59:46 -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 8EF61857A9D; Mon, 25 Sep 2023 18:59:35 +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 76B66711299; Mon, 25 Sep 2023 18:59: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 8C35319466EB; Mon, 25 Sep 2023 18:59:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 893BB194658F for ; Mon, 25 Sep 2023 18:59:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6DD10711295; Mon, 25 Sep 2023 18:59:32 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D436A711293 for ; Mon, 25 Sep 2023 18:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668411; 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=y2CfhKiZsD3VNE2s6hxcIlPBu07N4UOBnKKEulVsd+8=; b=Tolg1NvAihiUwe7hVw+BcuXnMTEw1jFB4SjTDPvaC54HICEY+kWRyWmPTLa1sEqzH1438h jrnkNhOvOQ7MeF/SqB+fCBhelbJt3zPk9NjUmNu9jDU6KVckxBy4mCQmqzIwgWYIlwI0nF H+4Y1XCGKgonrkHqai9Jp95h2EQKpBc= X-MC-Unique: 1bMQ1SmEPc6YCi3-GEhNoQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 26/42] systemd: Switch virtchd to common templates Date: Mon, 25 Sep 2023 20:58:24 +0200 Message-ID: <20230925185840.880191-27-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668414705100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/ch/meson.build | 27 ++++++++++++++++++++---- src/ch/virtchd.service.in | 44 --------------------------------------- 2 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 src/ch/virtchd.service.in diff --git a/src/ch/meson.build b/src/ch/meson.build index dc08069dcd..f6c443f3c6 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -57,11 +57,30 @@ 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_unit_extra': [ + 'Wants=3Dsystemd-machined.service', + 'After=3Dsystemd-machined.service', + 'After=3Dremote-fs.target', + ], + 'service_service_extra': [ + '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 hyperv= isors.', + '# 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 t= o 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', + ], } =20 virt_install_dirs +=3D [ 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 Fri May 17 20:40:53 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=1695668410; cv=none; d=zohomail.com; s=zohoarc; b=fTAd2ssXPT7rDxkyjxciLSLwqcPsqEUAu3KwR88QQ08rO8xsSB/E37uu38LGfd4t0uli4VFjacC3ZctjZkZTiour7FF8SAnYWi/YtQt+VpfdLHfD9Y48ppBge/DzbezmRhDF4R9Yc7r1iCcE9ze1nq9hZvQWh6mxlxYyVpFtgnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668410; 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=/eIdO51hsD5is54JtDbJRzc76gD8YVNFErliNEjyqaw=; b=YxJuuiiKPc+VosU+Vn6MKT8GNECZlf1PINKei5cauLZUu53s5RVeIgbLcYLFq3RP3XfEqmmJ0b8pFhZkFUUw0CBfvG4DFK5pcIdekUBnnJfb3cMbrKTEh/vxhGPKpLrGeFKiAnhgPOzpKsp3zZLIs0dph4kbzBh/2QrtGAWtauM= 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 1695668410446319.07355944805045; Mon, 25 Sep 2023 12:00:10 -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-587-LAV6cAFdM--Tb7ln9LbSZQ-1; Mon, 25 Sep 2023 14:59:46 -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 D710C811E97; Mon, 25 Sep 2023 18:59:40 +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 C020451E3; Mon, 25 Sep 2023 18:59:40 +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 4D18E1946A50; Mon, 25 Sep 2023 18:59:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4BAC519465B9 for ; Mon, 25 Sep 2023 18:59:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2A22F711286; Mon, 25 Sep 2023 18:59:34 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B2837711293 for ; Mon, 25 Sep 2023 18:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668409; 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=/eIdO51hsD5is54JtDbJRzc76gD8YVNFErliNEjyqaw=; b=OzVeYt7FPZi0QE/BTxL0GPoRUpb/25BfYCPZczC43B/rMJ70lOW8PZE018P9xgKUA8JEn5 KNDSjhXoEm7CH8GpCLG5aIfFO3Kb5Kc+4MC6e1YkyIFf+cBhjfKj94o2OG4GOnpnT3JxMX j+cPWParqvlt0mq3HibNKdcaiWebCdo= X-MC-Unique: LAV6cAFdM--Tb7ln9LbSZQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 27/42] systemd: Switch virtxend to common templates Date: Mon, 25 Sep 2023 20:58:25 +0200 Message-ID: <20230925185840.880191-28-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668411755100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/libxl/meson.build | 21 ++++++++++++++++----- src/libxl/virtxend.service.in | 32 -------------------------------- 2 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 src/libxl/virtxend.service.in diff --git a/src/libxl/meson.build b/src/libxl/meson.build index a1553dbe27..e84999e14d 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -66,12 +66,23 @@ 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_unit_extra': [ + 'Wants=3Dvirtlockd.socket', + 'After=3Dremote-fs.target', + 'After=3Dxencommons.service', + 'Conflicts=3Dxendomains.service', + 'ConditionPathExists=3D/proc/xen/capabilities', + ], + 'service_service_extra': [ + 'KillMode=3Dprocess', + ], + 'service_install_extra': [ + 'Also=3Dvirtlockd.socket', + ], + 'socket_unit_extra': [ + 'ConditionPathExists=3D/proc/xen/capabilities', + ], } =20 openrc_init_files +=3D { 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 --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668392; cv=none; d=zohomail.com; s=zohoarc; b=iO3mysNuXM0ChymE98xW/a/hV2CWPlc3WdkH8adp6aa2Ud3Iu1D2ahkMX7VIVubxCeUWxC27PW7y/xcjVPeVXdiuf94Fuh33gdNuKBebjS4LOfNhhe3rx+Q56/UTwABPqz+cIlC3N35+52+05EeII7ssxxWtlmOu78af4NmQX50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668392; 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=qSf22ImFfNVcT6QWFr+dC1/Q1U/CLbvnwJaBbzqVsaw=; b=eVvO6OM7B8jNa08f8IWWK93QR3OJ8Yn1ObndFbwAxsX6Rum4N1cgOThUtWdsm0euhgVr8ElGA7Eim3Wxs3yRDBQEKEgRMkSpHhBw5SOncB727mbYn88HTimYGeCTISroXr97Oyh/s0KoX1Rc3lWcVDMvNekKvlglzdbCQo8upuw= 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 1695668392659202.0196115979769; Mon, 25 Sep 2023 11:59:52 -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-404-ZGc139lTMa-OiNP0SEW41A-1; Mon, 25 Sep 2023 14:59:49 -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 802471C0653E; Mon, 25 Sep 2023 18:59:41 +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 25D121054FCB; Mon, 25 Sep 2023 18:59:41 +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 8629A1946A69; Mon, 25 Sep 2023 18:59:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E06201946A43 for ; Mon, 25 Sep 2023 18:59:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DB202711299; Mon, 25 Sep 2023 18:59:34 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E7A1711286 for ; Mon, 25 Sep 2023 18:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668391; 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=qSf22ImFfNVcT6QWFr+dC1/Q1U/CLbvnwJaBbzqVsaw=; b=WIc2Kx7DqOUi9SKMekL7cdSOfGO/31fOhlBfz9e+W7T9A+h3TDd6xWujRA1XTjil+bpVQn cZDxwynGN9jEe4uMzHGBhLvqZBUhCjNlEwpd1Q2/dRolaRQLmoDmbYPjUuC2EDHHfsb2mh XYTp/eIg9TBogCcBlUZYnIDDpL0EjO8= X-MC-Unique: ZGc139lTMa-OiNP0SEW41A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 28/42] systemd: Switch virtlxcd to common templates Date: Mon, 25 Sep 2023 20:58:26 +0200 Message-ID: <20230925185840.880191-29-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668393260100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/lxc/meson.build | 27 +++++++++++++++++++---- src/lxc/virtlxcd.service.in | 44 ------------------------------------- 2 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 src/lxc/virtlxcd.service.in diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 531078448c..9b933023dd 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -164,11 +164,30 @@ 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_unit_extra': [ + 'Wants=3Dsystemd-machined.service', + 'After=3Dsystemd-machined.service', + 'After=3Dremote-fs.target', + ], + 'service_service_extra': [ + '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 hyperv= isors.', + '# 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 t= o 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', + ], } =20 openrc_init_files +=3D { 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 Fri May 17 20:40:53 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=1695668526; cv=none; d=zohomail.com; s=zohoarc; b=MoBXeAb61OuL95r2rgqkF2nGWKA1gV5QnHfjAEL/JwiCLkWvz7hItS2bc6YthIcJKwOOmzJXjxRGw2bZbDLk/4DRayLZJbzNWkKcDKFmVltT90U9Ok7RMo/8W7nNhsv2jBDC69IDlIvExw/nOxLmx81tXaCay2nzZkaUCFEgDyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668526; 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=V3vHKpIHi+3KkMNkG/+qoLaIAIvM1skv+/FaPgtpxCU=; b=hiYWf29u3H6JI/Mc0iYmDayeRDFF6nzy2qCjYvc4EDC74MIFrc62Vu9HKFQyUcd9la3RVMvJJdX+wlGuUfqmgpRIyyHPkbeWUEbqHcVSi4rFGmKLDvd9HurVnlyb3g1sxpKDT/WYcbsSHFCU4fja5W93xHZV9obf6M+k8XKH/AQ= 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 1695668526094793.9008728597158; Mon, 25 Sep 2023 12:02: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-649-cagGCVHQPPiomlKYlm0heA-1; Mon, 25 Sep 2023 14:59:47 -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 90F2C85829A; Mon, 25 Sep 2023 18:59:41 +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 79F4E1054FC2; Mon, 25 Sep 2023 18:59:41 +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 CA6F119466EE; Mon, 25 Sep 2023 18:59:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9D13F194658C for ; Mon, 25 Sep 2023 18:59:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 98309711286; Mon, 25 Sep 2023 18:59:35 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A4EF711296 for ; Mon, 25 Sep 2023 18:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668525; 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=V3vHKpIHi+3KkMNkG/+qoLaIAIvM1skv+/FaPgtpxCU=; b=bjp23XE0gdt8Z0zYDdGiFcp7gxQYDqLsWEqZOmYy8B9EYgzwmTtB640UmxmMLT5SXJLSxL lcg6bD/2Mp3rutmPXO1SHwMVn5n6vb9f1v75iJGNZi48uGMbs4rut/FSaNfunGBHJxlw1F whDBZpx1TeBvy8o2jC779z6RK5R4NK0= X-MC-Unique: cagGCVHQPPiomlKYlm0heA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 29/42] systemd: Switch virtqemud to common templates Date: Mon, 25 Sep 2023 20:58:27 +0200 Message-ID: <20230925185840.880191-30-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668527480100007 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/qemu/meson.build | 33 +++++++++++++++++++++--- src/qemu/virtqemud.service.in | 48 ----------------------------------- 2 files changed, 29 insertions(+), 52 deletions(-) delete mode 100644 src/qemu/virtqemud.service.in diff --git a/src/qemu/meson.build b/src/qemu/meson.build index b52497bdf0..7e5db09e0c 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -183,11 +183,36 @@ 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_unit_extra': [ + 'Requires=3Dvirtlogd.socket', + 'Wants=3Dvirtlockd.socket', + 'Wants=3Dsystemd-machined.service', + 'After=3Dsystemd-machined.service', + 'After=3Dremote-fs.target', + ], + 'service_service_extra': [ + '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 hyperv= isors.', + '# 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 t= o 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', + ], + 'service_install_extra': [ + 'Also=3Dvirtlogd.socket', + 'Also=3Dvirtlockd.socket', + ], } =20 openrc_init_files +=3D { 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 Fri May 17 20:40:53 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=1695668457; cv=none; d=zohomail.com; s=zohoarc; b=ML7nd43YuMfBPkjWu7uKoPNK732sUaMH/iRmw28RS4PaLJ7nE3Z4BpfeZL83/o8J5KMViq856fL+LNQ66AxDhQyjN5KOXSY0iodQbEy9/cidMN63SaxcNPr+xQnZo3OmAgx7KX76SyUEl2u7Dvu6hDJKueuCqd95V0svaWdWATg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668457; 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=3hCb5s4wuNkIJEEEVVPBKTo2cuWjGN1YH9RstmoEkl8=; b=RBFEhOcY6e0346hPLSrfnCB2ZpsM66cI3yFPHFhAS6xqJnracPtNd8AvEaGSTQTBQTIJyCZp1i2O8oiVH1keDRzPXE7kLH82vwc/LhHI1dP2vKyAh+1Y625yVogP9SSkS/old5Hz5makYmkK84U7Qpbr6CZkR0kFfAD4YOEnXOw= 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 1695668457223777.3109432662633; Mon, 25 Sep 2023 12:00:57 -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-74-MPm9qhCKNeux1P3ux99t8w-1; Mon, 25 Sep 2023 15:00:49 -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 1EFA2101A58B; Mon, 25 Sep 2023 19:00: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 07F1E140273D; Mon, 25 Sep 2023 19:00: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 4169F1946A4F; Mon, 25 Sep 2023 19:00:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 721E21946A67 for ; Mon, 25 Sep 2023 18:59:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 53593711286; Mon, 25 Sep 2023 18:59:36 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB975711293 for ; Mon, 25 Sep 2023 18:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668456; 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=3hCb5s4wuNkIJEEEVVPBKTo2cuWjGN1YH9RstmoEkl8=; b=BZy+3l0iDoQnLpJKAVRd6SN5pzAQhLkSpQELPyyeS2RLn8t+QvxwMyxo1xCd0enGQvEMCn EsRYMubObYhrkiM/5Tdq2ZVswA2CxnC3F3bK10QDHVgp8Sr3r5RPF1gQ6JL7H76Y4oRUqD glX7alGKZj2PDdsZ8RY10WmwynfGM+o= X-MC-Unique: MPm9qhCKNeux1P3ux99t8w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 30/42] systemd: Drop libvirtd_socket*_in values Date: Mon, 25 Sep 2023 20:58:28 +0200 Message-ID: <20230925185840.880191-31-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668458901100005 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 --- src/meson.build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index b00895fd07..4e837c1e6d 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 Fri May 17 20:40:53 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=1695668462; cv=none; d=zohomail.com; s=zohoarc; b=AZvqsWy+p8fvHAzafQ68GYE8jHft0pmnepWfD5AJ4AOEqmNBB+9BgjKOj+gbshhndrcoqee9CvYfqp6GxRFy6oYUv74H9+v1g8iH3LZKX3U/mg/0akwypg4LTcRbm6ru5Yr+eXtFvCmYuowbQcNfYl62SGuq8HsUAZgozG2QQTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668462; 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=TW1FZnxWFh5jtm9WxDhBtHYuAWEAssgOxW4lv39bzGg=; b=iJAzyo4yyMJ8woEZZut7sZluzWPg+suwmkgGqIMJ6SAPSoBHk/Gk7rhT1L+RrzNijxHk2rF3TL3GA9KhY27ENgbtS7QKXKbvJtESaNQmVkfneLF7LMSq9MPURGa85glxTClkVr8akP4PE7+tPZQUQBp5469/OMrj/E1nUL3qWZw= 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 1695668462387674.1812812762751; Mon, 25 Sep 2023 12:01:02 -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-298-fVQ9jMCJMG-OeCmYF0eQQg-1; Mon, 25 Sep 2023 15:00:52 -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 CE25B101A529; Mon, 25 Sep 2023 19:00: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 B91C251E3; Mon, 25 Sep 2023 19:00: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 ABB4E19465B2; Mon, 25 Sep 2023 19:00:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2A25819465BA for ; Mon, 25 Sep 2023 18:59:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0FAFA71129C; Mon, 25 Sep 2023 18:59:37 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 97484711286 for ; Mon, 25 Sep 2023 18:59:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668461; 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=TW1FZnxWFh5jtm9WxDhBtHYuAWEAssgOxW4lv39bzGg=; b=PoILVv+ks2QoMvYQvHraNGzvWC3D9gN5HdwvsjJQMeBsWgVUlxwmGhzZoADnfloClnsXY1 SgXrwC7chkapOpuEk+m3M31WfH0cQ+/qoh4b67cKmBoCCfCDtH6qG/FqTkw6G88qAZxUrd mAKnIpSPbwzzF4WVnXUpBPtARfqFbK4= X-MC-Unique: fVQ9jMCJMG-OeCmYF0eQQg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 31/42] systemd: Drop @deps@ Date: Mon, 25 Sep 2023 20:58:29 +0200 Message-ID: <20230925185840.880191-32-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668463586100001 Content-Type: text/plain; charset="utf-8"; x-default="true" It's no longer used anywhere. @socket_unit_extra@ would be its equivalent when using common templates. Signed-off-by: Andrea Bolognani --- 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 4e837c1e6d..7d45e23a37 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_$name_extra - additional lines for service's [$name] section= (optional, default []) # * socket_$name_extra - additional lines for socket's [$name] section (= optional, default []) -# * deps - socket dependencies (optional, default '') virt_daemon_units =3D [] =20 # 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 Fri May 17 20:40:53 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=1695668472; cv=none; d=zohomail.com; s=zohoarc; b=W1vIWD6djnC74BCLVLEW71GSq/poSW0UnUOnOTu5pSQAzAoXHDPa5HBudtggQFyv8JBtOhR2q8K71ECwzjUH1dwgZD/mRj7IYgMDHPr1ny8z8mA/RfBtV4SssOX8/we8B3FeqVp/RJrnULSiTMjf9t1B4m3uZ0YJHhSohBOJJ9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668472; 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=XMQm//t1KsrkrU6EAEzxkmf1ofOWwvPlpUj6qGKxVxW0Vm7Ss60xV3OE6AkvcWlwgRzyeybJAJrlxMSpl38ie/ff/17X3a5jx5v5TX8ljL7r9Rd5TwYewYZOwdEfryLaz4tWRdZiUeY4PNx1A/lSfug6VO337YhvjRdz+uvH6Fk= 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 1695668472432471.1087380379622; Mon, 25 Sep 2023 12:01: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-306-m61Ba3Q4MBOLDVC2H3k0cg-1; Mon, 25 Sep 2023 14:59:51 -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 F24DC18162C1; Mon, 25 Sep 2023 18:59:41 +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 CB54221CAC8D; Mon, 25 Sep 2023 18:59:41 +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 C101B1946A76; Mon, 25 Sep 2023 18:59:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D11ED1946A43 for ; Mon, 25 Sep 2023 18:59:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C0A0F711294; Mon, 25 Sep 2023 18:59:37 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54C50711293 for ; Mon, 25 Sep 2023 18:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668471; 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=OXZzJC0MQcQr/dzzcv+S6t3ubIqDnsZ+OMV5NONAvS+ur0347/+55+M3RgkFyw5FQnuHV2 H9g/eR1uduojagvs9Q4n6/92qjCZvBdBHzeyRFXI09jFeQTqoYAtaqu2na7nshMPjkfxiV 0quJTJHT6b16c2abXTaPcOVEawZQ1h4= X-MC-Unique: m61Ba3Q4MBOLDVC2H3k0cg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 32/42] systemd: Drop parametrization from libvirtd sockets Date: Mon, 25 Sep 2023 20:58:30 +0200 Message-ID: <20230925185840.880191-33-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668473394100001 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 --- 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 Fri May 17 20:40:53 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=1695668457; cv=none; d=zohomail.com; s=zohoarc; b=Gng1jcFxVENoKew+jCR0ykbYQlJHlbPI7+swJeRN+jCO9YC7h3UVxH9k0IpwslX1BygmhC7V9YlEP/qn6styl6J3gKw3e1hOczsUN2WsC7u9JN4bvNEUmH+kvGg0VGNxrxSivwyy9mNKzwzyOEFElwVkYKs/gp4pMSaaznQEljA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668457; 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=AvJ4H4nStZ4xPx07O1ni8SgEITpLrdQkJUPRwPbgopI=; b=GpdBlr62R+hsKcNVgxt/GuWht0VZ01ezrlURa7pphii9CbgnhNFOALaSsydcS/DJFPwRYOjiwcdj5bh3elNXe3Xf5hdVXDYei1RLhpkxMvt0LOjvsH4i2nxG+VcstVEozSdStyOnWLJQfCCmJ+E2eJZS9snzaJbCWjjPS1X/2xI= 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 1695668457982226.68690240061142; Mon, 25 Sep 2023 12:00:57 -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-648-Cu0WiHnBNESwfS16q3N-Dg-1; Mon, 25 Sep 2023 15:00:52 -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 323523812583; Mon, 25 Sep 2023 19:00:20 +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 1C690140273D; Mon, 25 Sep 2023 19:00:20 +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 E771C19465A3; Mon, 25 Sep 2023 19:00:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 99DDF1946A75 for ; Mon, 25 Sep 2023 18:59:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7CC9F711293; Mon, 25 Sep 2023 18:59:39 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 10593711286 for ; Mon, 25 Sep 2023 18:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668456; 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=AvJ4H4nStZ4xPx07O1ni8SgEITpLrdQkJUPRwPbgopI=; b=SjTT97aRH1Ge34LATZhQBtmbHheCXJXCdteRgFAR6Qq4xTJ76y/R4ndunzW2MtEshTdMcJ 9HRaZRon+baXKqOTZysiCz+0YzEjLN8Om+RFkaEEtBnAVaxkEuKCXyymHdUh2F5d+ZBYDA n0IFL39m6SGHBLpDWpyPAd6XAhPJqpo= X-MC-Unique: Cu0WiHnBNESwfS16q3N-Dg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 33/42] systemd: Drop Conflicts from virtproxyd sockets Date: Mon, 25 Sep 2023 20:58:31 +0200 Message-ID: <20230925185840.880191-34-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668459979100007 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 --- src/remote/meson.build | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/remote/meson.build b/src/remote/meson.build index 73a9f0a986..5ee6d4e61c 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', @@ -229,9 +227,6 @@ if conf.has('WITH_REMOTE') 'name': 'Libvirt proxy', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], - 'socket_unit_extra': [ - 'Conflicts=3D' + libvirtd_socket_conflicts, - ], } =20 openrc_init_files +=3D { --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668414; cv=none; d=zohomail.com; s=zohoarc; b=hFIoKkqgWDQruBZh15WD9bo+Ca3+npBja2Di9GN7hpy/z/BIhLyiMKWIt7hOJSBrxYELxUIqvU6STqtJpIU744bNXKXBPCTE1kmQ65H3C68LkG1G/cdQCBRGk3AsH9NQzRci18oKAHGmL0XG/X/dRCqkPEFOp+RgCoYWbhWOZpE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668414; 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=YFljQEwe9CEEjOxfhFvWTVLVvTwubdftc5bytNxT0Ss=; b=be8tmkziKJWRNXwWpO5+zzJKlUprSqMQhhJOnvIDSxL9i4DIwm8YEqDryzw9v8vzC3HjdTXAocQxb8Qjo91h1VIRtTEEeC3F5jn+8RSJMDzuzZCLIpZ1fw9tj9J6WSbOxD80mhaJr1ZF7D3Hq38OEssF92r4ylcWjUv6S7K38Sc= 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 1695668414728274.89183028965977; Mon, 25 Sep 2023 12:00:14 -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-138-evB_JfFkNuqWAk_awyKsrQ-1; Mon, 25 Sep 2023 14:59:50 -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 419B580A1C6; Mon, 25 Sep 2023 18:59:43 +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 2A45249BB9A; Mon, 25 Sep 2023 18:59:43 +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 1FBC219465A3; Mon, 25 Sep 2023 18:59:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 444F3194658C for ; Mon, 25 Sep 2023 18:59:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 38D31711294; Mon, 25 Sep 2023 18:59:41 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C1222711293 for ; Mon, 25 Sep 2023 18:59:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668413; 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=YFljQEwe9CEEjOxfhFvWTVLVvTwubdftc5bytNxT0Ss=; b=RSHcRRyOUO/xcIZlr6cmc9aFheqlKEt/OnWEt/3MoO+PbvPKZyJNtXQ1HkWU3/J4PBdtbn ClpnVV4UkRbbb2+RXwvpkBcQpnYPWXxZkx5pSOO/vovjVLtvlq1f4TkBaKxPbWg48mtWr8 zRjhSr3SR/J81tfgz1kPNNn4VM+AUrI= X-MC-Unique: evB_JfFkNuqWAk_awyKsrQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 34/42] systemd: Make modular daemons conflict with libvirtd Date: Mon, 25 Sep 2023 20:58:32 +0200 Message-ID: <20230925185840.880191-35-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668415865100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 3a09951b12..e43f4df82d 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 @socket_unit_extra@ =20 [Socket] diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in index e882f25a7b..7b91f0d657 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 @socket_unit_extra@ =20 [Socket] diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in index 26c6dfa75b..d715e2d00d 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 @socket_unit_extra@ =20 [Socket] diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in index 077c320cce..5b2550fb1d 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=3Dlibvirt-tls.socket +After=3Dlibvirt-tls.socket @socket_unit_extra@ =20 [Socket] diff --git a/src/virtd.service.in b/src/virtd.service.in index c9afecad73..21391a65b0 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 278f59ef1c..e4dc94b277 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 @socket_unit_extra@ =20 [Socket] --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668524; cv=none; d=zohomail.com; s=zohoarc; b=mWSyGJz0tr/M8ZJyYc5HM+SHTRGh6sNYREsuyvVauzSLPCGV7wsmSDilN5CXFJtXitKz5doCB74ndgT3ZKRxV0fkxMfoVQPknTpKdF4s9Nf4qM9WzotB0Dnc5dmzctPMees2/XJ035ThKjje9xXjyBy93krHTjnWnB7qKmoxLxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668524; 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=sltxSre/BB6ZC8p10dCAwiPgMo5438RxgkVtVEDeMOs=; b=KC6f9EmrXSSu0+JJTZ+Xiv/CdvkpH62Zw53jvxtSxmAOAdn2CqIn6HLVbpbGxOlhFJOY2hmq6S9xOQvJ3whYfkSr3qRdWP0cyJawNXH9FgzZYZzoNG5CIlpnTVUt1Qo+/2zKLFc4ktHMI1+GShMruLHNh5CXLLIz4wj6hsZD8N8= 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 16956685242381013.7727608099533; Mon, 25 Sep 2023 12:02:04 -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-210-j1hKG7RCP5m_z-jeykWxzg-1; Mon, 25 Sep 2023 14:59:51 -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 9CA111C0758D; Mon, 25 Sep 2023 18:59:43 +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 86F88175B5; Mon, 25 Sep 2023 18:59:43 +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 6841719466EC; Mon, 25 Sep 2023 18:59:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0A0E1194658C for ; Mon, 25 Sep 2023 18:59:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EAD9C711293; Mon, 25 Sep 2023 18:59:41 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CCF2711286 for ; Mon, 25 Sep 2023 18:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668523; 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=sltxSre/BB6ZC8p10dCAwiPgMo5438RxgkVtVEDeMOs=; b=AwsL4rdNSBlbzgJjVIQk6xi45yivhYBmx3FR4vlKloHzEiavOXov/bdN3jLgdKtEK3gedi 38hBzZSznfvI7qKnT2c2NTi8lsaut75ltrYpTfFgO2dF0gduRAGZQiPBYFCz9+ClY1HJdE uuWdE9kRS5TXnDaz28/j0VKfTfOwQ6Q= X-MC-Unique: j1hKG7RCP5m_z-jeykWxzg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 35/42] systemd: Replace Requires with BindTo+After for sockets Date: Mon, 25 Sep 2023 20:58:33 +0200 Message-ID: <20230925185840.880191-36-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668525497100002 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 any of its sockets disappear. This is the behavior we want. Signed-off-by: Andrea Bolognani --- src/locking/virtlockd.service.in | 6 ++++-- src/logging/virtlogd.service.in | 6 ++++-- src/virtd.service.in | 9 ++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index 9e91fa3261..a21a2c2c19 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,7 +1,9 @@ [Unit] Description=3DVirtual machine lock manager -Requires=3Dvirtlockd.socket -Requires=3Dvirtlockd-admin.socket +BindsTo=3Dvirtlockd.socket +BindsTo=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 97c942ffb0..f3bd576301 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -1,7 +1,9 @@ [Unit] Description=3DVirtual machine log manager -Requires=3Dvirtlogd.socket -Requires=3Dvirtlogd-admin.socket +BindsTo=3Dvirtlogd.socket +BindsTo=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/virtd.service.in b/src/virtd.service.in index 21391a65b0..b9e6345e8c 100644 --- a/src/virtd.service.in +++ b/src/virtd.service.in @@ -1,8 +1,11 @@ [Unit] Description=3D@name@ daemon -Requires=3D@service@.socket -Requires=3D@service@-ro.socket -Requires=3D@service@-admin.socket +BindsTo=3D@service@.socket +BindsTo=3D@service@-ro.socket +BindsTo=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 Fri May 17 20:40:53 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=1695668465; cv=none; d=zohomail.com; s=zohoarc; b=FKWrdyInLIUzYDnj81/Qxm23SnoOTROMrSBNsxXIf2t/21ZBdDnddj0DQmxa4aMD8EvGkyCgC1d8xoA6TdV0+ny/Ygc3Gjm/VcwB9Yn+3+f5koaifHf6oTu3GYkOEFjXb4aIHTDtazryvOYIvTjAnaAYrhIbWaPaljer+U7a++U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668465; 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=BY2w+whsFXxRpByW2TUU/rmXBtlkvLHVnJVYrPZrUeo=; b=dIbIFerkZLJhtff9aHbbPa0z7BzXDdc2/3MGDdYuCpze0LwkbPgI6DAaTUWVgGE6cYL1dqSz97HqOfpXbMq8YN3zj3FSiya2fcJVjVEw6C1VuwensLYQ2Y9IvZzr+keyPhn0vY9FypPuR/xfcDZaBKWpodYHy/fivmW0XQbmw0w= 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 1695668465509753.3843355232373; Mon, 25 Sep 2023 12:01: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-610--a0fmzIsM0Sl77S_zrhHaw-1; Mon, 25 Sep 2023 15:00:16 -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 5A719380117C; Mon, 25 Sep 2023 19:00: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 416B3711297; Mon, 25 Sep 2023 19:00: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 14BB019465A4; Mon, 25 Sep 2023 19:00:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BF8D819466F5 for ; Mon, 25 Sep 2023 18:59:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A776C711295; Mon, 25 Sep 2023 18:59:44 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B39D711286 for ; Mon, 25 Sep 2023 18:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668464; 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=BY2w+whsFXxRpByW2TUU/rmXBtlkvLHVnJVYrPZrUeo=; b=DU2QSLVHupoGDUQHuzCbH/oNRIKANxHeG2HVUexAYfMWD2qg1TZyksx6/ugarBd6Lb+8dy JA12VXBsOY5lM+NFcog9TK8OhRXVJc3yK1SQEdML58CJsIuVeR3xEgluI2i98VKkQ1w+4Z 6fnW0gyF4g+Gw2JkYzRHpcMCqX4TkaI= X-MC-Unique: -a0fmzIsM0Sl77S_zrhHaw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 36/42] systemd: Augment Requires/Wants with After Date: Mon, 25 Sep 2023 20:58:34 +0200 Message-ID: <20230925185840.880191-37-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668466645100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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/meson.build | 1 + src/qemu/meson.build | 2 ++ src/remote/libvirtd.service.in | 7 ++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libxl/meson.build b/src/libxl/meson.build index e84999e14d..ad8d9b757f 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -69,6 +69,7 @@ if conf.has('WITH_LIBXL') 'name': 'Libvirt libxl', 'service_unit_extra': [ 'Wants=3Dvirtlockd.socket', + 'After=3Dvirtlockd.socket', 'After=3Dremote-fs.target', 'After=3Dxencommons.service', 'Conflicts=3Dxendomains.service', diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 7e5db09e0c..bf900e3f14 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -187,6 +187,8 @@ if conf.has('WITH_QEMU') 'service_unit_extra': [ '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 --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668400; cv=none; d=zohomail.com; s=zohoarc; b=JMe1Y49zgZG+sEep1lzB6tCrWaBZI19MBzuiQ0Jdrxck70poEHTeqUMq1msOduyjqtzyifa/ps8nU5OB6ACVEsypnsx2LjVxlK6tM7sN8/TaS7JOyQgpjUan+zTaqsAYIcNj13LL0Zvc5YFI4FUcY1ZNRMkPQKzQZfj73KM6+b4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668400; 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=3fRCGiKBlyQVKIDBWbQ1fA83NFBFLBI26UpvdMj78RU=; b=B6JIWPAjP2hFeWEr/ka/YVFDTTzY5RY0vJQGaRNCfOESYGs+8X2p8RgV1wXSE9q1pvtN2LG0dDCzTl5/UpmhT/ONMBEb27kFXJMNERW2xl6JB7eI4Ghzr89c+myErrVDNApFFvkhtqjsEaOMvyWerQThsBBAi5+NBJS1nlPjBHA= 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 1695668400814291.17795348810876; Mon, 25 Sep 2023 12:00:00 -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-568-N1KsWgPUP2y7Xlhfr9hCCg-1; Mon, 25 Sep 2023 14:59: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 BBCD885A5BE; Mon, 25 Sep 2023 18:59: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 A43E42156701; Mon, 25 Sep 2023 18:59: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 94B8F194658F; Mon, 25 Sep 2023 18:59:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8061D19465B3 for ; Mon, 25 Sep 2023 18:59:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6493A711293; Mon, 25 Sep 2023 18:59:49 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB4F9711286 for ; Mon, 25 Sep 2023 18:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668399; 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=3fRCGiKBlyQVKIDBWbQ1fA83NFBFLBI26UpvdMj78RU=; b=RNEN9DIsLSkcx6ywBvWTJiiK9h2HurSvjtCBRCP7BvZTFInMzWdhGCrw35SYl1zIiiL++u G4z0Ova9+D6wvf6Fq+52oPgd7rz84Bq7Tm3W8MpWYldyToq+x2Gm+bJC/bMD6C7FruYerb oIu/Gvoz4rOnewu853Pz3WBiBEsfVl8= X-MC-Unique: N1KsWgPUP2y7Xlhfr9hCCg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 37/42] systemd: Drop Before=libvirtd from virtlogd/virtlockd Date: Mon, 25 Sep 2023 20:58:35 +0200 Message-ID: <20230925185840.880191-38-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668402490100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 a21a2c2c19..ebf8cb9d5a 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -4,7 +4,6 @@ BindsTo=3Dvirtlockd.socket BindsTo=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 f3bd576301..72743a61ae 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -4,7 +4,6 @@ BindsTo=3Dvirtlogd.socket BindsTo=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 Fri May 17 20:40:53 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=1695668418; cv=none; d=zohomail.com; s=zohoarc; b=PsvgfzUVDHmVidOKjLzQdbR9BR2HGOt2li2wOUCzXCGwHcBfWiA0anuIJh/7wx0aMsH9EX/g9NSiHladKqMXQM/mddntaad+ZyKNkFNHgpICSEzeO6KWbJj3If7jPSKPrX6IwLBLzqcZOx2fDp4RoubAkxdnV8eHTJUYOsigOaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668418; 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=CtLnNrSMZKNPznwhifNMfNPEh/+dHy/oGPcUVjKFN6A=; b=SzEr7IMl8M5k6V9ma5rHTEHgmUEX1YgO2CzSPFqGhz7JJlUm1iOWV+PawR8EfBgLwOiH4hnlL5iL0RNAfCTcPVOwZbriVcUiUpK2mgcJ956QqfMCHw/rfFr9lOU9zd8YkkKbISg9rtJ2izOIGqbd0g4tWICBMVDn1Rh+k1gUowM= 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 1695668418851193.47502551862613; Mon, 25 Sep 2023 12:00:18 -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-648-bq1202JqO8yE62jOlOeE0w-1; Mon, 25 Sep 2023 15:00:09 -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 CF58E816532; Mon, 25 Sep 2023 19:00: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 B3E4940C2064; Mon, 25 Sep 2023 19:00: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 563E819466FF; Mon, 25 Sep 2023 19:00:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3C88E194658F for ; Mon, 25 Sep 2023 18:59:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 20C8E711295; Mon, 25 Sep 2023 18:59:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8EA171129B for ; Mon, 25 Sep 2023 18:59:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668417; 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=CtLnNrSMZKNPznwhifNMfNPEh/+dHy/oGPcUVjKFN6A=; b=TqMl4v8wWhtLcgAfrOm1ccNJ3yQZa5ivabjpQ1hLQ3LPtyV0nKe1Vz5ajk020J3GphbIDr 1RBmLVuMlrvI3RH3PQ5GYJi2M0T4IY87afXVYpIakdTqKIxChhoXGyVouGFSm9kaQRwIkk EqM6XHKgQ77v07xZcPofAgCMcto5TaA= X-MC-Unique: bq1202JqO8yE62jOlOeE0w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 38/42] systemd: Drop Before=foo.service from sockets Date: Mon, 25 Sep 2023 20:58:36 +0200 Message-ID: <20230925185840.880191-39-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695668420804100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 e43f4df82d..8851dde1bc 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 7b91f0d657..89b8d80763 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 d715e2d00d..2873c35135 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 5b2550fb1d..2d4d589c8a 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=3Dlibvirt-tls.socket diff --git a/src/virtd.socket.in b/src/virtd.socket.in index e4dc94b277..df4a619dd4 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 @socket_unit_extra@ --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668457; cv=none; d=zohomail.com; s=zohoarc; b=Bqhuv7heUgMevf5E9wxk1C6YXukKZ7D9qKWpjWwRSuQXdsduDx2G3zQhvQFwP5X/kXlyi4raX8umqVS9axewlsZ0rgnaAWc6pU20MYvCPkSjjidYZNAmmJPT18T5xO67hiEmj8i8c7mPvnaVbaVVPGx/uuZLvtFRHDSHUgmC0y8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668457; 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=bPHF0JBs3/fB0CZHnXYyU4Mwjjdd8xplmCuUf6OFNn4=; b=IdRF7hWMtP19Kp6MQK48PXjZXZCw69WFvsyIjXUU5fDPfhQT3yHAFAv40VEN7Meo4aDBfGQrO5cjNUsUmGfY1E8fsX+Sq90e5YgCY8L8we0JC3HAqNsubh4K2UCzkhSv46HfQjGQ4s5fIrOMQg+6LlGVaromGQIeiEW7EO++eTM= 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 1695668457102561.7188299537289; Mon, 25 Sep 2023 12:00:57 -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-296-OrRGPlckP2aoJZD5KWyfew-1; Mon, 25 Sep 2023 15:00:52 -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 B7E838039D2; Mon, 25 Sep 2023 19:00: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 A1F132026D4B; Mon, 25 Sep 2023 19:00: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 96E0C194658F; Mon, 25 Sep 2023 19:00:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DF6E7194658C for ; Mon, 25 Sep 2023 18:59:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D28FA711294; Mon, 25 Sep 2023 18:59:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65763711286 for ; Mon, 25 Sep 2023 18:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668455; 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=bPHF0JBs3/fB0CZHnXYyU4Mwjjdd8xplmCuUf6OFNn4=; b=N9lE1yNCyncgmvOWELVaC5uTikZF5tpWb6c6myN4ZCE91jF8/7oKkFgnObXFLZ+t4kG01T 4oIaT93gpWldd7Y2rwh8zJ88VU5fjog+wh6pCfr+EeghBizTk7IDd5e4dpUiDg0buOfryg gUFvYv+F3rMFxFJLfro9YLFINHHH94k= X-MC-Unique: OrRGPlckP2aoJZD5KWyfew-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 39/42] systemd: Add Also between sockets Date: Mon, 25 Sep 2023 20:58:37 +0200 Message-ID: <20230925185840.880191-40-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668458697100003 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..63f78a02da 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=3D@service@.socket diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket= .in index d2cc2a06a3..1cd50c70ec 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=3D@service@-admin.socket diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-ad= min.socket.in index 67259803ca..1d18fe6f56 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=3D@service@.socket diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in index 7b3fc73773..0b85af927b 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=3D@service@-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 8851dde1bc..a4faeb7da8 100644 --- a/src/virtd-admin.socket.in +++ b/src/virtd-admin.socket.in @@ -14,4 +14,6 @@ SocketMode=3D0600 =20 [Install] WantedBy=3Dsockets.target +Also=3D@service@.socket +Also=3D@service@-ro.socket @socket_install_extra@ diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in index 89b8d80763..829c2e8b1f 100644 --- a/src/virtd-ro.socket.in +++ b/src/virtd-ro.socket.in @@ -14,4 +14,6 @@ SocketMode=3D0666 =20 [Install] WantedBy=3Dsockets.target +Also=3D@service@.socket +Also=3D@service@-admin.socket @socket_install_extra@ diff --git a/src/virtd.socket.in b/src/virtd.socket.in index df4a619dd4..dc25e4d781 100644 --- a/src/virtd.socket.in +++ b/src/virtd.socket.in @@ -13,4 +13,6 @@ RemoveOnStop=3Dyes =20 [Install] WantedBy=3Dsockets.target +Also=3D@service@-ro.socket +Also=3D@service@-admin.socket @socket_install_extra@ --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668459; cv=none; d=zohomail.com; s=zohoarc; b=ZTKR0GaAZWCSoTwBQ3Cf6vG9WK0s1cR9CR6/fCo2/RZGJnMmZSInMPiQJU5o+emY5q33c5Cj235zKfjC6Vme6To/KRk9PtJSVgAB81o5M85XRlA840uMp4kvMrQj8Puhhlk4zcmERipRhaQ6AoPcTQbvzABzIEAF/nhxLgSYEc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668459; 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=PTxTXI/jG+B8JtVhHHxEkIQRIcLlV/SMFzFsYH89Kr8=; b=eqciWIdUD8M2on50m64fwBX7SxR0cskoG+8dSRF2gEgXGPNZOjH+TDC8dHhyGbM4/M3MU7Tgiz/KUkzmLwkLfifml5o7XeDvzUJC92wLXzShbtQ+RiyeH6KIipKZ494atzuPPPIUAN7hcaQzOaaWy5Vndiu6fwkyB0eKbba1jvw= 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 1695668459765983.1536559525007; Mon, 25 Sep 2023 12:00: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-302-B57Wuy26Mo2lOEU_YJFNnA-1; Mon, 25 Sep 2023 15:00:55 -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 7127082E017; Mon, 25 Sep 2023 19:00: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 2CE75C185F0; Mon, 25 Sep 2023 19:00: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 00A6E194658F; Mon, 25 Sep 2023 19:00:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AA054194658C for ; Mon, 25 Sep 2023 18:59:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8E6E6711294; Mon, 25 Sep 2023 18:59:53 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 218CF711293 for ; Mon, 25 Sep 2023 18:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668458; 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=PTxTXI/jG+B8JtVhHHxEkIQRIcLlV/SMFzFsYH89Kr8=; b=Y880UrCosCCnzvZmhM7YsfkbxatbZndf1keRosGIeKQszzMN04rGrAJOZJ+hN7UoioQ3wo er2PIfniid5r7f+850Ev8spC62ZR/HYDur+6Y6ZMOMdKX2uuxjiB5i0Lu/JVQL7+oQPdyV s13TA7qRyTa0JhVw9H13w/yc/FzBF8A= X-MC-Unique: B57Wuy26Mo2lOEU_YJFNnA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 40/42] systemd: Drop BindTo/After between sockets Date: Mon, 25 Sep 2023 20:58:38 +0200 Message-ID: <20230925185840.880191-41-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668460633100009 Content-Type: text/plain; charset="utf-8"; x-default="true" They are unnecessary, since all sockets for a service are now enabled as soon as one of them is and each service has a very strong dependency on all of its sockets. Signed-off-by: Andrea Bolognani --- src/locking/virtlockd-admin.socket.in | 2 -- src/logging/virtlogd-admin.socket.in | 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/virtd-admin.socket.in | 2 -- src/virtd-ro.socket.in | 2 -- src/virtd-tcp.socket.in | 2 -- src/virtd-tls.socket.in | 2 -- 10 files changed, 20 deletions(-) diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-= admin.socket.in index 63f78a02da..a773b511bd 100644 --- a/src/locking/virtlockd-admin.socket.in +++ b/src/locking/virtlockd-admin.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3DVirtual machine lock manager admin socket -BindsTo=3Dvirtlockd.socket -After=3Dvirtlockd.socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlockd-admin-sock diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-ad= min.socket.in index 1d18fe6f56..e0d35cbcf3 100644 --- a/src/logging/virtlogd-admin.socket.in +++ b/src/logging/virtlogd-admin.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3DVirtual machine log manager socket -BindsTo=3Dvirtlogd.socket -After=3Dvirtlogd.socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlogd-admin-sock diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index 6df038d95a..ba060eaea4 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3D@name@ admin socket -BindsTo=3Dlibvirtd.socket -After=3Dlibvirtd.socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/libvirt-admin-sock diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index 6797517c50..d2ab7ba4f2 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3D@name@ local read-only socket -BindsTo=3Dlibvirtd.socket -After=3Dlibvirtd.socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/libvirt-sock-ro diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so= cket.in index 8b8fbcd01a..e32daddf25 100644 --- a/src/remote/libvirtd-tcp.socket.in +++ b/src/remote/libvirtd-tcp.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3D@name@ non-TLS IP socket -BindsTo=3Dlibvirtd.socket -After=3Dlibvirtd.socket =20 [Socket] ListenStream=3D16509 diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so= cket.in index fefda22c6b..2f34e8e0cd 100644 --- a/src/remote/libvirtd-tls.socket.in +++ b/src/remote/libvirtd-tls.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3D@name@ TLS IP socket -BindsTo=3Dlibvirtd.socket -After=3Dlibvirtd.socket =20 [Socket] ListenStream=3D16514 diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in index a4faeb7da8..dc2cb737ce 100644 --- a/src/virtd-admin.socket.in +++ b/src/virtd-admin.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3D@name@ admin socket -BindsTo=3D@service@.socket -After=3D@service@.socket Conflicts=3Dlibvirtd-admin.socket After=3Dlibvirtd-admin.socket @socket_unit_extra@ diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in index 829c2e8b1f..ef1716e3f3 100644 --- a/src/virtd-ro.socket.in +++ b/src/virtd-ro.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3D@name@ local read-only socket -BindsTo=3D@service@.socket -After=3D@service@.socket Conflicts=3Dlibvirtd-ro.socket After=3Dlibvirtd-ro.socket @socket_unit_extra@ diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in index 2873c35135..26ead32789 100644 --- a/src/virtd-tcp.socket.in +++ b/src/virtd-tcp.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3D@name@ non-TLS IP socket -BindsTo=3D@service@.socket -After=3D@service@.socket Conflicts=3Dlibvirtd-tcp.socket After=3Dlibvirtd-tcp.socket @socket_unit_extra@ diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in index 2d4d589c8a..47da9317d6 100644 --- a/src/virtd-tls.socket.in +++ b/src/virtd-tls.socket.in @@ -1,7 +1,5 @@ [Unit] Description=3D@name@ TLS IP socket -BindsTo=3D@service@.socket -After=3D@service@.socket Conflicts=3Dlibvirt-tls.socket After=3Dlibvirt-tls.socket @socket_unit_extra@ --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668438; cv=none; d=zohomail.com; s=zohoarc; b=IfVKxv+bYw3vbfZDTxpkwtljJzuEBCkRYr3fAQx6C0anINstO5C2Q3MWb5p7uUK8FuoRjeIv0F9aVb7LZh76eolc+eFTWTqGHRhxi77wK3iS50gwJ+1qDUzbwELLQ3f5lX1Eg1RFAfvCamigqWi9X17dIX/D+l3SYz3hyeXA/9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668438; 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=dz7JVXY30TG5QvXdW462BGW/JNhCFaltdUJLamP0zCA=; b=O0o+/OiIQemmUHuId1X5YZPVmwa/7dxk8ZuaiJ9EaiONOQz9OWzDZOvUAr/34upCe9qc86L41lWUqrkc8j/9UNW5CiSJYX17oxHna/RqU3wiqnSyXHXxaKppqNPwVFnH1a6CY7LCJ7zS+kN96iA9R7R1FbVnApkIe76NmvUwxhs= 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 1695668438857638.0622358874438; Mon, 25 Sep 2023 12:00:38 -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-163-aGCv9SPzNhSO4xLE_YKarQ-1; Mon, 25 Sep 2023 15:00:18 -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 1602D101B052; Mon, 25 Sep 2023 19:00:08 +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 F3DB62156A27; Mon, 25 Sep 2023 19:00:07 +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 5E86B1946A45; Mon, 25 Sep 2023 19:00:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 90DFC19466F8 for ; Mon, 25 Sep 2023 19:00:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6D171711286; Mon, 25 Sep 2023 18:59:55 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D256A711293 for ; Mon, 25 Sep 2023 18:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668437; 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=dz7JVXY30TG5QvXdW462BGW/JNhCFaltdUJLamP0zCA=; b=ioyXczR26SQW45XLAghKONrN9xMSWIVcN3zYkHFqsYPFfQ8tERj4VziBm0CaI5LqAZDtE1 TTekfqbCTwwagg1BFrrI2rqwaxP77AzALtOrbq3W19wI7cV49vERVpC3YOK3nxE3iKrgPC knT9nZrVzT7TvK/pwq/EydxtVnoA7sQ= X-MC-Unique: aGCv9SPzNhSO4xLE_YKarQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 41/42] systemd: Improve and unify unit descriptions Date: Mon, 25 Sep 2023 20:58:39 +0200 Message-ID: <20230925185840.880191-42-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668439243100001 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 --- 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 f6c443f3c6..cbac6e2de6 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_unit_extra': [ 'Wants=3Dsystemd-machined.service', 'After=3Dsystemd-machined.service', 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 ad8d9b757f..5affd1e7c5 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_unit_extra': [ 'Wants=3Dvirtlockd.socket', 'After=3Dvirtlockd.socket', 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 a773b511bd..90077b4915 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 @name@ daemon admin socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlockd-admin-sock diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index ebf8cb9d5a..d1ebbda2b7 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 @name@ daemon BindsTo=3Dvirtlockd.socket BindsTo=3Dvirtlockd-admin.socket After=3Dvirtlockd.socket diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket= .in index 1cd50c70ec..5dba9dea00 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 @name@ 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 e0d35cbcf3..34f27154a2 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 @name@ daemon admin socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlogd-admin-sock diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 72743a61ae..bfcc43d1b7 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 @name@ daemon BindsTo=3Dvirtlogd.socket BindsTo=3Dvirtlogd-admin.socket After=3Dvirtlogd.socket diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in index 0b85af927b..218d30e5ec 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 @name@ daemon socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/virtlogd-sock diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 9b933023dd..8e513c870d 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_unit_extra': [ 'Wants=3Dsystemd-machined.service', 'After=3Dsystemd-machined.service', diff --git a/src/network/meson.build b/src/network/meson.build index d1a2338d1b..1974385ca9 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_service_extra': [ 'KillMode=3Dprocess', ], 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 bf900e3f14..2a4a8836e2 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_unit_extra': [ 'Requires=3Dvirtlogd.socket', 'Wants=3Dvirtlockd.socket', diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index ba060eaea4..7d7416618c 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 @name@ daemon admin socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/libvirt-admin-sock diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index d2ab7ba4f2..cdbebcd2e8 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 @name@ daemon read-only socket =20 [Socket] ListenStream=3D@runstatedir@/libvirt/libvirt-sock-ro diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so= cket.in index e32daddf25..d0da35b8bb 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 @name@ daemon non-TLS IP socket =20 [Socket] ListenStream=3D16509 diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so= cket.in index 2f34e8e0cd..d95da1558b 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 @name@ daemon TLS IP socket =20 [Socket] ListenStream=3D16514 diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index a2c3c8f8fa..3b9819c3bc 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -1,5 +1,5 @@ [Unit] -Description=3DVirtualization daemon +Description=3Dlibvirt @name@ 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..cab3cfe971 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 @name@ 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 90b8af4e41..b01e8acd18 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_unit_extra': [ 'After=3Discsid.service', 'After=3Dremote-fs.target', diff --git a/src/vbox/meson.build b/src/vbox/meson.build index e07c87eaaa..ad41ec21ee 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_unit_extra': [ 'After=3Dremote-fs.target', ], diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in index dc2cb737ce..6c2d7eed7a 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 Conflicts=3Dlibvirtd-admin.socket After=3Dlibvirtd-admin.socket @socket_unit_extra@ diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in index ef1716e3f3..316468bf54 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 Conflicts=3Dlibvirtd-ro.socket After=3Dlibvirtd-ro.socket @socket_unit_extra@ diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in index 26ead32789..928760b872 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 Conflicts=3Dlibvirtd-tcp.socket After=3Dlibvirtd-tcp.socket @socket_unit_extra@ diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in index 47da9317d6..4532038c8d 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 Conflicts=3Dlibvirt-tls.socket After=3Dlibvirt-tls.socket @socket_unit_extra@ diff --git a/src/virtd.service.in b/src/virtd.service.in index b9e6345e8c..e940b05b19 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 BindsTo=3D@service@-ro.socket BindsTo=3D@service@-admin.socket diff --git a/src/virtd.socket.in b/src/virtd.socket.in index dc25e4d781..920d537e06 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 @socket_unit_extra@ diff --git a/src/vz/meson.build b/src/vz/meson.build index dceea1aaac..077c1f37fd 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_unit_extra': [ 'After=3Dremote-fs.target', ], --=20 2.41.0 From nobody Fri May 17 20:40:53 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=1695668455; cv=none; d=zohomail.com; s=zohoarc; b=UqNcQE13xahHsSajH0sWTIKO+zE48JerXJgJWnIA7BqlI37YJgTx0onyQ/GajNPAl8xFt30JN/apOvYLmEw46Msbh9GH6Gx9whNNP4R2c2fKuJmvzU7K9vkLyR7ivUWC6Q1BkMh3us3+9DPGCWYTXq5VF9yhqrfXnGrgJ16FeMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668455; 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=uK6BgVs0CCvPlN7cq3wBXTZGDCllcpCalhj9q/KO/68=; b=duZ8w+QLHW4+5OJJDCoJhBxZlSKxXO8i3jZMkdoCJTAUJP9qrTEOWy0ACV9Qp2o4nwUvfmrtUGw1TxfZUD2IYbyqpRSF7yiSh8uE3ar/btpDUkyaIMC8mWEVFngLFwhl9su/kTlWyxlMdjtp0PFFZY9tcD4zIX2ngSny6he+kVY= 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 1695668455110995.5346702488182; Mon, 25 Sep 2023 12:00:55 -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-681-NcFaTXZHMfydcicRtCAqLA-1; Mon, 25 Sep 2023 15:00:47 -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 BC25118162C8; Mon, 25 Sep 2023 19:00:06 +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 A18C8C15BB8; Mon, 25 Sep 2023 19:00:06 +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 04D851946A42; Mon, 25 Sep 2023 19:00:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 36C89194658F for ; Mon, 25 Sep 2023 18:59:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 28D83711295; Mon, 25 Sep 2023 18:59:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B091C711293 for ; Mon, 25 Sep 2023 18:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668454; 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=uK6BgVs0CCvPlN7cq3wBXTZGDCllcpCalhj9q/KO/68=; b=UwPur6eLKlb5sCXXqSzaK1y8Utenss7IBROx1/OC6mDcnKqS2KJcQrfMeaeIU98dyK7jT3 7YLJnD2cHfRucN5VRzz0Ns2ZMClJR5fuNLhBZAXJ6wffZhkTGLQgIbqyiiyfFcfI9Qy127 ariJli0yZ0tVg1Ejeq8TIGxYRwutSUg= X-MC-Unique: NcFaTXZHMfydcicRtCAqLA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 42/42] systemd: Move Documentation lines Date: Mon, 25 Sep 2023 20:58:40 +0200 Message-ID: <20230925185840.880191-43-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.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: 1695668456598100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 d1ebbda2b7..ed3b7c7792 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,11 +1,11 @@ [Unit] Description=3Dlibvirt @name@ daemon +Documentation=3Dman:virtlockd(8) +Documentation=3Dhttps://libvirt.org/ BindsTo=3Dvirtlockd.socket BindsTo=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 bfcc43d1b7..417770b139 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -1,11 +1,11 @@ [Unit] Description=3Dlibvirt @name@ daemon +Documentation=3Dman:virtlogd(8) +Documentation=3Dhttps://libvirt.org/ BindsTo=3Dvirtlogd.socket BindsTo=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 3b9819c3bc..2970e855d6 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -1,5 +1,7 @@ [Unit] Description=3Dlibvirt @name@ 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 e940b05b19..6b59803574 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 BindsTo=3D@service@-ro.socket BindsTo=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 @service_unit_extra@ =20 [Service] --=20 2.41.0