On 2/26/26 01:14, Jim Fehlig via Devel wrote: > From: Jim Fehlig <[email protected]> > > Attempting to build with -Ddriver_libvirtd=disabled fails in many locations. > E.g. configuring the build with > > -Ddriver_qemu=enabled -Ddriver_libxl=enabled -Ddriver_lxc=enabled \ > -Ddriver_libvirtd=disabled > > Results in the following failure > > ../meson.build:1590:2: ERROR: Problem encountered: libvirtd is required for > libxenlight > > Several modular daemons and the common components are needlessly wrapped in > 'WITH_LIBVIRTD' conditionals. Remove the conditionals and other unneeded > dependencies on the monolithic daemon. > > Signed-off-by: Jim Fehlig <[email protected]> > --- > docs/manpages/meson.build | 10 +- > meson.build | 209 +++++++++++++--------------- > meson_options.txt | 14 +- > src/access/meson.build | 3 - > src/locking/meson.build | 281 +++++++++++++++++++------------------- > src/logging/meson.build | 104 +++++++------- > src/meson.build | 200 +++++++++++++-------------- > src/remote/meson.build | 174 +++++++++++------------ > src/security/meson.build | 2 +- > src/util/meson.build | 24 ++-- > tools/meson.build | 26 ++-- > 11 files changed, 503 insertions(+), 544 deletions(-) > > diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build > index 6504e68a71..9d11d153f7 100644 > --- a/docs/manpages/meson.build > +++ b/docs/manpages/meson.build > @@ -22,19 +22,19 @@ docs_man_files = [ > { 'name': 'virt-xml-validate', 'section': '1', 'install': true }, > { 'name': 'virt-qemu-sev-validate', 'section': '1', 'install': > conf.has('WITH_QEMU') }, > > - { 'name': 'libvirt-guests', 'section': '8', 'install': > conf.has('WITH_LIBVIRTD') }, > + { 'name': 'libvirt-guests', 'section': '8', 'install': true }, > { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') > }, > { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': > conf.has('WITH_SANLOCK') }, > - { 'name': 'virt-ssh-helper', 'section': '8', 'install': > conf.has('WITH_LIBVIRTD') }, > + { 'name': 'virt-ssh-helper', 'section': '8', 'install': true }, > { 'name': 'virtbhyved', 'section': '8', 'install': conf.has('WITH_BHYVE') > }, > { 'name': 'virtinterfaced', 'section': '8', 'install': > conf.has('WITH_INTERFACE') }, > - { 'name': 'virtlockd', 'section': '8', 'install': > conf.has('WITH_LIBVIRTD') }, > - { 'name': 'virtlogd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') > }, > + { 'name': 'virtlockd', 'section': '8', 'install': true }, > + { 'name': 'virtlogd', 'section': '8', 'install': true }, > { 'name': 'virtlxcd', 'section': '8', 'install': conf.has('WITH_LXC') }, > { 'name': 'virtnetworkd', 'section': '8', 'install': > conf.has('WITH_NETWORK') }, > { 'name': 'virtnodedevd', 'section': '8', 'install': > conf.has('WITH_NODE_DEVICES') }, > { 'name': 'virtnwfilterd', 'section': '8', 'install': > conf.has('WITH_NWFILTER') }, > - { 'name': 'virtproxyd', 'section': '8', 'install': > conf.has('WITH_LIBVIRTD') }, > + { 'name': 'virtproxyd', 'section': '8', 'install': true }, > { 'name': 'virtqemud', 'section': '8', 'install': conf.has('WITH_QEMU') }, > { 'name': 'virtsecretd', 'section': '8', 'install': > conf.has('WITH_SECRETS') }, > { 'name': 'virtstoraged', 'section': '8', 'install': > conf.has('WITH_STORAGE') },
So now these helper binaries are installed always. Ideally, we would have a meson variable that'd be set to true, if a statefull driver (like qemu, xen, lxc, ...) is enabled. But that will: a) get hairy quicky, b) is very likely to be forgotten to be updated when adding new driver. Since these binaries (well, in case of libvirt-guests, shell scripts) are dozen of kilobytes in size, there's no real harm installing them unconditionally. I'd give you my Reviewed-by if it wasn't for the next patch (esp. the second comment of mine). Michal
