From nobody Tue Jul 14 21:22:26 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=1782946728; cv=none; d=zohomail.com; s=zohoarc; b=mME3SXeIXIaEE4VQFQKUMSV1yDbe5S39j0BBq77xr1JEXJ43RvjEMAuzmSonfJTg0tlQNgPiLBm3Vr0x5F7P1lD3ugMPfOazbqcI/osUSmLmUxmOrgJjJV+dfVZVA2RuabpksqJmatDHedjibV16VGf+dPUSzMIvkrXEezqR+6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782946728; 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=SqF2kKcLxRlLJjuVjB67yvqmjSJVBAY6tnhnjdK/fnU=; b=aRUoEqXrftOaPk+tGGh7orCTiet/uQ/H7fEbsKLweXKkMw3b2URcK8s+7Qha6vLYPGbG5x8yxc4+3rY1RQBhvr30HnwaFqA7ODFAbvdGxudcZReRQZexxTMtmSE+YzXlPaGSQf9y0y53KgK9JAgAuJGPhn9JNUnWrmyXhaWZyLU= 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 1782946728371369.2516966057716; Wed, 1 Jul 2026 15:58:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C508141E2B; Wed, 1 Jul 2026 18:58:46 -0400 (EDT) Received: from [172.19.199.7] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 4A61543E2E; Wed, 1 Jul 2026 18:56:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 805B941DFB; Wed, 1 Jul 2026 18:56:33 -0400 (EDT) Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) (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 DF67941DF1 for ; Wed, 1 Jul 2026 18:56:32 -0400 (EDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-c126b8118afso177860466b.2 for ; Wed, 01 Jul 2026 15:56:32 -0700 (PDT) Received: from localhost ([69.51.117.128]) by smtp.gmail.com with UTF8SMTPSA id 006d021491bc7-6a310051cfcsm1070246eaf.8.2026.07.01.15.56.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 15:56:30 -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=1782946592; x=1783551392; 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=SqF2kKcLxRlLJjuVjB67yvqmjSJVBAY6tnhnjdK/fnU=; b=GbU8gmFsM0lNdux2D98LTGhFEgYfqTNLetIAdxnp6I1xzE6mmfUXM7W5eUeq/00yMA fe0a6cCx9x1Ee/o03SrRCiC6U5GfimXabHv+8tsCnrZ7ZVJJ6ZsxNYDm74jeNwBiumso qUZTBF7Vr27aOSrwJgT7PCvaB9O8g82eclra4sSsSXucLHk5gIRADlqdP9NuRNapZvJ5 5ijM8TTAjghgA5hW4bTCv2nxNNUjMw2jFLNGBTVik2S+ZWlV4v+QGdTQJMa0izmH4XJU WpnZCwZwbFGsolaSkca9KqgdXsla5oR6Z1jRyOP+PUIldkzz+4P+t4q+odOxUp+yKBSK YTxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782946592; x=1783551392; 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=SqF2kKcLxRlLJjuVjB67yvqmjSJVBAY6tnhnjdK/fnU=; b=P9/sMLviB4X1r7z8he8GLv7jhjS5mXfb/va7KEO83Vui2cfJ5DnuoyrNns6KCIYFz+ iUfBBB79RvwURzibQzG9hQO2zp9JDRjSH6QYnyjQ5rhwYs8tMPjT3DK5ag4R1ihsV60j k0KNkrRGTyMQ+Af4SUnuOqhrvkdpCoKX1qBqOXy3yWqrEHtI3jTBIYr49DivxWHXyumr fqQ1BwY/dDZGHJyoayCSCh//EqYjBEZOJxwsNRIHAy00qNN0sy3zVGNTHwwiWs1+b2mz IEhyX/BXvUm6qe0hTjmbgyUdFa080otYrlVitolZNvKe6bmniOpSMxfg/vnvQMkuN9Qp c7RA== X-Gm-Message-State: AOJu0YzkLZAkU+NnFNVdgpnUuN2uq51zkS/JJzpZihngUE+LEdJXT4Pu 2yAK3InUG41iTuVOJWvR0lA+5k28KJ+REYRcX1g70oJPoR113RMV6/NXggItqC2w8rcTLcv4zbM 6/WLVG4k= X-Gm-Gg: AfdE7cnjxJYZtq/0jmBZ3LuK0ej5wW7FSJjsUSobFogcAVRoq1DNGBYNMNowLTQseRr eirEQ8fLiPSc7XFnm95ey89NCPTsHBsN4dIyGD6JqRZ0O0ZCUtTrqJTdjc+4j4e6ZMIFyKwIwlt dEUKIn6B9S5Tt6UCux6jG++96osYdC5t7491z5VjoXUevAykKWfAi6aVJXrXWa1wjL7z4i/r+Gf Ebn/vfajK8/6XXQfD19B+kPAolBU2frG9U/SX1sJHjmI7lF/9IsrhRQ9A3Le6EBy+R8lFX5bm2f iwKzzRO9uy+GtXYTRDKSn5MabTLG8rW/HyZxTzZPRH94WUNzAEYlpMm/KcLlz8wtMS9T4+DAkG7 9NLKrYNXT4NNGFKdFYbJHpGRIYQpLfPVlRbYmofdpHH6g6ZD0ql7KpwXxFZ6Ohk4UOOhcdNhxdz FnsUM= X-Received: by 2002:a17:906:55a:b0:c11:fb01:c642 with SMTP id a640c23a62f3a-c12ae48f069mr105040966b.17.1782946591530; Wed, 01 Jul 2026 15:56:31 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH V2 1/3] build: Remove unused libvirtd_socket_unit_files Date: Wed, 1 Jul 2026 16:55:24 -0600 Message-ID: <20260701225626.1321838-2-jfehlig@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260701225626.1321838-1-jfehlig@suse.com> References: <20260701225626.1321838-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BBNZ4XO5RS6B4KST5V4JX7CPZQM2VZF7 X-Message-ID-Hash: BBNZ4XO5RS6B4KST5V4JX7CPZQM2VZF7 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: 1782946733191158501 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 Reviewed-by: Michal Privoznik --- src/remote/meson.build | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/remote/meson.build b/src/remote/meson.build index 25995fdbc2..3dab585d80 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 Tue Jul 14 21:22:26 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=1782946840; cv=none; d=zohomail.com; s=zohoarc; b=E0CIr/mu5/Vm8X2VOGSwLiL07JmPuyF9OkSZA8QWgQFLJCzeSNAFWq1a3OXmHjBMqwx7z8rg6OuYohd/lYPv/p/dW5snFht5N0crUQdPcqChwTviVIpCS9nGt40izaCr6ZGR07VWJtYoDsmmP01FvURIKgAc2kI1CoEZvVsHLWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782946840; 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=uUIkdPSLIPDdBvXB4eaSuyB8GuSUl0zGk3s5RoM8Afo=; b=Mando+tft6hTbp+fJxcEwNCEp5/kT4FzsdUdCYJanButmXMNX/8tTJlvUpMqrbHVpe12ktaDitsOZpInphXVL8hGV1a3dJm/rAUbHHUXsBA4RC+FWy/pMhkOwIAkD+czeKftCDozSqVoYJX50wWirBmNWOS1tev+Z5a3ZDcMxUw= 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 1782946840392739.0348614601984; Wed, 1 Jul 2026 16:00:40 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 409B141E0C; Wed, 1 Jul 2026 19:00:39 -0400 (EDT) Received: from [172.19.199.7] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 9109E41E1A; Wed, 1 Jul 2026 18:56:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 70BAF41DF2; Wed, 1 Jul 2026 18:56:36 -0400 (EDT) Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) (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 1B10841C91 for ; Wed, 1 Jul 2026 18:56:35 -0400 (EDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-493b7612475so9342385e9.3 for ; Wed, 01 Jul 2026 15:56:35 -0700 (PDT) Received: from localhost ([69.51.117.128]) by smtp.gmail.com with UTF8SMTPSA id 586e51a60fabf-44cbe841750sm1227293fac.3.2026.07.01.15.56.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 15:56:33 -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=1782946594; x=1783551394; 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=uUIkdPSLIPDdBvXB4eaSuyB8GuSUl0zGk3s5RoM8Afo=; b=Ad9ijFxgDQauHSUfUItfQApy7idaleTngq5VFNBgB66vJJRP2cwZJi1WBTkD6Bgi2j +1UYA9DDxqU8dSiNKbL7neHKSvRCrNH+hD5dt2irvcJ1nyHhFuh8D936wt8DTYxfDH8L O0utMQOo2mh+x5Dh89fl305Wm5L0kOhnR1K56goPVlbS3Mx3WQIP8MAc3ufr8iTQ4dOr n/F2SQFbZekrueaayGU2q9uLB9gKcqx9rKuPa0yL1ercAFFXMHNa6IZj575KydbIGQ2Y xabR/8Yk6lzIDWsSfnherfvcRR3SFIuyRkoJ+WM+DmWXR+ZeSiPJVvvHjhjrhnSEQNi+ 6Z0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782946594; x=1783551394; 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=uUIkdPSLIPDdBvXB4eaSuyB8GuSUl0zGk3s5RoM8Afo=; b=k0b7vlqQI6NyM7tfhIAgXSwzmxpkREZWOgE6mDKf5dkfwVLbd1Zg0LY+Teiats4hb4 xYoPhB56lCuiAaOyQX0on/kDkSEQO6a2LIQbefvzXWULUDjgo2KT6W75j0y1oNRTmW1C btMhVap+fmldtwobGqaoiwAkhkMYMq8eNBugg0QzP+SqN4l9d2FLUCTFcA3is3HMPm4S L0Vm+70poOepFcLkglShFoX38KbDOqsSPRJ/e73emxuIJrDEQzJkKXAmkGHjqyBYfnLj YTHA0DWNRgOkWmGcj9qLnw0eO8vC2kjs9t8yppcXsQiYyUSMQgaaCI+nR2AWy8ZB+Tsw T4EQ== X-Gm-Message-State: AOJu0Yy8uUev/o2rPrlZrhNrMboLHJ1Yk+PpSXhmPUpnlmPc8pyTO3rv C7p2LOWqImtEEN5Nd8RNRF6Ug3DN7TxzyyPD2Jdk6tT4Di7DRj2AmVE0KGVI/wstPGTWA9n+baw CGRPzCrc= X-Gm-Gg: AfdE7ck5nVA1/v+WVLs7BE/UDaKpcsrBuyGLILpa61+176Qz9+/dIpSbs4d/DveA9UA h98zZzudmzj61CMNytH/bUAX97arNr442ubFT4oBQQm7EzUGxcW638Ia3PoC7MGmrfenOhWa7SA XW84TW4cAGXLbvvaOWebGIyqx7rkOdTpEKKLMLkvzFEEC2eoccZx0d4BPOviMBkyEn5CdE8QjWF nLrbccclTyoiv4Q2z8zuUovwfA2DonmNzVFNR81aUKB0BZyQOJqefMEcC8PJ2ehgbmMpk48hEEl 8m0z5WeRV8CTqjHQXQrCMiDkum2LsgjVlJxmVcxbm5uueBhhU0e7Bw14hZxC/O/gh6LIJEbcetK O0aEyBhVfv3PQjNPj/4Q4HEshWtysE/GK3FOph9lezTVV1fgpD8nFRs44SOfy42E8yB7jz0S/Dr artpk= X-Received: by 2002:a05:600d:8496:10b0:493:c535:3934 with SMTP id 5b1f17b1804b1-493c53539admr5859785e9.36.1782946593846; Wed, 01 Jul 2026 15:56:33 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH V2 2/3] build: Add option to control building libvirtd Date: Wed, 1 Jul 2026 16:55:25 -0600 Message-ID: <20260701225626.1321838-3-jfehlig@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260701225626.1321838-1-jfehlig@suse.com> References: <20260701225626.1321838-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: I75BGUYTC3WIGFPAJ5YCTYCJ5PI7BC3O X-Message-ID-Hash: I75BGUYTC3WIGFPAJ5YCTYCJ5PI7BC3O 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: 1782946841928158500 Content-Type: text/plain; charset="utf-8" From: Jim Fehlig Add meson option 'libvirtd' to control building of the monolithic libvirtd, independent from the stateful, daemon-based drivers. E.g. meson configure -Dlibvirtd=3Ddisabled build-dir The new option defaults to 'auto' and will be enabled when 'driver_libvirtd' is enabled. Setting libvirtd=3Ddisabled skips building the libvirtd binary, and related items such as config files, systemd units, etc. The existing option 'driver_libvirtd' controls building libvirtd and all stateful, daemon-based drivers, making it unsuitable for disabling only the monolithic daemon. Additionally, 'driver_libvirtd' is used by the various libvirt-ci projects to produce a minimalistic build. Signed-off-by: Jim Fehlig Reviewed-by: Michal Privoznik --- docs/manpages/meson.build | 2 +- meson.build | 6 ++- meson_options.txt | 2 + src/remote/meson.build | 87 +++++++++++++++++-------------- src/security/apparmor/meson.build | 5 +- tests/meson.build | 2 +- 6 files changed, 60 insertions(+), 44 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 40d32c2697..ad1a5da1a5 100644 --- a/meson.build +++ b/meson.build @@ -1483,7 +1483,6 @@ if udev_dep.found() and not pciaccess_dep.found() error('You must install the pciaccess module to build with udev') endif =20 - # build driver options =20 remote_default_mode =3D get_option('remote_default_mode') @@ -1513,6 +1512,10 @@ if not get_option('driver_libvirtd').disabled() endif endif =20 +if not get_option('libvirtd').disabled() and conf.has('WITH_LIBVIRTD') + conf.set('WITH_MONOLITHIC_LIBVIRTD', 1) +endif + if not get_option('driver_bhyve').disabled() and host_machine.system() =3D= =3D 'freebsd' conf.set('WITH_BHYVE', 1) elif get_option('driver_bhyve').enabled() @@ -2252,6 +2255,7 @@ driver_summary =3D { 'Libvirtd': conf.has('WITH_LIBVIRTD'), 'libxl': conf.has('WITH_LIBXL'), 'LXC': conf.has('WITH_LXC'), + 'Monolithic libvirtd': conf.has('WITH_MONOLITHIC_LIBVIRTD'), 'Network': conf.has('WITH_NETWORK'), 'OpenVZ': conf.has('WITH_OPENVZ'), 'QEMU': conf.has('WITH_QEMU'), 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 3dab585d80..3525bc34b2 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -134,9 +134,14 @@ logrotate_files =3D [ 'libvirtd.qemu', 'libvirtd.lxc', 'libvirtd.libxl', - 'libvirtd', ] =20 +if conf.has('WITH_MONOLITHIC_LIBVIRTD') + logrotate_files +=3D [ + 'libvirtd', + ] +endif + if conf.has('WITH_REMOTE') remote_driver_lib =3D static_library( 'virt_remote_driver', @@ -176,47 +181,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', @@ -337,7 +344,7 @@ endif =20 # The monolithic libvirt daemon only attempts to load the # secrets encryption credentials if the secret driver is enabled -if conf.has('WITH_SECRETS') and init_script =3D=3D 'systemd' +if conf.has('WITH_MONOLITHIC_LIBVIRTD') and conf.has('WITH_SECRETS') and i= nit_script =3D=3D 'systemd' secret_dropin_conf =3D configuration_data({ 'localstatedir': localstatedir, }) 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 d1d26fcea2..ea50f89fb5 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 Tue Jul 14 21:22:26 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=1782946906; cv=none; d=zohomail.com; s=zohoarc; b=fQb79xfdAjApfDE3509iiDSLvqeBM/586nMHiSQ8zt1RRVs7Yw4pKzLNDPKYYBA8BaU26ourrKZXJ7YNMW4zCWg1EOeYcfrynvS1J7WglJjCG+Rmf2wZwoMa1NOJZJS48u6dIdtbNUBOjNnM0VbyOPEMKyiHU+6r/kPVnJtRTHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782946906; 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=qTWPfL9Nk7/KrHe1DwLW+eKRZzqziD5ODUzq/Kaoizw=; b=Z1lirCkOBwHi94psLE+cHRszTjn5dcomuQ7Dbl1oqABvqWazWB7NEn7SHt9SWWYvO8gZfNqSg6f7akwTCx4HOVnNLAlxNVzCjNd9F5sret7nnfwLndIOExX6pPawnt2op6GlObAm+KLOhuRY/v4ZPK3uDhYCjeyEgl1KcIrwZcw= 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 1782946906737123.55523899671505; Wed, 1 Jul 2026 16:01:46 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 71EED41E01; Wed, 1 Jul 2026 19:01:45 -0400 (EDT) Received: from [172.19.199.7] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id CF54B43EBC; Wed, 1 Jul 2026 18:57:05 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1D69841E44; Wed, 1 Jul 2026 18:56:50 -0400 (EDT) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (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 9EC8941E2D for ; Wed, 1 Jul 2026 18:56:37 -0400 (EDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-c125bcfd9a1so201669766b.1 for ; Wed, 01 Jul 2026 15:56:37 -0700 (PDT) Received: from localhost ([69.51.117.128]) by smtp.gmail.com with UTF8SMTPSA id 46e09a7af769-7eb544f3d24sm1164641a34.21.2026.07.01.15.56.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 15:56:35 -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=1782946596; x=1783551396; 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=qTWPfL9Nk7/KrHe1DwLW+eKRZzqziD5ODUzq/Kaoizw=; b=boMhcOpBgQM+yIMaAi4EXcATtHHuYKtgRisSIbBNV/f6U5uLWMJNiwMR9pj3k0d6Co Fa2utsmNKBmBrpYqkTcbxVUvsrm0rHe55O16NTNgzcx1n8bfwU9g0YnMtsq2KWlOZ+Ap X7PmnTdGTScvP0xDAZCmxk3Bh/40EM1oEasA3wCjAardwSJs/k/5VTPawRH1quuOZyfk 9q72FQ2OcWPZAAG/OyFP2wkhGdAvL2sqsx8cWSC8xSE6f44j7NC4xIfnsGdC5MKrKI9w +PUDbdk+YaISCSJh19Rz37Tb4GmUG2o8apk1KP6x79ZPGKMVVSkjynUAdgmmDWLcbUcv WjeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782946596; x=1783551396; 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=qTWPfL9Nk7/KrHe1DwLW+eKRZzqziD5ODUzq/Kaoizw=; b=ixiQeNgmbfRyBxKFXI7VGu8UKL5QnSxYFT0uT4iqGu0ENJJU5Gx4361WpfFcngW9uP AMOVSheskUOGGChktkz3x1w6/oO6KYEQBy8Xw0JLb39m+T5HjfgZyzgO91DktKEmItP5 uBlB+XIEbs4iNGGyPu5lEqb3+NzqCX2DYr0XqaCOgV6SDTGE/N5WuBZF0b2E1ZtPPkJC xxSS9gkh2nOsWRxjY6xvhIidDyX4pm8rd4i4l0r1VcFg0mSaCLXU9SUIGfbFo2lXv5bG H0a+yTJ42ss8uRRVCgCcSsrKqFcEq/VyNahtXwM39+unanQSKj5BNFQZpl5jdEAGBjJI /BZA== X-Gm-Message-State: AOJu0Yxp4/x7Jxxcmqx6UXi8Oqypx+Du8E4biHITYU0LdXw0qd5jmwtv GhVBJrDIb3st3a+GtP2xwu5Z86lSWqd4IhbSkuaIvrk/ybxSdkvwiPYhf53+Z3WpH/E0oJ3PVZ0 01mtBs94= X-Gm-Gg: AfdE7ck3XI69duQAEzqjysqTRaWaaEkAHet3OXje3gBfWm2ipq5fL5h8gR8LVrVxe/F izauq3HYlrseC8irR6KpOjaULZ9wJjHBnn79ExMnUHFq81a47IA/oNMUl2nFkGQcaRWVuyW2k8F kAdZogXOQoVZSRROziplerm43SBob5tAgGM+2/HDqGVBPfpP3giRBVV/W2Ukx0xAzCy7W9Pjowg K8b0OkxWNsvrrPxtIpkdTtLHuKqDygk4QdD9S9nMXD1VEdJyfuMCZnaPPOApTzueo2csMz0KYIR mOa/LOCet4h7YRVTlB/Shn/1QwIFZG9IPjLUf2uVPOdEPAOShVw0KAuHaK/noVIuz9CCM/BR15X KYsGhE4I0I55SuUVcSPGyajiH2116SGuAYRDcFoXD+Oo6cAo2OTZbY9dc7O8ME7Z9J3zWp5rWQ9 R6asE= X-Received: by 2002:a17:907:3cc3:b0:c12:83db:e3ea with SMTP id a640c23a62f3a-c12aa14229cmr173487266b.41.1782946596376; Wed, 01 Jul 2026 15:56:36 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH V2 3/3] spec: Add option to control building monolithic libvirtd Date: Wed, 1 Jul 2026 16:55:26 -0600 Message-ID: <20260701225626.1321838-4-jfehlig@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260701225626.1321838-1-jfehlig@suse.com> References: <20260701225626.1321838-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CGZ3THNJWBWH4QL5NM7GAYEMN3PKLCT3 X-Message-ID-Hash: CGZ3THNJWBWH4QL5NM7GAYEMN3PKLCT3 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: 1782946908412158500 Content-Type: text/plain; charset="utf-8" From: Jim Fehlig Signed-off-by: Jim Fehlig Reviewed-by: Michal Privoznik --- libvirt.spec.in | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f7f683e1c5..72fc08f9e7 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} @@ -303,7 +306,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} @@ -1180,6 +1187,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 @@ -1363,6 +1376,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} \ @@ -2074,6 +2088,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 @@ -2090,6 +2105,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