Re: [Qemu-devel] [PATCH v2 8/8] configure: Remove detection code for UUID

2016-08-08 Thread Fam Zheng 
On Mon, 08/08 16:52, Jeff Cody wrote:
> > @@ -1096,6 +1091,9 @@ for opt do
> >--enable-vhdx|--disable-vhdx)
> >echo "$0: $opt is obsolete, VHDX driver is always built"
> >;;
> > +  --enable-uuid|--disable-uuid)
> > +  echo "$0: $opt is obsolete, UUID support is always built"
> > +  ;;
> 
> As with the vhdx line, this too should probably go out to stderr similar to
> the data plane option.

Yes, will do.

Re: [Qemu-devel] [PATCH v2 8/8] configure: Remove detection code for UUID

2016-08-08 Thread Jeff Cody 
On Mon, Aug 08, 2016 at 02:09:28PM +0800, Fam Zheng wrote:
> All code now uses built-in UUID implementation. Remove the code of
> libuuid and make --enable-uuid and --disable-uuid only print a message.
> 
> Signed-off-by: Fam Zheng 
> ---
>  configure | 43 ---
>  1 file changed, 4 insertions(+), 39 deletions(-)
> 
> diff --git a/configure b/configure
> index cbb96d5..d6d71f3 100755
> --- a/configure
> +++ b/configure
> @@ -212,7 +212,6 @@ sdlabi=""
>  virtfs=""
>  vnc="yes"
>  sparse="no"
> -uuid=""
>  vde=""
>  vnc_sasl=""
>  vnc_jpeg=""
> @@ -881,10 +880,6 @@ for opt do
>;;
>--disable-slirp) slirp="no"
>;;
> -  --disable-uuid) uuid="no"
> -  ;;
> -  --enable-uuid) uuid="yes"
> -  ;;
>--disable-vde) vde="no"
>;;
>--enable-vde) vde="yes"
> @@ -1096,6 +1091,9 @@ for opt do
>--enable-vhdx|--disable-vhdx)
>echo "$0: $opt is obsolete, VHDX driver is always built"
>;;
> +  --enable-uuid|--disable-uuid)
> +  echo "$0: $opt is obsolete, UUID support is always built"
> +  ;;

As with the vhdx line, this too should probably go out to stderr similar to
the data plane option.

>--disable-gtk) gtk="no"
>;;
>--enable-gtk) gtk="yes"
> @@ -1350,7 +1348,6 @@ disabled with --disable-FEATURE, default is enabled if 
> available:
>bluez   bluez stack connectivity
>kvm KVM acceleration support
>rdmaRDMA-based migration support
> -  uuiduuid support
>vde support for vde network
>netmap  support for netmap network
>linux-aio   Linux AIO support
> @@ -2654,34 +2651,6 @@ if compile_prog "" "" ; then
>  fi
>  
>  ##
> -# uuid_generate() probe, used for vdi block driver
> -# Note that on some systems (notably MacOSX) no extra library
> -# need be linked to get the uuid functions.
> -if test "$uuid" != "no" ; then
> -  uuid_libs="-luuid"
> -  cat > $TMPC << EOF
> -#include 
> -int main(void)
> -{
> -uuid_t my_uuid;
> -uuid_generate(my_uuid);
> -return 0;
> -}
> -EOF
> -  if compile_prog "" "" ; then
> -uuid="yes"
> -  elif compile_prog "" "$uuid_libs" ; then
> -uuid="yes"
> -libs_softmmu="$uuid_libs $libs_softmmu"
> -libs_tools="$uuid_libs $libs_tools"
> -  else
> -if test "$uuid" = "yes" ; then
> -  feature_not_found "uuid" "Install libuuid devel"
> -fi
> -uuid=no
> -  fi
> -fi
> -
>  # xfsctl() probe, used for raw-posix
>  if test "$xfs" != "no" ; then
>cat > $TMPC << EOF
> @@ -4054,7 +4023,7 @@ EOF
>if compile_prog "$vss_win32_include" "" ; then
>  guest_agent_with_vss="yes"
>  QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"
> -libs_qga="-lole32 -loleaut32 -lshlwapi -luuid -lstdc++ 
> -Wl,--enable-stdcall-fixup $libs_qga"
> +libs_qga="-lole32 -loleaut32 -lshlwapi -lstdc++ 
> -Wl,--enable-stdcall-fixup $libs_qga"
>  qga_vss_provider="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb"
>else
>  if test "$vss_win32_sdk" != "" ; then
> @@ -4842,7 +4811,6 @@ echo "preadv support$preadv"
>  echo "fdatasync $fdatasync"
>  echo "madvise   $madvise"
>  echo "posix_madvise $posix_madvise"
> -echo "uuid support  $uuid"
>  echo "libcap-ng support $cap_ng"
>  echo "vhost-net support $vhost_net"
>  echo "vhost-scsi support $vhost_scsi"
> @@ -5030,9 +4998,6 @@ fi
>  if test "$fnmatch" = "yes" ; then
>echo "CONFIG_FNMATCH=y" >> $config_host_mak
>  fi
> -if test "$uuid" = "yes" ; then
> -  echo "CONFIG_UUID=y" >> $config_host_mak
> -fi
>  if test "$xfs" = "yes" ; then
>echo "CONFIG_XFS=y" >> $config_host_mak
>  fi
> -- 
> 2.7.4
>

[Qemu-devel] [PATCH v2 8/8] configure: Remove detection code for UUID

2016-08-08 Thread Fam Zheng 
All code now uses built-in UUID implementation. Remove the code of
libuuid and make --enable-uuid and --disable-uuid only print a message.

Signed-off-by: Fam Zheng 
---
 configure | 43 ---
 1 file changed, 4 insertions(+), 39 deletions(-)

diff --git a/configure b/configure
index cbb96d5..d6d71f3 100755
--- a/configure
+++ b/configure
@@ -212,7 +212,6 @@ sdlabi=""
 virtfs=""
 vnc="yes"
 sparse="no"
-uuid=""
 vde=""
 vnc_sasl=""
 vnc_jpeg=""
@@ -881,10 +880,6 @@ for opt do
   ;;
   --disable-slirp) slirp="no"
   ;;
-  --disable-uuid) uuid="no"
-  ;;
-  --enable-uuid) uuid="yes"
-  ;;
   --disable-vde) vde="no"
   ;;
   --enable-vde) vde="yes"
@@ -1096,6 +1091,9 @@ for opt do
   --enable-vhdx|--disable-vhdx)
   echo "$0: $opt is obsolete, VHDX driver is always built"
   ;;
+  --enable-uuid|--disable-uuid)
+  echo "$0: $opt is obsolete, UUID support is always built"
+  ;;
   --disable-gtk) gtk="no"
   ;;
   --enable-gtk) gtk="yes"
@@ -1350,7 +1348,6 @@ disabled with --disable-FEATURE, default is enabled if 
available:
   bluez   bluez stack connectivity
   kvm KVM acceleration support
   rdmaRDMA-based migration support
-  uuiduuid support
   vde support for vde network
   netmap  support for netmap network
   linux-aio   Linux AIO support
@@ -2654,34 +2651,6 @@ if compile_prog "" "" ; then
 fi
 
 ##
-# uuid_generate() probe, used for vdi block driver
-# Note that on some systems (notably MacOSX) no extra library
-# need be linked to get the uuid functions.
-if test "$uuid" != "no" ; then
-  uuid_libs="-luuid"
-  cat > $TMPC << EOF
-#include 
-int main(void)
-{
-uuid_t my_uuid;
-uuid_generate(my_uuid);
-return 0;
-}
-EOF
-  if compile_prog "" "" ; then
-uuid="yes"
-  elif compile_prog "" "$uuid_libs" ; then
-uuid="yes"
-libs_softmmu="$uuid_libs $libs_softmmu"
-libs_tools="$uuid_libs $libs_tools"
-  else
-if test "$uuid" = "yes" ; then
-  feature_not_found "uuid" "Install libuuid devel"
-fi
-uuid=no
-  fi
-fi
-
 # xfsctl() probe, used for raw-posix
 if test "$xfs" != "no" ; then
   cat > $TMPC << EOF
@@ -4054,7 +4023,7 @@ EOF
   if compile_prog "$vss_win32_include" "" ; then
 guest_agent_with_vss="yes"
 QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"
-libs_qga="-lole32 -loleaut32 -lshlwapi -luuid -lstdc++ 
-Wl,--enable-stdcall-fixup $libs_qga"
+libs_qga="-lole32 -loleaut32 -lshlwapi -lstdc++ -Wl,--enable-stdcall-fixup 
$libs_qga"
 qga_vss_provider="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb"
   else
 if test "$vss_win32_sdk" != "" ; then
@@ -4842,7 +4811,6 @@ echo "preadv support$preadv"
 echo "fdatasync $fdatasync"
 echo "madvise   $madvise"
 echo "posix_madvise $posix_madvise"
-echo "uuid support  $uuid"
 echo "libcap-ng support $cap_ng"
 echo "vhost-net support $vhost_net"
 echo "vhost-scsi support $vhost_scsi"
@@ -5030,9 +4998,6 @@ fi
 if test "$fnmatch" = "yes" ; then
   echo "CONFIG_FNMATCH=y" >> $config_host_mak
 fi
-if test "$uuid" = "yes" ; then
-  echo "CONFIG_UUID=y" >> $config_host_mak
-fi
 if test "$xfs" = "yes" ; then
   echo "CONFIG_XFS=y" >> $config_host_mak
 fi
-- 
2.7.4