From nobody Mon May 6 18:55:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1612895959; cv=none; d=zohomail.com; s=zohoarc; b=Lv0MbxE1QF5GUaJ5u12AozG8pEBnQxK/r4aAIlhOO2jLNBEaoccm0NhUVpQJ4gJ77jH6zKF/ApLKKudIJMYys236/lvqQccX5LiMrzKGOaf14oj/evOAsZ88PXHWbrJcJp8BWLdn8xRKxcge628qlqsGiQDrtncE95WE9w7cF8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612895959; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=mD9ocmNjC/vbTQoSeCEtVAzMDOjxz6gZod+4fEGv2oQ=; b=mitk26mEaA5e/RzG1cArGOPgTGTYjxvkGVUVfHccIMkVjU1Bnd0DFfhS4ajme/QMLdsoQrn6FcOnKj9sVuvvPk2R1IZVBdy4S9Ea3dDkce8kspxPufkazO71GW/YNYQ+PkLSm+vhNSLheI6Gsd96Q0oY1oQN7WQFTvAgDrt3ZDM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612895959161380.7841765115071; Tue, 9 Feb 2021 10:39:19 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-tYyulRNHOo2rDhLoRKK6gw-1; Tue, 09 Feb 2021 13:39:15 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 818D8195D560; Tue, 9 Feb 2021 18:39:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9ED4C5D9C0; Tue, 9 Feb 2021 18:39:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B23BA18095CB; Tue, 9 Feb 2021 18:39:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 119Id1lQ032171 for ; Tue, 9 Feb 2021 13:39:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id 020B4A9E55; Tue, 9 Feb 2021 18:39:01 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EF3949D489 for ; Tue, 9 Feb 2021 18:38:58 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0B72D80231B for ; Tue, 9 Feb 2021 18:38:58 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-544-pgN3FfAKOtCCxMHFAO1YPA-1; Tue, 09 Feb 2021 13:38:56 -0500 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2058.outbound.protection.outlook.com [104.47.5.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-37-bN4NC3pzOPu6jvIEhYI_JQ-1; Tue, 09 Feb 2021 19:38:53 +0100 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM0PR04MB4131.eurprd04.prod.outlook.com (2603:10a6:208:65::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.25; Tue, 9 Feb 2021 18:38:52 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::bdae:2ddc:55e0:9099]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::bdae:2ddc:55e0:9099%5]) with mapi id 15.20.3846.025; Tue, 9 Feb 2021 18:38:52 +0000 Received: from linux-tbji.devlab.prv.suse.com (75.169.41.71) by AM4PR05CA0017.eurprd05.prod.outlook.com (2603:10a6:205::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.19 via Frontend Transport; Tue, 9 Feb 2021 18:38:51 +0000 X-MC-Unique: tYyulRNHOo2rDhLoRKK6gw-1 X-MC-Unique: pgN3FfAKOtCCxMHFAO1YPA-1 X-MC-Unique: bN4NC3pzOPu6jvIEhYI_JQ-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH] build: Remove unused 'conflicts' key from virt_daemon_unit Date: Tue, 9 Feb 2021 11:38:33 -0700 Message-ID: <20210209183833.28834-1-jfehlig@suse.com> X-Originating-IP: [75.169.41.71] X-ClientProxiedBy: AM4PR05CA0017.eurprd05.prod.outlook.com (2603:10a6:205::30) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 30cfd92c-b83f-4b29-38ba-08d8cd29f298 X-MS-TrafficTypeDiagnostic: AM0PR04MB4131: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 3ZEvyE2OGgZypC8IQl8zaM/YrhKOhu6VEAxpEJy6stSLa44cBgXIKq1dJbJfSDIA8d3que5GKWV2mt6fzZ01ax1R14VBESRRSIQZDMFpo0XjsZPbSSMznvh7PczE/L51H7v6JJUvwPwOF6Z/soVSO2aHhN3y3hgD7XEKOlFvTZTobeENI+PDzDJMsNJemzIFEOmvHfWUk8+Z3LEaqngf4jo6eE0LByeUMZ68YRY6Ksjlu7A3Kr8Zv/z3x05hdqBs+sLjT+qO8gShXQC2ZvhEdhcV2H6hgPPT/DvrUPwvhP/pLuQqIgT5fXlrFuehsVvPnb8fZEFbEGWSAEq4UsAaKQYWR0QbNoLD1RPzblbp0z7D+tU4Y2dpkFvqFNQn/mL2PjYNdU78v+BJGmh9NT1zINjpZLniIk0Tg+7xhYC8uADRsYK05Ci8+Dz/XgjNHkSDa9gC40FTC1HOdO/t/hITNJo+zYUImWRoPLusDfiAmpjHtuLDLrhb5jD9o7JGXix6hirBq7ETs2+WOEFrFcbGzA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(366004)(39860400002)(376002)(346002)(396003)(86362001)(1076003)(6666004)(6486002)(66946007)(5660300002)(4326008)(66476007)(66556008)(83380400001)(36756003)(7696005)(316002)(16526019)(26005)(107886003)(186003)(2616005)(52116002)(8936002)(2906002)(956004)(6916009)(478600001)(8676002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?C8j+647dksHZ8tapjKJ4vVIGdu0gsVeNRqD5tceEl3VmKNXM25IJqfkx9kaO?= =?us-ascii?Q?5yxpzOQRlvASZ7ROW1tcwdIPOm+B2fZNx6KuzmC0f1ttY8vXYi32IjquOORD?= =?us-ascii?Q?9SkeZ58B+hROLREntz8UUJA8pKBZpE+hrcJ4/Zh1lt/PzbSuaCRTsbkUbQGq?= =?us-ascii?Q?zy9bOLSjX7aeeQ4tgbFj4Ald26AGhxdnhkAz4kramzP6rCP8vOXuVys54lEt?= =?us-ascii?Q?AJIOtBnvv7n/mmiWTHXn4i2l+3K60fqFYWUZghekycL0ODsL4O5LYa8WQAG+?= =?us-ascii?Q?8klkBeY/msd3CZcdorcl2S8NDCtRlgEa48tHLljwZMNfiSqhrjdviUszea/A?= =?us-ascii?Q?ev7xBV1TqJn3l/d2qZJ7j4WUatxCPUfB36wJGqOJ5k6Vnq6EdB83BRqkttlU?= =?us-ascii?Q?aCyX/ieiSd/FgJl08Ta9wxpNghw2mT3YIvz+llcoxthBkQnBZBO6xuG1IB5f?= =?us-ascii?Q?SqaJP0irtbIxtKQhyEc/mPDdeL7XBzE6h8N4zcYcJ8eJNGAtNMluRFTFZgHn?= =?us-ascii?Q?waFCLxQBFK8lT32FBKAvHLvCrbcyNvxIxLQHNjA9qvTYAwl8N88ACbruKKmO?= =?us-ascii?Q?YVj2g1nt9Q/ccwJ1uPwCliWkSZdxxsQiFw0u/sy/1pB/lY4Ddi6X+krLhLqk?= =?us-ascii?Q?En45/qtS2vLmXONFXg8ir3Uk8gGjcY1A1sHghR6MqIg8k3K9FApfWWVY0byH?= =?us-ascii?Q?k0R76JNkW7sGTTAT/7rzwtFO0tZ/FIG9I7wST+zaYdjUSrsQom16oSWjrukw?= =?us-ascii?Q?TLwhpTtQGgYZ43A+ldmyZcaUH6IjUt4w1+an4owcxjRP8M9umSa/REXuJwlo?= =?us-ascii?Q?nxE5INfGXK6svhTNojuyUKnOW9g6FR1nXbIskli8vlsFAmpy6j7sPpuqf9Ou?= =?us-ascii?Q?1hraIOiqDGKBfERk+VGpF5m0oZtasAhrFjjEXcpV7LxdE/e1cmVBdoOo1yk9?= =?us-ascii?Q?VmOy+nWwuFl/hr0qf6QXFu1gzYRQrhw1p5qIDV0B6ZQIU+rYhk4emhY3TmUq?= =?us-ascii?Q?PB/gB02o7N61+IjZejmuSqqRcGZZ29CSsHOUDaxhWYRi2W52yOgxaqn6dwav?= =?us-ascii?Q?UsfzqFSr/drc5VxhZI8pNZM263+y8b6VB4tG7GFKwrcVqEKqNjNsLQeIXuX2?= =?us-ascii?Q?TTNvZ7kKd6ziH637fEO0x1lsIh/Ps6ba1uG5ZSStu1qRcwKVpFBTUOq+QB95?= =?us-ascii?Q?yoxrPiHs0Keec8lqF0LaPllU3uEiv2XLMnvoAxasdMQrQCSTP66GHlSkHDcF?= =?us-ascii?Q?jFm+Xl4alkx986uKtIy1BPZnr1llClwjSckoeu063lqQQfwBDyapU8GnDqAl?= =?us-ascii?Q?KUevEjQdc9upNE/GW8EV+6lG?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30cfd92c-b83f-4b29-38ba-08d8cd29f298 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2021 18:38:52.3496 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: THeRlPqmp4OYaMAvnR8Lez4HF7UtZbRHz0m7kpSPL3nSPrMqOvr2LnmT81vHza9bpvyBnJ03p+ch5EUn6Pgf2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4131 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 119Id1lQ032171 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The 'conflict' key in a virt_daemon_unit dictionary is not used when generating systemd service and socket files. The comment associated with the key claims the default is 'true', and a few build files needlessly set it to 'true' when defining their virt_daemon_unit. Remove the 'conflict' key and its use in the affect build files. Signed-off-by: Jim Fehlig Reviewed-by: Michal Privoznik --- src/interface/meson.build | 1 - src/libxl/meson.build | 1 - src/lxc/meson.build | 1 - src/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/interface/meson.build b/src/interface/meson.build index 1092c5a267..2d4e30362c 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -48,7 +48,6 @@ if conf.has('WITH_INTERFACE') 'name': 'Libvirt interface', 'sockprefix': 'virtinterfaced', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 783af6c667..9793899106 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -71,7 +71,6 @@ if conf.has('WITH_LIBXL') 'sockprefix': 'virtxend', 'sockets': [ 'main', 'ro', 'admin' ], 'deps': 'ConditionPathExists=3D/proc/xen/capabilities', - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/lxc/meson.build b/src/lxc/meson.build index f8e2a8852a..ad5c659dba 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -168,7 +168,6 @@ if conf.has('WITH_LXC') 'name': 'Libvirt lxc', 'sockprefix': 'virtlxcd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/meson.build b/src/meson.build index 74d932a32c..f13b85b74e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -201,7 +201,6 @@ guest_unit_files =3D [] # * 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 '') -# * conflicts - if the service conflicts with libvirtd (optional, true) virt_daemon_units =3D [] =20 # openrc_init_files diff --git a/src/network/meson.build b/src/network/meson.build index 3ec598c3f9..d6fb624bb7 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -65,7 +65,6 @@ if conf.has('WITH_NETWORK') 'name': 'Libvirt network', 'sockprefix': 'virtnetworkd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/node_device/meson.build b/src/node_device/meson.build index c4e4c3906b..15f9c3ad29 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -56,7 +56,6 @@ if conf.has('WITH_NODE_DEVICES') 'name': 'Libvirt nodedev', 'sockprefix': 'virtnodedevd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 715282ee77..a21e575925 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -54,7 +54,6 @@ if conf.has('WITH_NWFILTER') 'name': 'Libvirt nwfilter', 'sockprefix': 'virtnwfilterd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 08c1d20087..3898d23877 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -158,7 +158,6 @@ if conf.has('WITH_QEMU') 'name': 'Libvirt qemu', 'sockprefix': 'virtqemud', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/secret/meson.build b/src/secret/meson.build index d576d3218e..a487055cde 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -37,7 +37,6 @@ if conf.has('WITH_SECRETS') 'name': 'Libvirt secret', 'sockprefix': 'virtsecretd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/storage/meson.build b/src/storage/meson.build index 153ff6f846..915ae46f61 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -119,7 +119,6 @@ if conf.has('WITH_STORAGE') 'name': 'Libvirt storage', 'sockprefix': 'virtstoraged', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 3e608fa101..df0cfb40e8 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -62,7 +62,6 @@ if conf.has('WITH_VBOX') 'name': 'Libvirt vbox', 'sockprefix': 'virtvboxd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { diff --git a/src/vz/meson.build b/src/vz/meson.build index 2859dc7979..14f7280f66 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -52,7 +52,6 @@ if conf.has('WITH_VZ') 'name': 'Libvirt vz', 'sockprefix': 'virtvzd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } =20 openrc_init_files +=3D { --=20 2.29.2