[PATCH 3/3] meson: Drop userfaultfd_sysctl option

It was introduced to make installation of the corresponding file conditional based on the build platform, but we've already changed the spec file so that all the decisions on the matter happen there, which makes having yet another meson option for the purpose unnecessary. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- libvirt.spec.in | 2 -- meson.build | 7 ------- meson_options.txt | 1 - src/qemu/meson.build | 2 +- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 70d2d37502..b3208eb21e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1363,7 +1363,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) -Dqemu_datadir=%{qemu_datadir} \ -Dtls_priority=%{tls_priority} \ -Dsysctl_config=enabled \ - -Duserfaultfd_sysctl=enabled \ %{?enable_werror} \ -Dexpensive_tests=enabled \ -Dinit_script=systemd \ @@ -1447,7 +1446,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) -Dstorage_vstorage=disabled \ -Dstorage_zfs=disabled \ -Dsysctl_config=disabled \ - -Duserfaultfd_sysctl=disabled \ -Dtests=disabled \ -Dudev=disabled \ -Dwireshark_dissector=disabled \ diff --git a/meson.build b/meson.build index dbd9cad6df..63983d2a10 100644 --- a/meson.build +++ b/meson.build @@ -2019,12 +2019,6 @@ elif get_option('sysctl_config').enabled() error('sysctl configuration is supported only on linux') endif -if not get_option('userfaultfd_sysctl').disabled() and conf.has('WITH_SYSCTL') - conf.set('WITH_USERFAULTFD_SYSCTL', 1) -elif get_option('userfaultfd_sysctl').enabled() - error('userfaultfd_sysctl option requires sysctl_config to be enabled') -endif - conf.set_quoted('TLS_PRIORITY', get_option('tls_priority')) @@ -2325,7 +2319,6 @@ misc_summary = { 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), 'TLS priority': conf.get_unquoted('TLS_PRIORITY'), 'sysctl config': conf.has('WITH_SYSCTL'), - 'userfaultfd sysctl': conf.has('WITH_USERFAULTFD_SYSCTL'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ') diff --git a/meson_options.txt b/meson_options.txt index ed91d97abf..182e28b3d1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -108,5 +108,4 @@ option('nbdkit', type: 'feature', value: 'auto', description: 'Build nbdkit stor option('nbdkit_config_default', type: 'feature', value: 'auto', description: 'Whether to use nbdkit storage backend for network disks by default (configurable)') option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management') option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs') -option('userfaultfd_sysctl', type: 'feature', value: 'auto', description: 'Whether to install sysctl config for enabling unprivileged userfaultfd') option('tls_priority', type: 'string', value: 'NORMAL', description: 'set the default TLS session priority string') diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 907893d431..7a0e908a66 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -209,7 +209,7 @@ if conf.has('WITH_QEMU') 'in_file': files('virtqemud.init.in'), } - if conf.has('WITH_USERFAULTFD_SYSCTL') + if conf.has('WITH_SYSCTL') install_data( 'postcopy-migration.sysctl', install_dir: prefix / 'lib' / 'sysctl.d', -- 2.43.0