From nobody Mon May 25 23:59:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1776724680; cv=none; d=zohomail.com; s=zohoarc; b=CLn1ftJoDLnJahRSdSs1hQzY0q57hTQHrMIaVS68vSBUZr9Mpy5GXqnTGUD2npvBODGhuS3wgrSHNO54SXRgVqTJYD900YpgbJsXLvhHSDS0m6IO+bEhkdwzksYJjTPCPgfKm9Dn89TLzwKqWv6Udu7K7WJa1MY6VlHFIvpNH94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776724680; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=J3kDBQH89iezePBftcuA3k3i3Pk9gyix3sL4uSrAlds=; b=Kr18Ij/9Sgar+jmNcAf20Zk8KI1shBJCyqqeqCLk3E69aPv9Nv5I6TAGSYIKpmJ0tDIrj0ObmhJ0pyzjznlbxdhtU2qbmXX1Sc1mZZRJxBpVUw4xjwCQt48I7uVW+yHwPHWvQ150SDdF5nITLfXVceZwi+rCCNx6kCthe7QLonA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1776724680791340.1235975515799; Mon, 20 Apr 2026 15:38:00 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1EFA0418E1; Mon, 20 Apr 2026 18:38:00 -0400 (EDT) Received: from [172.19.199.6] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 036C9419F0; Mon, 20 Apr 2026 18:36:04 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 467913F30F; Mon, 20 Apr 2026 18:35:50 -0400 (EDT) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 81F7B41828 for ; Mon, 20 Apr 2026 18:35:49 -0400 (EDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488a9033b2cso40592665e9.2 for ; Mon, 20 Apr 2026 15:35:49 -0700 (PDT) Received: from localhost (75-169-0-97.slkc.qwest.net. [75.169.0.97]) by smtp.gmail.com with UTF8SMTPSA id 5a478bee46e88-2e53d4bdaf7sm15959603eec.25.2026.04.20.15.35.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2026 15:35:47 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1776724548; x=1777329348; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=J3kDBQH89iezePBftcuA3k3i3Pk9gyix3sL4uSrAlds=; b=HxQdkN+YDwGVZp/CLht+xZdB1HJrw3ByNX5+P/UF4FzPn7iy+GQriKnzZyhDALe0tP E9dWoCBTXskJBg1tg1oJXCwn2EWpHFj6rM7FbehuWAPy83lAvl7UcZdxMf5UvhjIyruj tNl6pROJUNEIlZaZh9NG2blypAF3LIoPOPUCEBqSdgohH4j9RuPlhd7hqTrrCCRClHCL eC+/oSp4FDXh6wlCxf/vlEImRf9BpCy4xETLB8V5sqwJ4fQ1dcqH3t+cuaf1VXMP1zGc xI+C+z9sdFPIVBDkUh53WhQaY0sjHVIXWxGmQsHoGCOX8waHErZqv5u+6T4pQQ2Lg/wf pRDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776724548; x=1777329348; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=J3kDBQH89iezePBftcuA3k3i3Pk9gyix3sL4uSrAlds=; b=f4kbj7aNY/mRCNTS2whN/K6ln8mVevWIczXAh75RVoyZ1URLEjxWhB5on8UhK57KLr wJRZ+iKKQT9CXYqIs7GzRyyy85CAA6vqsanAfqJAJtB1RxVHs2tsPaJpJ4KpKTnsn2gA UcFJea4XMmWuNzzHbOE3UMdYhxV4adi2zZx/ggrbMpfzexTkkICvRGuZuQHkrXCGwrze 5DurHQMf79prEAetABaZ8zxcVlpul3vWmEgf/S8SY4uo8MsXT31vHCpjt81oVNRQc4bj 8bpsnOf7MYdKoGpXIEVrQvgqeZWsQrdlG0IoIE9Lt3kdt0Rpf+I0vBQUb8ve3RYgRw4w jmLg== X-Gm-Message-State: AOJu0Yy4E7hlAtZQrEgif7LHPRgIv2+tkdwDH7rDNyLLdXh6N5XvjcdA W4BpOuTSK8/3lda3wH+semRc6so5q5JkGBxBWGvSpULten31ZtgZPfzV5Fxoy8awV4Wi02GJ4J0 VGt3ViAQ= X-Gm-Gg: AeBDieuXU22c94GqCr7FRb+BtS6Kz6Dnusi2RRrCEwAZL97h0zXyUVerAVnhj/5SdU/ L/ruMP5orXtH7QJfGtTdhJDxpwU6J3jm/nxAIotHPvMrrhGmFPzAHkAigweY5rQeIFoM7ysBd+m jjbq9whxvX1ExiI2hfbRnEce90uXHR4vQ5SZTdlOrjlthm01t3MbZ3sRKe5zJmG136O9dCNDIDc uzaEk67n0AOHO91RSBlW+mly2wszo2YxWPjK2uBJQq54hLMc/OqWgUNzHSrkQIl+ICqzWP+5Xyi N7uJID6HCjdPyu+t0FvDe1gb43ic3cyDvMEZgRRX8Iq9SXW2oU11xdfFQxdKZX8W3yzbFGPCsYy i15YxWoWrVvJTISprThGOQwZO7t51h0pq5cMNGdgmfWTfz+QPeBkvqImr5zsL9Jcw9QuJIMIv2K vevw78VpBGf62TJLcROwQozu9cqVMe7iqGnOke5c3+lgqNCk3ejxOGk7EKJfc= X-Received: by 2002:a05:600c:5294:b0:486:fa35:aef2 with SMTP id 5b1f17b1804b1-488fb73d53bmr205276435e9.4.1776724548420; Mon, 20 Apr 2026 15:35:48 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH 1/3] build: Remove unused libvirtd_socket_unit_files Date: Mon, 20 Apr 2026 16:34:32 -0600 Message-ID: <20260420223543.328320-2-jfehlig@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260420223543.328320-1-jfehlig@suse.com> References: <20260420223543.328320-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OUG4ZMDDCDMZW5IHHNTV6AR6YQYNRN7S X-Message-ID-Hash: OUG4ZMDDCDMZW5IHHNTV6AR6YQYNRN7S X-MailFrom: jfehlig@suse.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1776724682268154100 Content-Type: text/plain; charset="utf-8" From: Jim Fehlig libvirtd_socket_unit_files is declared in src/remote/meson.build but never used. Remove it. Signed-off-by: Jim Fehlig --- src/remote/meson.build | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/remote/meson.build b/src/remote/meson.build index dfd61df62f..c9d8e921b2 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -130,14 +130,6 @@ foreach name : libvirt_conf_files set_variable(name['virtd'].underscorify(), tmp) endforeach =20 -libvirtd_socket_unit_files =3D [ - 'libvirtd.socket', - 'libvirtd-ro.socket', - 'libvirtd-admin.socket', - 'libvirtd-tcp.socket', - 'libvirtd-tls.socket', -] - logrotate_files =3D [ 'libvirtd.qemu', 'libvirtd.lxc', --=20 2.51.0 From nobody Mon May 25 23:59:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1776724781; cv=none; d=zohomail.com; s=zohoarc; b=has9h7DH0u69ohvNMCd2eCXGDa0A46ZEBtjndI3nwxMj39CooPWCtdx3W20Jo3sMtYjbyb7xkYg8Ho2w80L7gNq/pYJeDhIk30A8+ltvw5N5lfvKyLiuV7W6V3JzXj59Lg/eGaMwYNmB34AkYPofnB+awX2xWGJ9Gn/jqH/SArE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776724781; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=Fqesb1swCS4Izb01pYJJQRifBmkK6rxOKR20GLKaNIY=; b=hh9v0zdXAuswsqEu7FuAFrQBcYoVO0HbzSNEF9t+8c406d3W1HFhjR+56vQOEHblswJleGsd6bNCGYStOlzaDtEmvqpqeyQwqcz6YaV+DzR5V9ZBW/ntmYR2exdJpqyDG2RdAk9DyDAr7fF9/GPvivCpwBSKFFLbkDUUYh14c0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1776724781294672.4237350472396; Mon, 20 Apr 2026 15:39:41 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id AB1274185C; Mon, 20 Apr 2026 18:39:40 -0400 (EDT) Received: from [172.19.199.6] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 5795F41AB2; Mon, 20 Apr 2026 18:36:11 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 864EE3F30F; Mon, 20 Apr 2026 18:35:53 -0400 (EDT) Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 446AE41828 for ; Mon, 20 Apr 2026 18:35:52 -0400 (EDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-488ab2db91aso47507335e9.3 for ; Mon, 20 Apr 2026 15:35:52 -0700 (PDT) Received: from localhost (75-169-0-97.slkc.qwest.net. [75.169.0.97]) by smtp.gmail.com with UTF8SMTPSA id a92af1059eb24-12c74a20c55sm16838365c88.13.2026.04.20.15.35.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2026 15:35:50 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1776724551; x=1777329351; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Fqesb1swCS4Izb01pYJJQRifBmkK6rxOKR20GLKaNIY=; b=fJvznPByutPXaDUnZcd1ZxVtfN+RzQermyghlWY2iTlzgcBS1b+I830EAEmTpVIGN9 GfzKHXfMQnJ/bIH7vjQ1RA2MAX8e1ahHxPGEW2DfNzo43YPaHn/aEboxp+HW8YWSUITr JHghFsoTshfYQzuFWOwHb8qX8tViuaR79qMgBphIZoq8KLhCWyGbDly1nDBbxyPkAJ+G wLl166Cps/pOI469BrwZzoSevA7JFh2fNpqXA41Rf6JLtcRK4FMu/ii8AUcqJVahrjMz FWtZvSsxbIvi9qIGXgfgVeEmmIyYbMrzCHSrSxurSkkTptm57XH+Se53wAMOb+yWvCCh pccQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776724551; x=1777329351; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Fqesb1swCS4Izb01pYJJQRifBmkK6rxOKR20GLKaNIY=; b=sBcnnagKpwzQeBrUFSy4kYMthbdVlqDizrLGLlcJMf4QTHMpRRPXZm/DexN2RMJfyI 7QbuH2CxTUc1DEZrp6kx3KdcsGpk88yaq+M7g7XlEOdjCbsbnp3n5z1n+s3lbpss/e43 czk4bAlYKv/aCQZfi+Z1WfEWlZTvpnBL+SptZh3lww6/jymhuumMiWjcyst1WVLj/3qy 4jVr2Hpe5+3gyvEv8vJanT8Fh7CZHdhAtTgZU5et08EG9IfQLpBzozj5m3/1CzL4LLEx iAeXleAu24Fod67eCntKNzS383Y/bUJLgkFmx9veVHoKVR/xf/NbKqvPpo1mIJ6jdFxa /+5Q== X-Gm-Message-State: AOJu0YyM2LiISAFYirq6NYCgs3WRC0Ff/oiQfIT3lY9/FR+eiA8BSAuI pygsFyUVsg7MPIhHPi9RRFUZJstKzG0IC98EmEsJw9Po5FAXV8bmtlds2tOEs99znfAU0ULWglU ZTuI+pys= X-Gm-Gg: AeBDieulKtVWZcVYquctS0NQ0SFR+c9fmqTQZ0VIvv9KdDbwpjqXPFoI/uHmei10Wvc d0oUacfVxCwqdAg2rN9wA3+L3dDefORBxFjqUL70aUDyS2dMfWds71zsnhOC9BentEIweVXFV+/ uEv7CsCGkuuPQiaBpwNH2Ok7757qgIiQiWyIuVXu98FDqs6R7BMpkEmgIcOfuQo896z+EJjGgEI GqzIlnVENWQk5alzC57+AdEpAMtRWj1RJtOtCN8MVV1QkKkNOYfUw+P3u84MQyo/QPJMrXxauPx Pq9OUA/nrwHmwumsaQt6KjivnFcFjbpYhS6ATs9vV0D47JjUPoaBadg+VLKXjju2591SW87rXHm uW11p191NXqR/qvoIgEqQSfEvE/vVuIVRRlNDthA1j4tE2kcfa84tQideDhPZeMpfpyKBzIUZUB CAxqXEFfc939t3nN9cxvypy9e19AdDQ42EZ9aznq1BZ2fmVW/L X-Received: by 2002:a05:600c:314b:b0:488:c282:e78c with SMTP id 5b1f17b1804b1-488fb77870fmr204502365e9.19.1776724551131; Mon, 20 Apr 2026 15:35:51 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH 2/3] build: Add option to disable building libvirtd Date: Mon, 20 Apr 2026 16:34:33 -0600 Message-ID: <20260420223543.328320-3-jfehlig@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260420223543.328320-1-jfehlig@suse.com> References: <20260420223543.328320-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PNEZYLJZRIOXGBAWLYKDOM5TBMH7AZQ6 X-Message-ID-Hash: PNEZYLJZRIOXGBAWLYKDOM5TBMH7AZQ6 X-MailFrom: jfehlig@suse.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1776724783818154100 Content-Type: text/plain; charset="utf-8" From: Jim Fehlig Add an option to disable building the monolithic libvirtd, e.g. meson configure -Dlibvirtd=3Ddisabled build-dir There's an existing option called driver_libvirtd, but it's intended to disable building not only libvirtd, but all stateful, daemon-based drivers. driver_libvirtd is also used by various libvirt-ci projects to get a minimalistic build. In short, it can't be used to disable building only the monolithic daemon. Introduce a new 'libvirtd' option to do that. Signed-off-by: Jim Fehlig --- docs/manpages/meson.build | 2 +- meson.build | 10 ++++ meson_options.txt | 2 + src/remote/meson.build | 78 ++++++++++++++++--------------- src/security/apparmor/meson.build | 5 +- tests/meson.build | 2 +- 6 files changed, 58 insertions(+), 41 deletions(-) diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index 6504e68a71..ee686bfd1b 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -23,7 +23,7 @@ docs_man_files =3D [ { 'name': 'virt-qemu-sev-validate', 'section': '1', 'install': conf.has(= 'WITH_QEMU') }, =20 { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LI= BVIRTD') }, - { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD= ') }, + { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_MONOLITH= IC_LIBVIRTD') }, { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('W= ITH_SANLOCK') }, { 'name': 'virt-ssh-helper', 'section': '8', 'install': conf.has('WITH_L= IBVIRTD') }, { 'name': 'virtbhyved', 'section': '8', 'install': conf.has('WITH_BHYVE'= ) }, diff --git a/meson.build b/meson.build index 8a49d07f11..9d95127d80 100644 --- a/meson.build +++ b/meson.build @@ -1483,6 +1483,15 @@ if udev_dep.found() and not pciaccess_dep.found() error('You must install the pciaccess module to build with udev') endif =20 +# build daemon +if not get_option('libvirtd').disabled() + if not conf.has('WITH_REMOTE') + if get_option('libvirtd').enabled() + error('remote driver is required for libvirtd daemon') + endif + endif + conf.set('WITH_MONOLITHIC_LIBVIRTD', 1) +endif =20 # build driver options =20 @@ -2260,6 +2269,7 @@ driver_summary =3D { 'VBox': conf.has('WITH_VBOX'), 'VMware': conf.has('WITH_VMWARE'), 'vz': conf.has('WITH_VZ'), + 'Mono libvirtd': conf.has('WITH_MONOLITHIC_LIBVIRTD'), } summary(driver_summary, section: 'Drivers', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index e12ace4e11..8592880b7b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -52,6 +52,8 @@ option('udev', type: 'feature', value: 'auto', descriptio= n: 'udev support') option('wireshark_dissector', type: 'feature', value: 'auto', description:= 'wireshark support') option('wireshark_plugindir', type: 'string', value: '', description: 'wir= eshark plugins directory for use when installing wireshark plugin') =20 +# build monolithic daemon option +option('libvirtd', type: 'feature', value: 'auto', description: 'monolithi= c libvirt daemon') =20 # build driver options option('driver_bhyve', type: 'feature', value: 'auto', description: 'bhyve= driver') diff --git a/src/remote/meson.build b/src/remote/meson.build index c9d8e921b2..b02c7193ff 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -176,47 +176,49 @@ if conf.has('WITH_REMOTE') if conf.has('WITH_LIBVIRTD') guest_unit_files +=3D files('virt-guest-shutdown.target') =20 - virt_daemons +=3D { - 'name': 'libvirtd', - 'c_args': [ - '-DSOCK_PREFIX=3D"libvirt"', - '-DDAEMON_NAME=3D"libvirtd"', - '-DWITH_IP', - '-DLIBVIRTD', - ], - } + if conf.has('WITH_MONOLITHIC_LIBVIRTD') + virt_daemons +=3D { + 'name': 'libvirtd', + 'c_args': [ + '-DSOCK_PREFIX=3D"libvirt"', + '-DDAEMON_NAME=3D"libvirtd"', + '-DWITH_IP', + '-DLIBVIRTD', + ], + } =20 - virt_daemon_confs +=3D { - 'name': 'libvirtd', - 'with_ip': true, - } + virt_daemon_confs +=3D { + 'name': 'libvirtd', + 'with_ip': true, + } =20 - virt_daemon_units +=3D { - 'service': 'libvirtd', - 'name': 'legacy monolithic', - 'service_in': files('libvirtd.service.in'), - 'service_extra_in': [ - files('libvirtd.service.extra.in'), - systemd_service_limitnofile_extra_in, - systemd_service_tasksmax_extra_in, - systemd_service_limitmemlock_extra_in, - ], - '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'), - 'socket_extra_in': [ - files('libvirtd.socket.extra.in'), - ], - } + virt_daemon_units +=3D { + 'service': 'libvirtd', + 'name': 'legacy monolithic', + 'service_in': files('libvirtd.service.in'), + 'service_extra_in': [ + files('libvirtd.service.extra.in'), + systemd_service_limitnofile_extra_in, + systemd_service_tasksmax_extra_in, + systemd_service_limitmemlock_extra_in, + ], + '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'), + 'socket_extra_in': [ + files('libvirtd.socket.extra.in'), + ], + } =20 - openrc_init_files +=3D { - 'name': 'libvirtd', - 'in_file': files('libvirtd.init.in'), - 'confd': files('libvirtd.confd'), - } + openrc_init_files +=3D { + 'name': 'libvirtd', + 'in_file': files('libvirtd.init.in'), + 'confd': files('libvirtd.confd'), + } + endif =20 virt_daemons +=3D { 'name': 'virtproxyd', diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meso= n.build index 09d9fac02c..7585fb7100 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -1,10 +1,13 @@ apparmor_gen_profiles =3D [ 'usr.lib.libvirt.virt-aa-helper', - 'usr.sbin.libvirtd', 'usr.sbin.virtqemud', 'usr.sbin.virtxend', ] =20 +if conf.has('WITH_MONOLITHIC_LIBVIRTD') + apparmor_gen_profiles +=3D ['usr.sbin.libvirtd'] +endif + apparmor_gen_profiles_conf =3D configuration_data({ 'sysconfdir': sysconfdir, 'sbindir': sbindir, diff --git a/tests/meson.build b/tests/meson.build index 83aa0104bb..42223a8e73 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -734,7 +734,7 @@ if conf.has('WITH_TEST') ] endif =20 -if conf.has('WITH_LIBVIRTD') +if conf.has('WITH_MONOLITHIC_LIBVIRTD') test('libvirtd fail with missing config', libvirtd_prog, args: [ '--config=3Dno-such-conf', '--timeout=3D5' ], --=20 2.51.0 From nobody Mon May 25 23:59:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1776724842; cv=none; d=zohomail.com; s=zohoarc; b=iZA0YmOZtyajHLZ5cgAvagDEEKEuSrYBPq8aU6aer2LeRi5qkOWsFV0vvoCMHA68rxTU9So5WnE+qAx6Q2jJ8jmrs3BAMJeDj93gkapp038pvQgtfgl9EwDZjcNtQ9oqthjSIYh89MOJMgE6gM0TyODZGL3y6GWnr0286dwDO9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776724842; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=7vC/xLqxLEX3jHKJok3a8RLRRl5HPAsVo+jdDOOD6sU=; b=SOFYVv6p/vaqImGJ/1j2NxTrA6iS4rgcJkNUPXrcsJVRzZRb22aHpVSmWVA1Sh2xmN5FzT+ldQyWvz1kxlo9iGJMo/djxcw4Yb2yr7VBYp109MwLfohFwWABHBIHjSsUjGGGjjUCPiWv2ysHdsouLwG7Q7Rwhgnr6m5gcubV/DM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1776724842763410.8264329431919; Mon, 20 Apr 2026 15:40:42 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 36E8A41856; Mon, 20 Apr 2026 18:40:42 -0400 (EDT) Received: from [172.19.199.6] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 7271B41908; Mon, 20 Apr 2026 18:36:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id D99F84186D; Mon, 20 Apr 2026 18:36:05 -0400 (EDT) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 47C8F41870 for ; Mon, 20 Apr 2026 18:35:55 -0400 (EDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48984d29fe3so16757155e9.0 for ; Mon, 20 Apr 2026 15:35:55 -0700 (PDT) Received: from localhost (75-169-0-97.slkc.qwest.net. [75.169.0.97]) by smtp.gmail.com with UTF8SMTPSA id 5a478bee46e88-2e53d2cfd3esm16355470eec.21.2026.04.20.15.35.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2026 15:35:52 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1776724553; x=1777329353; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7vC/xLqxLEX3jHKJok3a8RLRRl5HPAsVo+jdDOOD6sU=; b=Pa0GCzmz/WCb77XNoWQPKXo+h2kwqQJKCozU04jsoeZXzpp8whTcMrT8exkpXNYKUp n7hMfADBC06T9KGLBTVmh7Z5FmvFUcnQoXpvMpxLo288ptuNETFirXIlJpuqi8A9FM8H bIYRMZCOc9wtbVmtn11EJs20OZBB3ufsqHbJFf+RZfWmd6S1PTnH+zjFkm5QR1Vbt6rB OtEucdZ5bnxSh1dmMSe/KAq4ObDHCTTehiJv7fdORTNbcSlNjc0jotyG4Ay1v3kiH4ZS A/QWkJYNEmHjTU2/cPbiUC6K/gFfOMx0t0YUY8IvrxfJTxmAP2mFD86dKCSDDsTrzZzb Jp3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776724553; x=1777329353; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=7vC/xLqxLEX3jHKJok3a8RLRRl5HPAsVo+jdDOOD6sU=; b=WbIdXubi7EuezpDOSaGUuQuTGzjNxmjmDVXi8JZSBcAXCyb2N5Ao7QowmkokkbCkJc n+sfqtviTsQQEDbgNLG2B/D/D/wktWCef3wfCNdJydyQ7yDWKOEwyVk7Nu/tt/4oh20K deeXTDEWV8KSr/PoR+VV7JbXJTVJkNbm+j9CBUoqYbqz0USgld234UrUiHzAD93O8y7X VhYSFC7eTzqs3yDFaSC/X5WBumW+Lasn0zy+JbFTjIWYWf7X5zXwsNH3G1TGASTGtOT5 TYoCGOU+XJkr+YOoQzhJJMkx+/5ocJan2yLhkbDHJbifhqA6YJJGTN0iBa/gT7Jo2ZHS aphg== X-Gm-Message-State: AOJu0Yx+DJ21Saq1t/1PJQOPJcqNrVV/QjfBI7Lvfq/vV6M15tAf6DaJ j8+K8wp+3Y8ve1Mvj/pYEo1qT37OdWOw7thUgJuW/mY5e2w4cXJ6ib0wTlamjCIm6JsFwTsklb/ goh9khSI= X-Gm-Gg: AeBDies/XdHY6iWs51MawiiTiQyMyf8SAwW9sLgtwkDOXnB0tmO1JlM1Xsnr7xOl3gA EHHZDNFIQRl3JieY5ctQlOzVZq0NpFIJEb9JKKtjoDD/76pBBOFvJQs0T0wkPBIq9iURHcVl87v keApcIrAGegIGK0385B3KMYfgwH2XkERztsWXE2N5zX4plLCI2FnF+1aNr48A8uuHsJ72o7ZISv fVRDu1ptPKKzYBQK8k6zd8hjAlsYREJXyzhSntJ8sO2K49gFN0sKSG3NeqrPdgkifk/jqGCBjKT yMfD7O0uPQ3GwWwa5iazUiKgmeHwsIRY33mDYPA22XOyecjMuaajyTELsD1btLKeewobwDs+/qF rVrKdYaSWGR82FSBl1z6hJJYr+e52i3Ryvq9WpartX7h6fAVgu4HkBkXGt6UdMa2cHZfdCS2k2w 66wk2jRmMXhstJg8SKgfNNayFrjYiHOQbMR6AXnyWkxKwEW7e1 X-Received: by 2002:a05:600c:c10e:b0:488:9439:880d with SMTP id 5b1f17b1804b1-488fb792c69mr149571825e9.29.1776724553395; Mon, 20 Apr 2026 15:35:53 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH 3/3] spec: Add option to enable/disable monolithic libvirtd Date: Mon, 20 Apr 2026 16:34:34 -0600 Message-ID: <20260420223543.328320-4-jfehlig@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260420223543.328320-1-jfehlig@suse.com> References: <20260420223543.328320-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CYA7U2CNBUXWYPUNLUBLT2DU5Y5LM33J X-Message-ID-Hash: CYA7U2CNBUXWYPUNLUBLT2DU5Y5LM33J X-MailFrom: jfehlig@suse.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1776724844712154100 Content-Type: text/plain; charset="utf-8" From: Jim Fehlig Make use of build option to enable/disable building the monolithic libvirtd Signed-off-by: Jim Fehlig --- libvirt.spec.in | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2fddfcd606..69acb3721e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -31,7 +31,10 @@ %define arches_numad %{arches_x86} %{power64} aarch64 %define arches_ch x86_64 aarch64 =20 -# The hypervisor drivers that run in libvirtd +# The monolithic libvirtd +%define with_libvirtd 0%{!?_without_libvirtd:1} + +# The hypervisor drivers that run in monolithic libvirtd, or a modular dae= mon %define with_lxc 0%{!?_without_lxc:1} %define with_libxl 0%{!?_without_libxl:1} %define with_vbox 0%{!?_without_vbox:1} @@ -304,7 +307,11 @@ URL: https://libvirt.org/ %endif Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz =20 +%if %{with_libvirtd} Requires: libvirt-daemon =3D %{version}-%{release} +%else +Obsoletes: libvirt-daemon < %(version)-%(release) +%endif Requires: libvirt-daemon-config-network =3D %{version}-%{release} Requires: libvirt-daemon-config-nwfilter =3D %{version}-%{release} %if %{with_libxl} @@ -1181,6 +1188,12 @@ echo "This RPM requires either Fedora >=3D %{min_fed= ora} or RHEL >=3D %{min_rhel}" exit 1 %endif =20 +%if %{with_libvirtd} + %define arg_libvirtd -Dlibvirtd=3Denabled +%else + %define arg_libvirtd -Dlibvirtd=3Ddisabled +%endif + %if %{with_qemu} %define arg_qemu -Ddriver_qemu=3Denabled %else @@ -1364,6 +1377,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) -Dsasl=3Denabled \ -Dpolkit=3Denabled \ -Ddriver_libvirtd=3Denabled \ + %{?arg_libvirtd} \ -Ddriver_remote=3Denabled \ -Ddriver_test=3Denabled \ %{?arg_esx} \ @@ -1542,6 +1556,10 @@ cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter= /*.xml \ # libvirt saves these files with mode 600 chmod 600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml =20 + %if ! %{with_libvirtd} +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd + %endif + %if ! %{with_qemu} rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug @@ -2075,6 +2093,7 @@ exit 0 %doc AUTHORS.rst NEWS.rst README.rst %doc libvirt-docs/* =20 + %if %{with_libvirtd} %files daemon %{_unitdir}/libvirtd.service %{_unitdir}/libvirtd.socket @@ -2091,6 +2110,7 @@ exit 0 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug %attr(0755, root, root) %{_sbindir}/libvirtd %{_mandir}/man8/libvirtd.8* + %endif =20 %files daemon-common %{_unitdir}/virt-guest-shutdown.target --=20 2.51.0