[PATCH 0/2] configure: add support for audio-{drv,card}-list

[PATCH 0/2] configure: add support for audio-{drv,card}-list

[Carlo Marcelo Arenas Belon]

The following series adds support for qemu's audio configure option lists
that were added in kvm-71 to support selecting which interface will be used
to enable audio in the host from the guest (oss, alsa, sdl, esd, fmod, or
pulseaudio) and which audio devices emulation to enable for the guest (ac97,
adlib, cs2431a or gus).

  PATCH 1/2 : configure: include audio list options for --help output
  PATCH 2/2 : configure: passthrough for audio-{drv,card}-list

Carlo

[PATCH 1/2] configure: include audio list options for --help output

[Carlo Marcelo Arenas Belon]

Reflect in kvm's configure the qemu options used to enable support for
the different libraries used for audio support propagation and the list
of audio devices emulated

Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
---
 configure |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 72337c9..2558e0e 100755
--- a/configure
+++ b/configure
@@ -30,10 +30,11 @@ usage() {
 
 EOF
     cd qemu
-    ./configure --help | egrep "enable-|disable-" \
+    ./configure --help | egrep "enable-|disable-|audio-|Available" \
 	| grep -v user | grep -v system | grep -v kqemu | grep -v kvm \
 	| sed -e "s/^  /    /g" \
-	| sed -e"s/  enable/enable/g" | sed -e "s/  disable/disable/g"
+	| sed -e "s/  enable/enable/g" | sed -e "s/  disable/disable/g" \
+	| sed -e "s/  set/set/g" | sed -e "s/  Available/Available/g"
     exit 1
 }
 
-- 
1.5.4.5

[PATCH 2/2] configure: passthrough for audio-{drv,card}-list and logic cleanup

[Carlo Marcelo Arenas Belon]

Extending the cleanup logic used in a patch from Jindrich Makovicka,
changes the default option to pass the full option to qemu's
configure and add a passthrough for qemu options that use a space
separated list of options like the list for audio drivers enabled
or the list for audio devices emulated.

Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
---
 configure |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 2558e0e..fc05767 100755
--- a/configure
+++ b/configure
@@ -10,6 +10,8 @@ qemu_cflags=
 qemu_ldflags=
 qemu_opts=
 cross_prefix=
+audio_drv_list=
+audio_card_list=
 arch=`uname -m`
 target_exec=
 
@@ -39,7 +41,8 @@ EOF
 }
 
 while [[ "$1" = -* ]]; do
-    opt="$1"; shift
+    optorig="$1"; shift
+    opt="$optorig"
     arg=
     if [[ "$opt" = *=* ]]; then
 	arg="${opt#*=}"
@@ -67,16 +70,21 @@ while [[ "$1" = -* ]]; do
 	--cross-prefix)
 	    cross_prefix="$arg"
             ;;
+	--audio-drv-list)
+	    audio_drv_list="$arg"
+	    ;;
+	--audio-card-list)
+	    audio_card_list="$arg"
+	    ;;
 	--help)
 	    usage
 	    ;;
 	*)
-	    qemu_opts="$qemu_opts $opt"
+	    qemu_opts="$qemu_opts $optorig"
 	    ;;
     esac
 done
 
-
 #set kenel directory
 libkvm_kerneldir=$(readlink -f kernel)
 
@@ -114,11 +122,12 @@ fi
     --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \
     --kernel-path="$libkvm_kerneldir" \
     --prefix="$prefix" \
+    ${audio_drv_list:+"--audio-drv-list=$audio_drv_list"} \
+    ${audio_card_list:+"--audio-card-list=$audio_card_list"} \
     ${cross_prefix:+"--cross-prefix=$cross_prefix"} \
     ${cross_prefix:+"--cpu=$arch"} $qemu_opts
 ) || usage
 
-
 cat <<EOF > config.mak
 ARCH=$arch
 PREFIX=$prefix
-- 
1.5.4.5

Re: [PATCH 0/2] configure: add support for audio-{drv,card}-list

[Daniel Gryniewicz]

On Wed, 2008-07-16 at 01:56 -0500, Carlo Marcelo Arenas Belon wrote:
> The following series adds support for qemu's audio configure option lists
> that were added in kvm-71 to support selecting which interface will be used
> to enable audio in the host from the guest (oss, alsa, sdl, esd, fmod, or
> pulseaudio) and which audio devices emulation to enable for the guest (ac97,
> adlib, cs2431a or gus).
> 
>   PATCH 1/2 : configure: include audio list options for --help output
>   PATCH 2/2 : configure: passthrough for audio-{drv,card}-list
> 
> Carlo


This is largely what I had to do for the gentoo kvm packages (but
nicer).

Dan

[PATCH 1/2] configure: include audio list options for --help output

[Carlo Marcelo Arenas Belon]

Reflects in kvm's configure the qemu options used to enable support for
the different libraries used for audio support propagation and the list
of audio devices emulated.

This list of options replaces the individual options that were used before
kvm-71 with a functional equivalent feature but will require build or script
instructions to replace calls to from --enable-{adlib,ac97,gus} or
--enable-{coreaudio,alsa,esd,fmod,dsound} with their equivalent flags.

Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
---
 configure |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 72337c9..2558e0e 100755
--- a/configure
+++ b/configure
@@ -30,10 +30,11 @@ usage() {
 
 EOF
     cd qemu
-    ./configure --help | egrep "enable-|disable-" \
+    ./configure --help | egrep "enable-|disable-|audio-|Available" \
 	| grep -v user | grep -v system | grep -v kqemu | grep -v kvm \
 	| sed -e "s/^  /    /g" \
-	| sed -e"s/  enable/enable/g" | sed -e "s/  disable/disable/g"
+	| sed -e "s/  enable/enable/g" | sed -e "s/  disable/disable/g" \
+	| sed -e "s/  set/set/g" | sed -e "s/  Available/Available/g"
     exit 1
 }
 
-- 
1.5.4.5