ATAPI pass through v2: update the configure
PATCH 5/5 ATAPI pass through v2: update the configure
This patch update the configure by adding --enable-atapi-pt and --disable-atapi-pt.
Signature · 1 line
Alexandre Bique
configure +37 -0
@@ -191,6 +191,7 @@ nptl="yes" mixemu="no" bluez="yes" kvm="no" +atapi_pt="no" kerneldir="" aix="no" blobs="yes"
@@ -323,6 +324,19 @@ AIX) aix="yes" make="gmake" ;; +Linux) +atapi_pt="yes" +audio_drv_list="oss" +audio_possible_drivers="oss alsa sdl esd pa" +linux="yes" +linux_user="yes" +usb="linux" +kvm="yes" +if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then + kqemu="yes" + audio_possible_drivers="$audio_possible_drivers fmod" +fi +;; *) audio_drv_list="oss" audio_possible_drivers="oss alsa sdl esd pa"
@@ -501,6 +515,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 +664,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 +1473,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 +1844,22 @@ bsd) ;; esac +# 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 <<EOF >>$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 +fi + # Determine what linker flags to use to force archive inclusion check_linker_flags() {
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 19 lines · On Wednesday 01 July 2009 20:00:22 Juan Quintela wrote:
Quoted 2 lines · Bique Alexandre
This patch update the configure by adding --enable-atapi-pt and --disable-atapi-pt.
(quoted diff) +14
-0+# 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 <<EOF >>$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
Quoted 4 lines
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.
Signature · 1 line
Alexandre Bique
configure +13 -0
@@ -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() {
Quoted 2 lines · Bique Alexandre
This patch update the configure by adding --enable-atapi-pt and --disable-atapi-pt.
Do we need an option for this? I'd say we should make it uncoditional when built on Linux like the SCSI passthrough code.
Quoted 6 lines · On Sunday 05 July 2009 09:16:37 Christoph Hellwig wrote:
Quoted 2 lines · Bique Alexandre
This patch update the configure by adding --enable-atapi-pt and --disable-atapi-pt.
Do we need an option for this? I'd say we should make it uncoditional when built on Linux like the SCSI passthrough code.
Ok, so I just do:
If Linux then
enable
else
disable
fi
?
Signature · 1 line
Alexandre Bique
Quoted 8 lines · Bique Alexandre
Quoted 6 lines · On Sunday 05 July 2009 09:16:37 Christoph Hellwig wrote:
Quoted 2 lines · Bique Alexandre
This patch update the configure by adding --enable-atapi-pt and --disable-atapi-pt.
Do we need an option for this? I'd say we should make it uncoditional when built on Linux like the SCSI passthrough code.
Quoted 7 lines
Ok, so I just do:
If Linux then
enable
else
disable
fi
Yes. Take a look at hw/virtio-blk.c and hw/scsi-generic.c for how we guard the other pass-through users.
Quoted 11 lines · On Monday 06 July 2009 14:55:00 Christoph Hellwig wrote:
Quoted 10 lines · Bique Alexandre
Quoted 6 lines · On Sunday 05 July 2009 09:16:37 Christoph Hellwig wrote:
Quoted 2 lines · Bique Alexandre
This patch update the configure by adding --enable-atapi-pt and --disable-atapi-pt.
Do we need an option for this? I'd say we should make it uncoditional when built on Linux like the SCSI passthrough code.
Ok, so I just do:
Quoted 8 lines
Quoted 5 lines
If Linux then
enable
else
disable
fiYes. Take a look at
hw/virtio-blk.candhw/scsi-generic.cfor how we guard the other pass-through users.
I looked at these files and instead of doing
#ifdef __linux__
... code ...
#endif
I propose to do
#ifdef __linux__
# define CONFIG_ATAPI_PT #endif
in config.h and still do
#ifdef CONFIG_ATAPI_PT
... code ...
#endif
in other source file.
Here is an updated patch.
Thanks.
Signature · 1 line
Alexandre Bique
configure +6 -0
@@ -1823,6 +1823,12 @@ bsd) ;; esac +# ATAPI pass through +cat <<EOF >>$config_h +#ifdef __linux__ +# define CONFIG_ATAPI_PT 1 +#endif /* __linux__ */ +EOF # Determine what linker flags to use to force archive inclusion check_linker_flags() {