From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MMJfG-0000IC-O7 for qemu-devel@nongnu.org; Thu, 02 Jul 2009 06:37:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MMJfB-0000BJ-NG for qemu-devel@nongnu.org; Thu, 02 Jul 2009 06:37:13 -0400 Received: from [199.232.76.173] (port=56351 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MMJfB-0000Al-BN for qemu-devel@nongnu.org; Thu, 02 Jul 2009 06:37:09 -0400 Received: from smtp.eu.citrix.com ([62.200.22.115]:18861) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MMJfA-0000vf-T8 for qemu-devel@nongnu.org; Thu, 02 Jul 2009 06:37:09 -0400 From: Bique Alexandre Date: Thu, 2 Jul 2009 11:36:24 +0100 References: <200907011932.04493.alexandre.bique@citrix.com> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_o2ITKlN4qHmwNqA" Message-ID: <200907021136.24397.alexandre.bique@citrix.com> Subject: [Qemu-devel] Re: [PATCH 5/5] ATAPI pass through v2: update the configure List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: "qemu-devel@nongnu.org" --Boundary-00=_o2ITKlN4qHmwNqA Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Wednesday 01 July 2009 20:00:22 Juan Quintela wrote: > Bique Alexandre wrote: > > This patch update the configure by adding --enable-atapi-pt and > > --disable-atapi-pt. > > +# ATAPI pass through > +if [ "$atapi_pt" = "yes" ] ; then > + if [ "$targetos" != "Linux" ] ; then > + echo "error: you need a Linux target OS to use ATAPI pass through" >&2 > + exit 1 > + fi > + cat <>$config_h > +#define CONFIG_ATAPI_PT 1 > +#ifndef __linux__ > +#error "You can't enable ATAPI pass through if you're not using linux." > +#endif /* __linux__ */ > +EOF > +else > + echo "#define CONFIG_ATAPI_PT 0" >>$config_h > > Normally we never define the variable when it is disabled, that way you > can do > > #ifdef CONFIG_ATAPI_PT Alright. I have been confused because setting its value to 1 means that you allow to get/test it. So you can do #if CONFIG_ATAPI_PT, and this becomes wrong if CONFIG_ATAPI_PT is not defined. That's why I defined CONFIG_ATAPI_PT to 0 if disabled. I join a new version of this patch. I also removed useless checks against linux because I'm no more using bsg. Thanks Juan. -- Alexandre Bique --Boundary-00=_o2ITKlN4qHmwNqA Content-Type: text/x-patch; charset="UTF-8"; name="configure-atapi" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="configure-atapi" diff --git a/configure b/configure index eb9d73a..009f210 100755 --- a/configure +++ b/configure @@ -191,6 +191,7 @@ nptl="yes" mixemu="no" bluez="yes" kvm="no" +atapi_pt="no" kerneldir="" aix="no" blobs="yes" @@ -501,6 +502,10 @@ for opt do ;; --disable-docs) build_docs="no" ;; + --enable-atapi-pt) atapi_pt="yes" + ;; + --disable-atapi-pt) atapi_pt="no" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -646,6 +651,8 @@ echo " --disable-vde disable support for vde network" echo " --disable-pthread disable pthread support" echo " --disable-aio disable AIO support" echo " --enable-io-thread enable IO thread" +echo " --enable-atapi-pt enable atapi device pass through" +echo " --disable-atapi-pt disable atapi device pass through" echo " --disable-blobs disable installing provided firmware blobs" echo " --kerneldir=PATH look for kernel includes in PATH" echo "" @@ -1453,6 +1460,7 @@ echo "Install blobs $blobs" echo -e "KVM support $kvm" echo "fdt support $fdt" echo "preadv support $preadv" +echo "atapi-pt support $atapi_pt" if test $sdl_too_old = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -1823,6 +1831,11 @@ bsd) ;; esac +# ATAPI pass through +if [ "$atapi_pt" = "yes" ] ; then + echo "#define CONFIG_ATAPI_PT 1" >>$config_h +fi + # Determine what linker flags to use to force archive inclusion check_linker_flags() { --Boundary-00=_o2ITKlN4qHmwNqA--