summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorFam Zheng2016-09-21 06:27:16 +0200
committerFam Zheng2016-09-23 05:42:52 +0200
commitcb6414dfec8a308e68529b0fd2a454403c05bbb3 (patch)
treed66548acfb9abde899d704d3b5fee687dd49c9b7 /configure
parentuuid: Make null_uuid static (diff)
downloadqemu-cb6414dfec8a308e68529b0fd2a454403c05bbb3.tar.gz
qemu-cb6414dfec8a308e68529b0fd2a454403c05bbb3.tar.xz
qemu-cb6414dfec8a308e68529b0fd2a454403c05bbb3.zip
vhdx: Use QEMU UUID API
This removes our dependency to libuuid, so that the driver can always be built. Similar to how we handled data plane configure options, --enable-vhdx and --disable-vhdx are also changed to a nop with a message saying it's obsolete. Signed-off-by: Fam Zheng <famz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com> Message-Id: <1474432046-325-4-git-send-email-famz@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure27
1 files changed, 3 insertions, 24 deletions
diff --git a/configure b/configure
index 2efc3382e1..e4f70f150c 100755
--- a/configure
+++ b/configure
@@ -317,7 +317,6 @@ vte=""
virglrenderer=""
tpm="yes"
libssh2=""
-vhdx=""
numa=""
tcmalloc="no"
jemalloc="no"
@@ -1103,6 +1102,9 @@ for opt do
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2
;;
+ --enable-vhdx|--disable-vhdx)
+ echo "$0: $opt is obsolete, VHDX driver is always built" >&2
+ ;;
--disable-gtk) gtk="no"
;;
--enable-gtk) gtk="yes"
@@ -1143,10 +1145,6 @@ for opt do
;;
--enable-libssh2) libssh2="yes"
;;
- --enable-vhdx) vhdx="yes"
- ;;
- --disable-vhdx) vhdx="no"
- ;;
--disable-numa) numa="no"
;;
--enable-numa) numa="yes"
@@ -1389,7 +1387,6 @@ disabled with --disable-FEATURE, default is enabled if available:
archipelago Archipelago backend
tpm TPM support
libssh2 ssh block device support
- vhdx support for the Microsoft VHDX image format
numa libnuma support
tcmalloc tcmalloc support
jemalloc jemalloc support
@@ -2690,19 +2687,6 @@ EOF
fi
fi
-if test "$vhdx" = "yes" ; then
- if test "$uuid" = "no" ; then
- error_exit "uuid required for VHDX support"
- fi
-elif test "$vhdx" != "no" ; then
- if test "$uuid" = "yes" ; then
- vhdx=yes
- else
- vhdx=no
- fi
-fi
-
-##########################################
# xfsctl() probe, used for raw-posix
if test "$xfs" != "no" ; then
cat > $TMPC << EOF
@@ -4917,7 +4901,6 @@ echo "TPM support $tpm"
echo "libssh2 support $libssh2"
echo "TPM passthrough $tpm_passthrough"
echo "QOM debugging $qom_cast_debug"
-echo "vhdx $vhdx"
echo "lzo support $lzo"
echo "snappy support $snappy"
echo "bzip2 support $bzip2"
@@ -5443,10 +5426,6 @@ if test "$libssh2" = "yes" ; then
echo "LIBSSH2_LIBS=$libssh2_libs" >> $config_host_mak
fi
-if test "$vhdx" = "yes" ; then
- echo "CONFIG_VHDX=y" >> $config_host_mak
-fi
-
# USB host support
if test "$libusb" = "yes"; then
echo "HOST_USB=libusb legacy" >> $config_host_mak