configure passthrough for qemu
cover configure passthrough for qemu
The following patch series implement a configure passthrough for qemu so that all available configure options in qemu can be used through kvm.
This includes all suggestions from the 3 first RFC and complements the patches that were needed from qemu's side and that were brought back through the last imports.
It reverts (in some cases partially) the patches needed to implement the --enable-alsa, --disable-vnc-tls and --disable-gcc-check flags but reimports them from qemu's configure usage and reimplements them through the generic passthrough.
Patch 1/5 : Revert "kvm: configure: qemu vnc-tls configure flag" Patch 2/5 : Revert "kvm: configure: qemu alsa configure option" Patch 3/5 : Revert "kvm: configure: support --disable-gcc-check" Patch 4/5 : configure: use passthrough for all unknown options into qemu Patch 5/5 : configure: use kvm's configure usage for unknown options
Carlo
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 1/5 Revert "kvm: configure: qemu vnc-tls configure flag"
This reverts commit 49f7f1a96dce9d059d2d51d450c9d4bdd529c8fd.
--- configure | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
configure +0 -6
@@ -7,7 +7,6 @@ qemu_cc= qemu_cflags= qemu_ldflags= enable_alsa= -disable_vnc_tls= disable_gcc_check= cross_prefix= arch=`uname -m`
@@ -27,7 +26,6 @@ usage() { --qemu-cflags=CFLAGS CFLAGS to add to qemu configuration --qemu-ldflags=LDFLAGS LDFLAGS to add to qemu configuration --enable-alsa enable alsa support for qemu - --disable-vnc-tls disable vnc tls support for qemu --disable-gcc-check don't insist on gcc-3.x CAUTION: this will break running without kvm EOF
@@ -63,9 +61,6 @@ while [[ "$1" = -* ]]; do --enable-alsa) enable_alsa=1 ;; - --disable-vnc-tls) - disable_vnc_tls=1 - ;; --disable-gcc-check) disable_gcc_check=1 ;;
@@ -118,7 +113,6 @@ fi --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \ --enable-kvm --kernel-path="$libkvm_kerneldir" \ ${enable_alsa:+"--enable-alsa"} \ - ${disable_vnc_tls:+"--disable-vnc-tls"} \ ${disable_gcc_check:+"--disable-gcc-check"} \ --prefix="$prefix" \ ${qemu_cc:+"--cc=$qemu_cc"} \
Signature · 7 lines
1.5.3.7 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 2/5 Revert "kvm: configure: qemu alsa configure option"
In reply to Carlo Marcelo Arenas BelonThis reverts commit d3bcc58f74b29df8496933c441640d9c739ba674.
Conflicts:
configure (remove hardcoded alsa flag but keep qemu_opts)
--- configure | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
configure +2 -7
@@ -6,7 +6,7 @@ want_module=1 qemu_cc= qemu_cflags= qemu_ldflags= -enable_alsa= +qemu_opts= disable_gcc_check= cross_prefix= arch=`uname -m`
@@ -25,7 +25,6 @@ usage() { --qemu-cc=CC specify compiler for qemu (must be gcc-3.x) --qemu-cflags=CFLAGS CFLAGS to add to qemu configuration --qemu-ldflags=LDFLAGS LDFLAGS to add to qemu configuration - --enable-alsa enable alsa support for qemu --disable-gcc-check don't insist on gcc-3.x CAUTION: this will break running without kvm EOF
@@ -58,9 +57,6 @@ while [[ "$1" = -* ]]; do --qemu-ldflags) qemu_ldflags="$arg" ;; - --enable-alsa) - enable_alsa=1 - ;; --disable-gcc-check) disable_gcc_check=1 ;;
@@ -112,12 +108,11 @@ fi --extra-cflags="-I $PWD/../libkvm $qemu_cflags" \ --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \ --enable-kvm --kernel-path="$libkvm_kerneldir" \ - ${enable_alsa:+"--enable-alsa"} \ ${disable_gcc_check:+"--disable-gcc-check"} \ --prefix="$prefix" \ ${qemu_cc:+"--cc=$qemu_cc"} \ ${cross_prefix:+"--cross-prefix=$cross_prefix"} \ - ${cross_prefix:+"--cpu=$arch"} + ${cross_prefix:+"--cpu=$arch"} $qemu_opts )
Signature · 7 lines
1.5.3.7 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 3/5 Revert "kvm: configure: support --disable-gcc-check"
In reply to Carlo Marcelo Arenas BelonThis reverts commit 0d354fe9d8eaee1b3abc9dee7824021edb9f4976.
Conflicts:
configure (keep --disable-gcc-check usage)
--- configure | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
configure +0 -5
@@ -7,7 +7,6 @@ qemu_cc= qemu_cflags= qemu_ldflags= qemu_opts= -disable_gcc_check= cross_prefix= arch=`uname -m` target_exec=
@@ -57,9 +56,6 @@ while [[ "$1" = -* ]]; do --qemu-ldflags) qemu_ldflags="$arg" ;; - --disable-gcc-check) - disable_gcc_check=1 - ;; --arch) arch="$arg" ;;
@@ -108,7 +104,6 @@ fi --extra-cflags="-I $PWD/../libkvm $qemu_cflags" \ --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \ --enable-kvm --kernel-path="$libkvm_kerneldir" \ - ${disable_gcc_check:+"--disable-gcc-check"} \ --prefix="$prefix" \ ${qemu_cc:+"--cc=$qemu_cc"} \ ${cross_prefix:+"--cross-prefix=$cross_prefix"} \
Signature · 7 lines
1.5.3.7 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 4/5 configure: use passthrough for all unknown options into qemu
In reply to Carlo Marcelo Arenas Belonuses qemu to generate a hopefully complete usage in case of error
--- configure | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)
configure +9 -1
@@ -24,9 +24,17 @@ usage() { --qemu-cc=CC specify compiler for qemu (must be gcc-3.x) --qemu-cflags=CFLAGS CFLAGS to add to qemu configuration --qemu-ldflags=LDFLAGS LDFLAGS to add to qemu configuration + + Any additional option is given to qemu's configure verbatim; including: + --disable-gcc-check don't insist on gcc-3.x CAUTION: this will break running without kvm EOF + cd qemu + ./configure --help | egrep "enable-|disable-" \ + | 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" exit 1 }
@@ -66,7 +74,7 @@ while [[ "$1" = -* ]]; do usage ;; *) - usage + qemu_opts="$qemu_opts $opt" ;; esac done
Signature · 7 lines
1.5.3.7 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 5/5 configure: use kvm's configure usage for unknown options
In reply to Carlo Marcelo Arenas BelonPrevent qemu's configure usage to be printed if an invalid option is passed to it, allowing kvm's configure to trap those errors and print the usage instead
--- configure | 2 +- qemu/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
configure +1 -1
@@ -116,7 +116,7 @@ fi ${qemu_cc:+"--cc=$qemu_cc"} \ ${cross_prefix:+"--cross-prefix=$cross_prefix"} \ ${cross_prefix:+"--cpu=$arch"} $qemu_opts -) +) || usage cat <<EOF > config.mak
qemu/configure +1 -1
@@ -329,7 +329,7 @@ for opt do ;; --disable-werror) werror="no" ;; - *) echo "ERROR: unknown option $opt"; show_help="yes" + *) echo "ERROR: unknown option $opt"; exit 1 ;; esac done
Signature · 7 lines
1.5.3.7 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
Avi Kivity
AppliedQuoted 12 lines · Carlo Marcelo Arenas Belon
The following patch series implement a configure passthrough for qemu so that all available configure options in qemu can be used through kvm.
This includes all suggestions from the 3 first RFC and complements the patches that were needed from qemu's side and that were brought back through the last imports.
It reverts (in some cases partially) the patches needed to implement the --enable-alsa, --disable-vnc-tls and --disable-gcc-check flags but reimports them from qemu's configure usage and reimplements them through the generic passthrough.
Quoted 7 lines
Patch 1/5 : Revert "kvm: configure: qemu vnc-tls configure flag" Patch 2/5 : Revert "kvm: configure: qemu alsa configure option" Patch 3/5 : Revert "kvm: configure: support --disable-gcc-check" Patch 4/5 : configure: use passthrough for all unknown options into qemu Patch 5/5 : configure: use kvm's configure usage for unknown options
Applied all, thanks.
Signature · 7 lines
error compiling committee.c: too many arguments to function ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/