From: Daniel P. Berrangé <berrange@redhat.com> Organize the driver_XXX options into three sets * Common options * Hypervisor drivers * Secondary drivers Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- meson_options.txt | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 8592880b7b..1ec3c865fc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -56,25 +56,25 @@ option('wireshark_plugindir', type: 'string', value: '', description: 'wireshark option('libvirtd', type: 'feature', value: 'auto', description: 'monolithic libvirt daemon') # build driver options +# dep:driver_remote +option('driver_libvirtd', type: 'feature', value: 'auto', description: 'libvirtd driver') +option('driver_remote', type: 'feature', value: 'auto', description: 'remote driver') +option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'direct', description: 'remote driver default mode') + + option('driver_bhyve', type: 'feature', value: 'auto', description: 'bhyve driver') +# dep:curl dep:json_c dep:driver_remote dep:driver_libvirtd +option('driver_ch', type: 'feature', value: 'auto', description: 'Cloud-Hypervisor driver') +option('ch_user', type: 'string', value: '', description: 'username to run Cloud-Hypervisor system instance as') +option('ch_group', type: 'string', value: '', description: 'groupname to run Cloud-Hypervisor system instance as') # dep:curl option('driver_esx', type: 'feature', value: 'auto', description: 'esx driver') # dep:openwsman option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hyper-V driver') -# dep:pciaccess dep:udev dep:driver_remote dep:driver_libvirtd -option('driver_interface', type: 'feature', value: 'auto', description: 'host interface driver') -# dep:driver_remote -option('driver_libvirtd', type: 'feature', value: 'auto', description: 'libvirtd driver') # dep:driver_remote dep:driver_libvirtd option('driver_libxl', type: 'feature', value: 'auto', description: 'libxenlight driver') # dep:driver_remote dep:driver_libvirtd option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux Container driver') -# dep:curl dep:json_c dep:driver_remote dep:driver_libvirtd -option('driver_ch', type: 'feature', value: 'auto', description: 'Cloud-Hypervisor driver') -option('ch_user', type: 'string', value: '', description: 'username to run Cloud-Hypervisor system instance as') -option('ch_group', type: 'string', value: '', description: 'groupname to run Cloud-Hypervisor system instance as') -# dep:driver_remote dep:driver_libvirtd -option('driver_network', type: 'feature', value: 'auto', description: 'virtual network driver') option('driver_openvz', type: 'feature', value: 'auto', description: 'OpenVZ driver') # dep:json_c dep:driver_remote dep:driver_libvirtd option('driver_qemu', type: 'feature', value: 'auto', description: 'QEMU/KVM driver') @@ -82,15 +82,19 @@ option('qemu_user', type: 'string', value: '', description: 'username to run QEM option('qemu_group', type: 'string', value: '', description: 'groupname to run QEMU system instance as') option('qemu_moddir', type: 'string', value: '', description: 'set the directory where QEMU modules are located') option('qemu_datadir', type: 'string', value: '', description: 'set the directory where QEMU shared data is located') -option('driver_remote', type: 'feature', value: 'auto', description: 'remote driver') -option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'direct', description: 'remote driver default mode') -option('driver_secrets', type: 'feature', value: 'auto', description: 'local secrets management driver') option('driver_test', type: 'feature', value: 'auto', description: 'test driver') option('driver_vbox', type: 'feature', value: 'auto', description: 'VirtualBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Location of directory containing VirtualBox XPCOMC library') option('driver_vmware', type: 'feature', value: 'auto', description: 'VMware driver') option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozzo driver') +# dep:pciaccess dep:udev dep:driver_remote dep:driver_libvirtd +option('driver_interface', type: 'feature', value: 'auto', description: 'host interface driver') +# dep:driver_remote dep:driver_libvirtd +option('driver_network', type: 'feature', value: 'auto', description: 'virtual network driver') +option('driver_secrets', type: 'feature', value: 'auto', description: 'local secrets management driver') + + option('secdriver_apparmor', type: 'feature', value: 'auto', description: 'use AppArmor security driver') # dep:secdriver_apparmor option('apparmor_profiles', type: 'feature', value: 'auto', description: 'install apparmor profiles') -- 2.56.0