From nobody Tue Feb 10 13:17:22 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1644917795432462.41006231376707; Tue, 15 Feb 2022 01:36:35 -0800 (PST) Received: from localhost ([::1]:37540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJuGA-0000vG-CY for importer@patchew.org; Tue, 15 Feb 2022 04:36:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJuCL-00048M-1K for qemu-devel@nongnu.org; Tue, 15 Feb 2022 04:32:37 -0500 Received: from [2a00:1450:4864:20::533] (port=45820 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJuCI-0008RF-HL for qemu-devel@nongnu.org; Tue, 15 Feb 2022 04:32:36 -0500 Received: by mail-ed1-x533.google.com with SMTP id z13so12788962edc.12 for ; Tue, 15 Feb 2022 01:32:34 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id m4sm6634308ejl.45.2022.02.15.01.32.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Feb 2022 01:32:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gjRIoDreQKx28XOd1wx5LMEH73zc760fxUIxYHJ5BtA=; b=pNobCF4DaZPEAKD9hmxAUthBw9gn6vwiwQU9jVOEVO9f/CYvoHjTJQbyhINpQ/gjAv /usXtExhonlMBt11pTosVVNIrzwNNBO0jiK87Jo5uPQ+se4rsurvhywm5lbIQd8RgJOb Vuq+ojHFfAHb2UdTUzuUQ2JYzH6er8AmcsdqlePO1hrtgLAWqF69o5zQh8BniJ+5s0jK VpC6X5Kq5wpKy/Uu1Va1NKAOwFxFOQYwkzwa0YFNMUcgFRXvLeUPRiU/sEQeVY5PAytF alLEvPid2AO9adI+xvmba+tDmFwY7QQU+MXr+cFMqMNqLyq8dZxWJUjOuAaRu6DO0x3I kbBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gjRIoDreQKx28XOd1wx5LMEH73zc760fxUIxYHJ5BtA=; b=YvQcKS2mxb6MAEk5AiOtNNj+e5lEuBVUS614sM7DrNAjBOPCIKGx/8iZ5La+q3sCGe 7Gy90mSWBhnBEy6f1HyenyZTvWL5AXG0e/WNyNYeLWNeKgAJmftc66rZpH03qj7rm3p/ jxbJSXNQg/1yUwdnuC9PAfHFrxqOah30hXYiFsQ5NykdZbNKAmKlDs3X3D4xAjuO0x1s 6+fgEACWU0C/6lGRpR6i1j8p2mbyOWv0Sqb5XL3EtMvqsGC05o25rZQzf7F72U7PQZM3 jjc/wDrnP9QjrnDReODMEJ9/7MLbe/KP0Pd1aNez3w5Ys2gQG/dWoFmIDw2uqoXUQBZu jmMQ== X-Gm-Message-State: AOAM531P7rq9rv8x7lpVE/Xn3ERG3bMGnC6d+BrGzOAwD51/8O15IN/d 3rwBWv0lebRw3rb64M/9tybTHnHyShM= X-Google-Smtp-Source: ABdhPJyAoMZ8JdR/Igdh5QeNk1ipTbo5xR4iZs0bLxZy6ICmyMrQk98KrYRGPA+xELSN1q//Tsz7XA== X-Received: by 2002:a50:fb14:: with SMTP id d20mr3031616edq.214.1644917553256; Tue, 15 Feb 2022 01:32:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/30] configure, meson: move image format options to meson_options.txt Date: Tue, 15 Feb 2022 10:32:05 +0100 Message-Id: <20220215093223.110827-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215093223.110827-1-pbonzini@redhat.com> References: <20220215093223.110827-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::533 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x533.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1644917797360100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- block/meson.build | 47 +++++++++++++++------- configure | 73 ----------------------------------- meson.build | 16 ++++---- meson_options.txt | 16 ++++++++ scripts/meson-buildoptions.sh | 24 ++++++++++++ 5 files changed, 80 insertions(+), 96 deletions(-) diff --git a/block/meson.build b/block/meson.build index 90dc9983e5..4afde2ebf8 100644 --- a/block/meson.build +++ b/block/meson.build @@ -45,20 +45,37 @@ block_ss.add(files( =20 softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c')) =20 -block_ss.add(when: 'CONFIG_QCOW1', if_true: files('qcow.c')) -block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c')) -block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c')) -block_ss.add(when: 'CONFIG_BOCHS', if_true: files('bochs.c')) -block_ss.add(when: 'CONFIG_VVFAT', if_true: files('vvfat.c')) -block_ss.add(when: 'CONFIG_DMG', if_true: files('dmg.c')) -block_ss.add(when: 'CONFIG_QED', if_true: files( - 'qed-check.c', - 'qed-cluster.c', - 'qed-l2-cache.c', - 'qed-table.c', - 'qed.c', -)) -block_ss.add(when: 'CONFIG_PARALLELS', if_true: files('parallels.c', 'para= llels-ext.c')) +if get_option('qcow1').allowed() + block_ss.add(files('qcow.c')) +endif +if get_option('vdi').allowed() + block_ss.add(files('vdi.c')) +endif +if get_option('cloop').allowed() + block_ss.add(files('cloop.c')) +endif +if get_option('bochs').allowed() + block_ss.add(files('bochs.c')) +endif +if get_option('vvfat').allowed() + block_ss.add(files('vvfat.c')) +endif +if get_option('dmg').allowed() + block_ss.add(files('dmg.c')) +endif +if get_option('qed').allowed() + block_ss.add(files( + 'qed-check.c', + 'qed-cluster.c', + 'qed-l2-cache.c', + 'qed-table.c', + 'qed.c', + )) +endif +if get_option('parallels').allowed() + block_ss.add(files('parallels.c', 'parallels-ext.c')) +endif + block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-a= io.c')) block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref,= iokit]) block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c')) @@ -89,7 +106,7 @@ foreach m : [ endforeach =20 # those are not exactly regular block modules, so treat them apart -if 'CONFIG_DMG' in config_host +if get_option('dmg').allowed() foreach m : [ [liblzfse, 'dmg-lzfse', liblzfse, 'dmg-lzfse.c'], [libbzip2, 'dmg-bz2', [glib, libbzip2], 'dmg-bz2.c'] diff --git a/configure b/configure index ee7c4aed0a..4ee1567419 100755 --- a/configure +++ b/configure @@ -331,14 +331,6 @@ debug_stack_usage=3D"no" tls_priority=3D"NORMAL" live_block_migration=3D${default_feature:-yes} replication=3D${default_feature:-yes} -bochs=3D${default_feature:-yes} -cloop=3D${default_feature:-yes} -dmg=3D${default_feature:-yes} -qcow1=3D${default_feature:-yes} -vdi=3D${default_feature:-yes} -vvfat=3D${default_feature:-yes} -qed=3D${default_feature:-yes} -parallels=3D${default_feature:-yes} debug_mutex=3D"no" plugins=3D"$default_feature" rng_none=3D"no" @@ -1044,38 +1036,6 @@ for opt do ;; --enable-replication) replication=3D"yes" ;; - --disable-bochs) bochs=3D"no" - ;; - --enable-bochs) bochs=3D"yes" - ;; - --disable-cloop) cloop=3D"no" - ;; - --enable-cloop) cloop=3D"yes" - ;; - --disable-dmg) dmg=3D"no" - ;; - --enable-dmg) dmg=3D"yes" - ;; - --disable-qcow1) qcow1=3D"no" - ;; - --enable-qcow1) qcow1=3D"yes" - ;; - --disable-vdi) vdi=3D"no" - ;; - --enable-vdi) vdi=3D"yes" - ;; - --disable-vvfat) vvfat=3D"no" - ;; - --enable-vvfat) vvfat=3D"yes" - ;; - --disable-qed) qed=3D"no" - ;; - --enable-qed) qed=3D"yes" - ;; - --disable-parallels) parallels=3D"no" - ;; - --enable-parallels) parallels=3D"yes" - ;; --disable-vhost-user) vhost_user=3D"no" ;; --enable-vhost-user) vhost_user=3D"yes" @@ -1375,14 +1335,6 @@ cat << EOF opengl opengl support qom-cast-debug cast debugging support tools build qemu-io, qemu-nbd and qemu-img tools - bochs bochs image format support - cloop cloop image format support - dmg dmg image format support - qcow1 qcow v1 image format support - vdi vdi image format support - vvfat vvfat image format support - qed qed image format support - parallels parallels image format support debug-mutex mutex debugging support rng-none dummy RNG, avoid using /dev/(u)random and getrandom() gio libgio support @@ -3264,31 +3216,6 @@ if test "$debug_mutex" =3D "yes" ; then echo "CONFIG_DEBUG_MUTEX=3Dy" >> $config_host_mak fi =20 -if test "$bochs" =3D "yes" ; then - echo "CONFIG_BOCHS=3Dy" >> $config_host_mak -fi -if test "$cloop" =3D "yes" ; then - echo "CONFIG_CLOOP=3Dy" >> $config_host_mak -fi -if test "$dmg" =3D "yes" ; then - echo "CONFIG_DMG=3Dy" >> $config_host_mak -fi -if test "$qcow1" =3D "yes" ; then - echo "CONFIG_QCOW1=3Dy" >> $config_host_mak -fi -if test "$vdi" =3D "yes" ; then - echo "CONFIG_VDI=3Dy" >> $config_host_mak -fi -if test "$vvfat" =3D "yes" ; then - echo "CONFIG_VVFAT=3Dy" >> $config_host_mak -fi -if test "$qed" =3D "yes" ; then - echo "CONFIG_QED=3Dy" >> $config_host_mak -fi -if test "$parallels" =3D "yes" ; then - echo "CONFIG_PARALLELS=3Dy" >> $config_host_mak -fi - if test "$plugins" =3D "yes" ; then echo "CONFIG_PLUGIN=3Dy" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 02137be91e..38e3ea46e1 100644 --- a/meson.build +++ b/meson.build @@ -3463,14 +3463,14 @@ if have_block summary_info +=3D {'build virtiofs daemon': have_virtiofsd} summary_info +=3D {'Live block migration': config_host.has_key('CONFIG_L= IVE_BLOCK_MIGRATION')} summary_info +=3D {'replication support': config_host.has_key('CONFIG_RE= PLICATION')} - summary_info +=3D {'bochs support': config_host.has_key('CONFIG_BOCH= S')} - summary_info +=3D {'cloop support': config_host.has_key('CONFIG_CLOO= P')} - summary_info +=3D {'dmg support': config_host.has_key('CONFIG_DMG'= )} - summary_info +=3D {'qcow v1 support': config_host.has_key('CONFIG_QCOW= 1')} - summary_info +=3D {'vdi support': config_host.has_key('CONFIG_VDI'= )} - summary_info +=3D {'vvfat support': config_host.has_key('CONFIG_VVFA= T')} - summary_info +=3D {'qed support': config_host.has_key('CONFIG_QED'= )} - summary_info +=3D {'parallels support': config_host.has_key('CONFIG_PARA= LLELS')} + summary_info +=3D {'bochs support': get_option('bochs').allowed()} + summary_info +=3D {'cloop support': get_option('cloop').allowed()} + summary_info +=3D {'dmg support': get_option('dmg').allowed()} + summary_info +=3D {'qcow v1 support': get_option('qcow1').allowed()} + summary_info +=3D {'vdi support': get_option('vdi').allowed()} + summary_info +=3D {'vvfat support': get_option('vvfat').allowed()} + summary_info +=3D {'qed support': get_option('qed').allowed()} + summary_info +=3D {'parallels support': get_option('parallels').allowed(= )} summary_info +=3D {'FUSE exports': fuse} endif summary(summary_info, bool_yn: true, section: 'Block layer support') diff --git a/meson_options.txt b/meson_options.txt index 1b44b4e666..aef951eba1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -222,3 +222,19 @@ option('fdt', type: 'combo', value: 'auto', =20 option('selinux', type: 'feature', value: 'auto', description: 'SELinux support in qemu-nbd') +option('bochs', type: 'feature', value: 'auto', + description: 'bochs image format support') +option('cloop', type: 'feature', value: 'auto', + description: 'cloop image format support') +option('dmg', type: 'feature', value: 'auto', + description: 'dmg image format support') +option('qcow1', type: 'feature', value: 'auto', + description: 'qcow1 image format support') +option('vdi', type: 'feature', value: 'auto', + description: 'vdi image format support') +option('vvfat', type: 'feature', value: 'auto', + description: 'vvfat image format support') +option('qed', type: 'feature', value: 'auto', + description: 'qed image format support') +option('parallels', type: 'feature', value: 'auto', + description: 'parallels image format support') diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 3f107e5724..50a985abec 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -28,16 +28,19 @@ meson_options_help() { printf "%s\n" ' auth-pam PAM access control' printf "%s\n" ' avx2 AVX2 optimizations' printf "%s\n" ' avx512f AVX512F optimizations' + printf "%s\n" ' bochs bochs image format support' printf "%s\n" ' bpf eBPF support' printf "%s\n" ' brlapi brlapi character device driver' printf "%s\n" ' bzip2 bzip2 support for DMG images' printf "%s\n" ' cap-ng cap_ng support' + printf "%s\n" ' cloop cloop image format support' printf "%s\n" ' cocoa Cocoa user interface (macOS only)' printf "%s\n" ' coreaudio CoreAudio sound support' printf "%s\n" ' crypto-afalg Linux AF_ALG crypto backend driver' printf "%s\n" ' curl CURL block device driver' printf "%s\n" ' curses curses UI' printf "%s\n" ' dbus-display -display dbus support' + printf "%s\n" ' dmg dmg image format support' printf "%s\n" ' docs Documentations build support' printf "%s\n" ' dsound DirectSound sound support' printf "%s\n" ' fuse FUSE block device export' @@ -75,6 +78,9 @@ meson_options_help() { printf "%s\n" ' nvmm NVMM acceleration support' printf "%s\n" ' oss OSS sound support' printf "%s\n" ' pa PulseAudio sound support' + printf "%s\n" ' parallels parallels image format support' + printf "%s\n" ' qcow1 qcow1 image format support' + printf "%s\n" ' qed qed image format support' printf "%s\n" ' rbd Ceph block device driver' printf "%s\n" ' sdl SDL user interface' printf "%s\n" ' sdl-image SDL Image support for icons' @@ -90,6 +96,7 @@ meson_options_help() { printf "%s\n" ' u2f U2F emulation support' printf "%s\n" ' usb-redir libusbredir support' printf "%s\n" ' vde vde network backend support' + printf "%s\n" ' vdi vdi image format support' printf "%s\n" ' vhost-user-blk-server' printf "%s\n" ' build vhost-user-blk server' printf "%s\n" ' virglrenderer virgl rendering support' @@ -100,6 +107,7 @@ meson_options_help() { printf "%s\n" ' vnc-png PNG compression for VNC server' printf "%s\n" ' vnc-sasl SASL authentication for VNC server' printf "%s\n" ' vte vte support for the gtk UI' + printf "%s\n" ' vvfat vvfat image format support' printf "%s\n" ' whpx WHPX acceleration support' printf "%s\n" ' xen Xen backend support' printf "%s\n" ' xen-pci-passthrough' @@ -119,6 +127,8 @@ _meson_option_parse() { --disable-avx2) printf "%s" -Davx2=3Ddisabled ;; --enable-avx512f) printf "%s" -Davx512f=3Denabled ;; --disable-avx512f) printf "%s" -Davx512f=3Ddisabled ;; + --enable-bochs) printf "%s" -Dbochs=3Denabled ;; + --disable-bochs) printf "%s" -Dbochs=3Ddisabled ;; --enable-bpf) printf "%s" -Dbpf=3Denabled ;; --disable-bpf) printf "%s" -Dbpf=3Ddisabled ;; --enable-brlapi) printf "%s" -Dbrlapi=3Denabled ;; @@ -134,6 +144,8 @@ _meson_option_parse() { --disable-cfi) printf "%s" -Dcfi=3Dfalse ;; --enable-cfi-debug) printf "%s" -Dcfi_debug=3Dtrue ;; --disable-cfi-debug) printf "%s" -Dcfi_debug=3Dfalse ;; + --enable-cloop) printf "%s" -Dcloop=3Denabled ;; + --disable-cloop) printf "%s" -Dcloop=3Ddisabled ;; --enable-cocoa) printf "%s" -Dcocoa=3Denabled ;; --disable-cocoa) printf "%s" -Dcocoa=3Ddisabled ;; --enable-coreaudio) printf "%s" -Dcoreaudio=3Denabled ;; @@ -146,6 +158,8 @@ _meson_option_parse() { --disable-curses) printf "%s" -Dcurses=3Ddisabled ;; --enable-dbus-display) printf "%s" -Ddbus_display=3Denabled ;; --disable-dbus-display) printf "%s" -Ddbus_display=3Ddisabled ;; + --enable-dmg) printf "%s" -Ddmg=3Denabled ;; + --disable-dmg) printf "%s" -Ddmg=3Ddisabled ;; --enable-docs) printf "%s" -Ddocs=3Denabled ;; --disable-docs) printf "%s" -Ddocs=3Ddisabled ;; --enable-dsound) printf "%s" -Ddsound=3Denabled ;; @@ -228,6 +242,12 @@ _meson_option_parse() { --disable-oss) printf "%s" -Doss=3Ddisabled ;; --enable-pa) printf "%s" -Dpa=3Denabled ;; --disable-pa) printf "%s" -Dpa=3Ddisabled ;; + --enable-parallels) printf "%s" -Dparallels=3Denabled ;; + --disable-parallels) printf "%s" -Dparallels=3Ddisabled ;; + --enable-qcow1) printf "%s" -Dqcow1=3Denabled ;; + --disable-qcow1) printf "%s" -Dqcow1=3Ddisabled ;; + --enable-qed) printf "%s" -Dqed=3Denabled ;; + --disable-qed) printf "%s" -Dqed=3Ddisabled ;; --enable-rbd) printf "%s" -Drbd=3Denabled ;; --disable-rbd) printf "%s" -Drbd=3Ddisabled ;; --enable-sdl) printf "%s" -Dsdl=3Denabled ;; @@ -266,6 +286,8 @@ _meson_option_parse() { --disable-usb-redir) printf "%s" -Dusb_redir=3Ddisabled ;; --enable-vde) printf "%s" -Dvde=3Denabled ;; --disable-vde) printf "%s" -Dvde=3Ddisabled ;; + --enable-vdi) printf "%s" -Dvdi=3Denabled ;; + --disable-vdi) printf "%s" -Dvdi=3Ddisabled ;; --enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=3D= enabled ;; --disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server= =3Ddisabled ;; --enable-virglrenderer) printf "%s" -Dvirglrenderer=3Denabled ;; @@ -284,6 +306,8 @@ _meson_option_parse() { --disable-vnc-sasl) printf "%s" -Dvnc_sasl=3Ddisabled ;; --enable-vte) printf "%s" -Dvte=3Denabled ;; --disable-vte) printf "%s" -Dvte=3Ddisabled ;; + --enable-vvfat) printf "%s" -Dvvfat=3Denabled ;; + --disable-vvfat) printf "%s" -Dvvfat=3Ddisabled ;; --enable-whpx) printf "%s" -Dwhpx=3Denabled ;; --disable-whpx) printf "%s" -Dwhpx=3Ddisabled ;; --enable-xen) printf "%s" -Dxen=3Denabled ;; --=20 2.34.1