From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qp65P-0002hg-3Y for qemu-devel@nongnu.org; Thu, 04 Aug 2011 18:08:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qp65N-00057v-Q2 for qemu-devel@nongnu.org; Thu, 04 Aug 2011 18:08:15 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:42728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qp65N-00057l-JX for qemu-devel@nongnu.org; Thu, 04 Aug 2011 18:08:13 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e7.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p74LgF7f014507 for ; Thu, 4 Aug 2011 17:42:15 -0400 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p74M8Bkl200610 for ; Thu, 4 Aug 2011 18:08:12 -0400 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p74M8Bd4022780 for ; Thu, 4 Aug 2011 16:08:11 -0600 Message-ID: <4E3B184B.6000008@us.ibm.com> Date: Thu, 04 Aug 2011 17:08:11 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1312228377-9608-1-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1312228377-9608-1-git-send-email-mdroth@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] guest agent: add --enable-guest-agent config option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: qemu-devel@nongnu.org On 08/01/2011 02:52 PM, Michael Roth wrote: > QAPI will require glib/python, but for now the guest agent is the only > user. For now, make these dependencies an explicit guest agent one, and > give users the option to disable it if need be. > > Once QAPI is adopted in core QEMU code, we would basically revert this > patch. > > Signed-off-by: Michael Roth Applied. Thanks. Regards, Anthony Liguori > --- > configure | 40 +++++++++++++++++++++++++++------------- > 1 files changed, 27 insertions(+), 13 deletions(-) > > diff --git a/configure b/configure > index 77194cf..58a37d9 100755 > --- a/configure > +++ b/configure > @@ -181,6 +181,7 @@ smartcard_nss="" > usb_redir="" > opengl="" > zlib="yes" > +guest_agent="yes" > > # parse CC options first > for opt do > @@ -757,6 +758,10 @@ for opt do > ;; > --disable-zlib-test) zlib="no" > ;; > + --enable-guest-agent) guest_agent="yes" > + ;; > + --disable-guest-agent) guest_agent="no" > + ;; > *) echo "ERROR: unknown option $opt"; show_help="yes" > ;; > esac > @@ -1035,6 +1040,8 @@ echo " --disable-smartcard-nss disable smartcard nss support" > echo " --enable-smartcard-nss enable smartcard nss support" > echo " --disable-usb-redir disable usb network redirection support" > echo " --enable-usb-redir enable usb network redirection support" > +echo " --disable-guest-agent disable building of the QEMU Guest Agent" > +echo " --enable-guest-agent enable building of the QEMU Guest Agent" > echo "" > echo "NOTE: The object files are built at the place where configure is launched" > exit 1 > @@ -1094,11 +1101,13 @@ if test "$solaris" = "yes" ; then > fi > fi > > -if has $python; then > - : > -else > - echo "Python not found. Use --python=/path/to/python" > - exit 1 > +if test "$guest_agent" != "no" ; then > + if has $python; then > + : > + else > + echo "Python not found. Use --python=/path/to/python" > + exit 1 > + fi > fi > > if test -z "$target_list" ; then > @@ -1830,14 +1839,16 @@ fi > > ########################################## > # glib support probe > -if $pkg_config --modversion glib-2.0> /dev/null 2>&1 ; then > - glib_cflags=`$pkg_config --cflags glib-2.0 2>/dev/null` > - glib_libs=`$pkg_config --libs glib-2.0 2>/dev/null` > - libs_softmmu="$glib_libs $libs_softmmu" > - libs_tools="$glib_libs $libs_tools" > -else > - echo "glib-2.0 required to compile QEMU" > - exit 1 > +if test "$guest_agent" != "no" ; then > + if $pkg_config --modversion glib-2.0> /dev/null 2>&1 ; then > + glib_cflags=`$pkg_config --cflags glib-2.0 2>/dev/null` > + glib_libs=`$pkg_config --libs glib-2.0 2>/dev/null` > + libs_softmmu="$glib_libs $libs_softmmu" > + libs_tools="$glib_libs $libs_tools" > + else > + echo "glib-2.0 required to compile QEMU" > + exit 1 > + fi > fi > > ########################################## > @@ -2597,7 +2608,9 @@ if test "$softmmu" = yes ; then > tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" > if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then > tools="qemu-nbd\$(EXESUF) $tools" > + if [ "$guest_agent" = "yes" ]; then > tools="qemu-ga\$(EXESUF) $tools" > + fi > if [ "$check_utests" = "yes" ]; then > tools="check-qint check-qstring check-qdict check-qlist $tools" > tools="check-qfloat check-qjson $tools" > @@ -2699,6 +2712,7 @@ echo "xfsctl support $xfs" > echo "nss used $smartcard_nss" > echo "usb net redir $usb_redir" > echo "OpenGL support $opengl" > +echo "build guest agent $guest_agent" > > if test $sdl_too_old = "yes"; then > echo "-> Your SDL version is too old - please upgrade to have SDL support"