From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1blpM0-0002YD-Hs for qemu-devel@nongnu.org; Sun, 18 Sep 2016 23:34:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1blpLx-0000Ek-VZ for qemu-devel@nongnu.org; Sun, 18 Sep 2016 23:34:47 -0400 Date: Sun, 18 Sep 2016 23:34:37 -0400 From: Jeff Cody Message-ID: <20160919033437.GH32304@localhost.localdomain> References: <1474172732-31994-1-git-send-email-famz@redhat.com> <1474172732-31994-9-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1474172732-31994-9-git-send-email-famz@redhat.com> Subject: Re: [Qemu-devel] [PATCH v8 08/12] configure: Remove detection code for UUID List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: qemu-devel@nongnu.org, kwolf@redhat.com, qemu-block@nongnu.org, sw@weilnetz.de, mdroth@linux.vnet.ibm.com, armbru@redhat.com, pbonzini@redhat.com, mreitz@redhat.com, eblake@redhat.com, rth@twiddle.net On Sun, Sep 18, 2016 at 12:25: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 > Reviewed-by: Eric Blake > --- > configure | 43 ++++--------------------------------------- > 1 file changed, 4 insertions(+), 39 deletions(-) > > diff --git a/configure b/configure > index b71b80a..f12e809 100755 > --- a/configure > +++ b/configure > @@ -212,7 +212,6 @@ sdlabi="" > virtfs="" > vnc="yes" > sparse="no" > -uuid="" > vde="" > vnc_sasl="" > vnc_jpeg="" > @@ -886,10 +885,6 @@ for opt do > ;; > --disable-slirp) slirp="no" > ;; > - --disable-uuid) uuid="no" > - ;; > - --enable-uuid) uuid="yes" > - ;; > --disable-vde) vde="no" > ;; > --enable-vde) vde="yes" > @@ -1105,6 +1100,9 @@ for opt do > --enable-vhdx|--disable-vhdx) > echo "$0: $opt is obsolete, VHDX driver is always built" >&2 > ;; > + --enable-uuid|--disable-uuid) > + echo "$0: $opt is obsolete, UUID support is always built" >&2 > + ;; > --disable-gtk) gtk="no" > ;; > --enable-gtk) gtk="yes" > @@ -1363,7 +1361,6 @@ disabled with --disable-FEATURE, default is enabled if available: > bluez bluez stack connectivity > kvm KVM acceleration support > rdma RDMA-based migration support > - uuid uuid support > vde support for vde network > netmap support for netmap network > linux-aio Linux AIO support > @@ -2659,34 +2656,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 > @@ -4059,7 +4028,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 > @@ -4868,7 +4837,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" > @@ -5058,9 +5026,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 > Reviewed-by: Jeff Cody