2003-03-07 00:23:54 +01:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
2003-03-23 21:17:16 +01:00
|
|
|
# qemu configure script (c) 2003 Fabrice Bellard
|
2003-03-07 00:23:54 +01:00
|
|
|
#
|
|
|
|
# set temporary file name
|
|
|
|
if test ! -z "$TMPDIR" ; then
|
|
|
|
TMPDIR1="${TMPDIR}"
|
|
|
|
elif test ! -z "$TEMPDIR" ; then
|
|
|
|
TMPDIR1="${TEMPDIR}"
|
|
|
|
else
|
|
|
|
TMPDIR1="/tmp"
|
|
|
|
fi
|
|
|
|
|
2003-03-23 21:17:16 +01:00
|
|
|
TMPC="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.c"
|
|
|
|
TMPO="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.o"
|
|
|
|
TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}"
|
|
|
|
TMPS="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.S"
|
2008-09-30 21:44:32 +02:00
|
|
|
TMPI="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.i"
|
2008-11-29 23:04:31 +01:00
|
|
|
TMPSDLLOG="${TMPDIR1}/qemu-conf-sdl-$$-${RANDOM}.log"
|
2003-03-07 00:23:54 +01:00
|
|
|
|
2008-11-29 23:04:31 +01:00
|
|
|
trap "rm -f $TMPC $TMPO $TMPE $TMPS $TMPI $TMPSDLLOG; exit" 0 2 3 15
|
2008-11-29 21:09:56 +01:00
|
|
|
|
2003-03-07 00:23:54 +01:00
|
|
|
# default parameters
|
2004-04-02 22:55:59 +02:00
|
|
|
prefix=""
|
2003-09-30 22:54:24 +02:00
|
|
|
interp_prefix="/usr/gnemul/qemu-%M"
|
2003-06-09 21:53:12 +02:00
|
|
|
static="no"
|
2003-03-07 00:23:54 +01:00
|
|
|
cross_prefix=""
|
|
|
|
cc="gcc"
|
2008-06-25 23:04:05 +02:00
|
|
|
audio_drv_list=""
|
2009-01-09 11:46:34 +01:00
|
|
|
audio_card_list="ac97 es1370 sb16"
|
|
|
|
audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus"
|
2003-03-07 00:23:54 +01:00
|
|
|
host_cc="gcc"
|
|
|
|
ar="ar"
|
|
|
|
make="make"
|
2006-04-17 15:57:12 +02:00
|
|
|
install="install"
|
2003-03-07 00:23:54 +01:00
|
|
|
strip="strip"
|
2008-12-29 18:14:15 +01:00
|
|
|
|
|
|
|
# parse CC options first
|
|
|
|
for opt do
|
|
|
|
optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`
|
|
|
|
case "$opt" in
|
|
|
|
--cross-prefix=*) cross_prefix="$optarg"
|
|
|
|
;;
|
|
|
|
--cc=*) cc="$optarg"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
# OS specific
|
|
|
|
# Using uname is really, really broken. Once we have the right set of checks
|
|
|
|
# we can eliminate it's usage altogether
|
|
|
|
|
|
|
|
cc="${cross_prefix}${cc}"
|
|
|
|
ar="${cross_prefix}${ar}"
|
|
|
|
strip="${cross_prefix}${strip}"
|
|
|
|
|
|
|
|
# check that the C compiler works.
|
|
|
|
cat > $TMPC <<EOF
|
|
|
|
int main(void) {}
|
|
|
|
EOF
|
|
|
|
|
|
|
|
if $cc $ARCH_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null ; then
|
|
|
|
: C compiler works ok
|
|
|
|
else
|
|
|
|
echo "ERROR: \"$cc\" either does not exist or does not work"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
check_define() {
|
|
|
|
cat > $TMPC <<EOF
|
|
|
|
#if !defined($1)
|
|
|
|
#error Not defined
|
|
|
|
#endif
|
|
|
|
int main(void) { return 0; }
|
|
|
|
EOF
|
|
|
|
$cc $ARCH_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null
|
|
|
|
}
|
|
|
|
|
|
|
|
if check_define __i386__ ; then
|
|
|
|
cpu="i386"
|
|
|
|
elif check_define __x86_64__ ; then
|
|
|
|
cpu="x86_64"
|
2008-12-31 17:55:26 +01:00
|
|
|
elif check_define __sparc__ ; then
|
|
|
|
# We can't check for 64 bit (when gcc is biarch) or V8PLUSA
|
|
|
|
# They must be specified using --sparc_cpu
|
|
|
|
if check_define __arch64__ ; then
|
|
|
|
cpu="sparc64"
|
|
|
|
else
|
|
|
|
cpu="sparc"
|
|
|
|
fi
|
2009-01-14 19:39:52 +01:00
|
|
|
elif check_define _ARCH_PPC ; then
|
|
|
|
if check_define _ARCH_PPC64 ; then
|
|
|
|
cpu="ppc64"
|
|
|
|
else
|
|
|
|
cpu="ppc"
|
|
|
|
fi
|
2008-12-29 18:14:15 +01:00
|
|
|
else
|
2009-01-14 19:39:52 +01:00
|
|
|
cpu=`uname -m`
|
2008-12-29 18:14:15 +01:00
|
|
|
fi
|
|
|
|
|
2005-01-11 00:18:50 +01:00
|
|
|
target_list=""
|
2003-03-07 00:23:54 +01:00
|
|
|
case "$cpu" in
|
|
|
|
i386|i486|i586|i686|i86pc|BePC)
|
2003-08-10 23:36:04 +02:00
|
|
|
cpu="i386"
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2008-04-12 00:04:22 +02:00
|
|
|
x86_64|amd64)
|
|
|
|
cpu="x86_64"
|
|
|
|
;;
|
|
|
|
alpha)
|
|
|
|
cpu="alpha"
|
|
|
|
;;
|
2005-03-13 10:49:52 +01:00
|
|
|
armv*b)
|
2004-12-20 00:33:47 +01:00
|
|
|
cpu="armv4b"
|
|
|
|
;;
|
2005-03-13 10:49:52 +01:00
|
|
|
armv*l)
|
2003-03-07 00:23:54 +01:00
|
|
|
cpu="armv4l"
|
|
|
|
;;
|
2008-04-12 00:04:22 +02:00
|
|
|
cris)
|
|
|
|
cpu="cris"
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2008-04-12 22:14:54 +02:00
|
|
|
parisc|parisc64)
|
|
|
|
cpu="hppa"
|
|
|
|
;;
|
2008-04-12 00:04:22 +02:00
|
|
|
ia64)
|
|
|
|
cpu="ia64"
|
|
|
|
;;
|
|
|
|
m68k)
|
|
|
|
cpu="m68k"
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
|
|
|
mips)
|
|
|
|
cpu="mips"
|
|
|
|
;;
|
2007-04-01 13:16:48 +02:00
|
|
|
mips64)
|
|
|
|
cpu="mips64"
|
|
|
|
;;
|
2009-01-14 19:39:52 +01:00
|
|
|
ppc)
|
|
|
|
cpu="ppc"
|
|
|
|
;;
|
|
|
|
ppc64)
|
|
|
|
cpu="ppc64"
|
2007-10-08 15:38:27 +02:00
|
|
|
;;
|
2007-08-01 02:09:31 +02:00
|
|
|
s390*)
|
2003-03-29 18:32:36 +01:00
|
|
|
cpu="s390"
|
|
|
|
;;
|
2007-04-16 20:27:06 +02:00
|
|
|
sparc|sun4[cdmuv])
|
2003-05-13 20:59:59 +02:00
|
|
|
cpu="sparc"
|
|
|
|
;;
|
|
|
|
sparc64)
|
|
|
|
cpu="sparc64"
|
|
|
|
;;
|
2003-03-07 00:23:54 +01:00
|
|
|
*)
|
|
|
|
cpu="unknown"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
gprof="no"
|
2008-10-07 21:16:17 +02:00
|
|
|
sparse="no"
|
2003-03-07 00:23:54 +01:00
|
|
|
bigendian="no"
|
2004-04-01 01:37:16 +02:00
|
|
|
mingw32="no"
|
|
|
|
EXESUF=""
|
|
|
|
gdbstub="yes"
|
2004-06-04 13:13:20 +02:00
|
|
|
slirp="yes"
|
2008-07-23 20:14:33 +02:00
|
|
|
vde="yes"
|
2004-11-14 20:57:29 +01:00
|
|
|
fmod_lib=""
|
|
|
|
fmod_inc=""
|
2008-08-21 20:00:53 +02:00
|
|
|
oss_lib=""
|
2007-08-25 03:37:51 +02:00
|
|
|
vnc_tls="yes"
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-06 21:27:28 +01:00
|
|
|
vnc_sasl="yes"
|
2006-04-16 15:28:56 +02:00
|
|
|
bsd="no"
|
2005-01-11 00:18:50 +01:00
|
|
|
linux="no"
|
2008-11-01 15:50:20 +01:00
|
|
|
solaris="no"
|
2005-02-10 22:55:30 +01:00
|
|
|
kqemu="no"
|
2006-02-08 23:39:17 +01:00
|
|
|
profiler="no"
|
2005-03-01 22:37:28 +01:00
|
|
|
cocoa="no"
|
2005-07-02 15:32:17 +02:00
|
|
|
check_gfx="yes"
|
2006-03-19 15:54:16 +01:00
|
|
|
softmmu="yes"
|
2007-01-18 21:06:33 +01:00
|
|
|
linux_user="no"
|
|
|
|
darwin_user="no"
|
2008-10-26 21:33:16 +01:00
|
|
|
bsd_user="no"
|
2006-04-23 19:57:59 +02:00
|
|
|
build_docs="no"
|
2006-05-14 13:30:38 +02:00
|
|
|
uname_release=""
|
2008-02-10 17:33:14 +01:00
|
|
|
curses="yes"
|
2008-08-15 20:20:52 +02:00
|
|
|
aio="yes"
|
2008-05-29 16:34:11 +02:00
|
|
|
nptl="yes"
|
2008-06-23 20:33:30 +02:00
|
|
|
mixemu="no"
|
2008-09-29 01:49:55 +02:00
|
|
|
bluez="yes"
|
2008-11-05 17:04:33 +01:00
|
|
|
kvm="yes"
|
2008-11-05 17:28:56 +01:00
|
|
|
kerneldir=""
|
2008-11-18 02:42:22 +01:00
|
|
|
aix="no"
|
2008-11-27 16:45:16 +01:00
|
|
|
blobs="yes"
|
2008-12-16 11:43:48 +01:00
|
|
|
fdt="yes"
|
2009-03-03 18:37:21 +01:00
|
|
|
sdl_x11="no"
|
2003-03-07 00:23:54 +01:00
|
|
|
|
|
|
|
# OS specific
|
2008-12-29 18:14:15 +01:00
|
|
|
if check_define __linux__ ; then
|
|
|
|
targetos="Linux"
|
|
|
|
elif check_define _WIN32 ; then
|
|
|
|
targetos='MINGW32'
|
|
|
|
else
|
|
|
|
targetos=`uname -s`
|
|
|
|
fi
|
2003-03-07 00:23:54 +01:00
|
|
|
case $targetos in
|
2005-04-23 20:30:28 +02:00
|
|
|
CYGWIN*)
|
|
|
|
mingw32="yes"
|
2007-01-05 02:00:47 +01:00
|
|
|
OS_CFLAGS="-mno-cygwin"
|
2007-07-12 11:29:18 +02:00
|
|
|
if [ "$cpu" = "i386" ] ; then
|
|
|
|
kqemu="yes"
|
|
|
|
fi
|
2008-06-28 21:13:06 +02:00
|
|
|
audio_possible_drivers="sdl"
|
2005-04-23 20:30:28 +02:00
|
|
|
;;
|
2004-04-01 01:37:16 +02:00
|
|
|
MINGW32*)
|
|
|
|
mingw32="yes"
|
2007-07-12 11:29:18 +02:00
|
|
|
if [ "$cpu" = "i386" ] ; then
|
|
|
|
kqemu="yes"
|
|
|
|
fi
|
2008-06-28 21:13:06 +02:00
|
|
|
audio_possible_drivers="dsound sdl fmod"
|
2004-04-01 01:37:16 +02:00
|
|
|
;;
|
2007-06-23 18:03:36 +02:00
|
|
|
GNU/kFreeBSD)
|
2008-06-25 23:04:05 +02:00
|
|
|
audio_drv_list="oss"
|
2008-08-22 01:03:15 +02:00
|
|
|
audio_possible_drivers="oss sdl esd pa"
|
2007-06-23 18:03:36 +02:00
|
|
|
if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
|
|
|
|
kqemu="yes"
|
|
|
|
fi
|
|
|
|
;;
|
2004-05-12 21:32:15 +02:00
|
|
|
FreeBSD)
|
|
|
|
bsd="yes"
|
2008-06-25 23:04:05 +02:00
|
|
|
audio_drv_list="oss"
|
2008-08-22 01:03:15 +02:00
|
|
|
audio_possible_drivers="oss sdl esd pa"
|
2005-07-28 23:45:38 +02:00
|
|
|
if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
|
2005-04-23 19:44:28 +02:00
|
|
|
kqemu="yes"
|
|
|
|
fi
|
2004-05-12 21:32:15 +02:00
|
|
|
;;
|
2009-03-07 21:06:23 +01:00
|
|
|
DragonFly)
|
|
|
|
bsd="yes"
|
|
|
|
audio_drv_list="oss"
|
|
|
|
audio_possible_drivers="oss sdl esd pa"
|
|
|
|
if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
|
|
|
|
kqemu="yes"
|
|
|
|
fi
|
|
|
|
aio="no"
|
|
|
|
;;
|
2004-05-12 21:32:15 +02:00
|
|
|
NetBSD)
|
|
|
|
bsd="yes"
|
2008-06-25 23:04:05 +02:00
|
|
|
audio_drv_list="oss"
|
2008-06-28 21:13:06 +02:00
|
|
|
audio_possible_drivers="oss sdl esd"
|
2008-11-22 21:24:29 +01:00
|
|
|
oss_lib="-lossaudio"
|
2004-05-12 21:32:15 +02:00
|
|
|
;;
|
|
|
|
OpenBSD)
|
|
|
|
bsd="yes"
|
2008-08-15 20:33:42 +02:00
|
|
|
openbsd="yes"
|
2008-06-25 23:04:05 +02:00
|
|
|
audio_drv_list="oss"
|
2008-06-28 21:13:06 +02:00
|
|
|
audio_possible_drivers="oss sdl esd"
|
2008-08-21 20:00:53 +02:00
|
|
|
oss_lib="-lossaudio"
|
2004-05-12 21:32:15 +02:00
|
|
|
;;
|
2004-07-05 23:25:26 +02:00
|
|
|
Darwin)
|
|
|
|
bsd="yes"
|
|
|
|
darwin="yes"
|
2009-01-26 16:37:40 +01:00
|
|
|
# on Leopard most of the system is 32-bit, so we have to ask the kernel it if we can run 64-bit userspace code
|
2009-02-23 15:11:10 +01:00
|
|
|
if [ "$cpu" = "i386" ] ; then
|
|
|
|
is_x86_64=`sysctl -n hw.optional.x86_64`
|
|
|
|
[ "$is_x86_64" = "1" ] && cpu=x86_64
|
2009-01-26 16:37:40 +01:00
|
|
|
fi
|
|
|
|
if [ "$cpu" = "x86_64" ] ; then
|
|
|
|
OS_CFLAGS="-arch x86_64"
|
|
|
|
LDFLAGS="-arch x86_64"
|
|
|
|
else
|
|
|
|
OS_CFLAGS="-mdynamic-no-pic"
|
|
|
|
fi
|
2007-01-18 21:06:33 +01:00
|
|
|
darwin_user="yes"
|
2007-01-31 13:10:07 +01:00
|
|
|
cocoa="yes"
|
2008-06-25 23:04:05 +02:00
|
|
|
audio_drv_list="coreaudio"
|
2008-06-28 21:13:06 +02:00
|
|
|
audio_possible_drivers="coreaudio sdl fmod"
|
2008-01-08 01:00:20 +01:00
|
|
|
OS_LDFLAGS="-framework CoreFoundation -framework IOKit"
|
2004-07-05 23:25:26 +02:00
|
|
|
;;
|
2006-04-26 00:36:06 +02:00
|
|
|
SunOS)
|
2007-02-11 00:21:21 +01:00
|
|
|
solaris="yes"
|
|
|
|
make="gmake"
|
|
|
|
install="ginstall"
|
2007-04-01 20:54:44 +02:00
|
|
|
needs_libsunmath="no"
|
2007-02-11 00:21:21 +01:00
|
|
|
solarisrev=`uname -r | cut -f2 -d.`
|
2007-09-17 00:12:39 +02:00
|
|
|
# have to select again, because `uname -m` returns i86pc
|
|
|
|
# even on an x86_64 box.
|
|
|
|
solariscpu=`isainfo -k`
|
|
|
|
if test "${solariscpu}" = "amd64" ; then
|
|
|
|
cpu="x86_64"
|
|
|
|
fi
|
2007-02-11 00:21:21 +01:00
|
|
|
if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
|
2007-04-01 20:54:44 +02:00
|
|
|
if test "$solarisrev" -le 9 ; then
|
|
|
|
if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then
|
|
|
|
needs_libsunmath="yes"
|
|
|
|
else
|
|
|
|
echo "QEMU will not link correctly on Solaris 8/X86 or 9/x86 without"
|
|
|
|
echo "libsunmath from the Sun Studio compilers tools, due to a lack of"
|
|
|
|
echo "C99 math features in libm.so in Solaris 8/x86 and Solaris 9/x86"
|
|
|
|
echo "Studio 11 can be downloaded from www.sun.com."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$solarisrev" -ge 9 ; then
|
2007-02-11 00:21:21 +01:00
|
|
|
kqemu="yes"
|
|
|
|
fi
|
2007-02-11 01:31:33 +01:00
|
|
|
fi
|
2007-05-13 20:02:43 +02:00
|
|
|
if test -f /usr/include/sys/soundcard.h ; then
|
2008-06-25 23:04:05 +02:00
|
|
|
audio_drv_list="oss"
|
2007-05-13 20:02:43 +02:00
|
|
|
fi
|
2008-06-28 21:13:06 +02:00
|
|
|
audio_possible_drivers="oss sdl"
|
2007-02-11 01:31:33 +01:00
|
|
|
;;
|
2008-11-18 02:42:22 +01:00
|
|
|
AIX)
|
|
|
|
aix="yes"
|
|
|
|
make="gmake"
|
|
|
|
;;
|
2005-10-30 19:58:22 +01:00
|
|
|
*)
|
2008-06-25 23:04:05 +02:00
|
|
|
audio_drv_list="oss"
|
2008-07-02 23:03:08 +02:00
|
|
|
audio_possible_drivers="oss alsa sdl esd pa"
|
2005-01-11 00:18:50 +01:00
|
|
|
linux="yes"
|
2007-01-18 21:06:33 +01:00
|
|
|
linux_user="yes"
|
2008-11-22 22:03:55 +01:00
|
|
|
usb="linux"
|
2005-04-23 19:44:28 +02:00
|
|
|
if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
|
2005-02-10 22:55:30 +01:00
|
|
|
kqemu="yes"
|
2008-06-28 21:13:06 +02:00
|
|
|
audio_possible_drivers="$audio_possible_drivers fmod"
|
2005-02-10 22:55:30 +01:00
|
|
|
fi
|
2004-11-10 00:09:44 +01:00
|
|
|
;;
|
2003-03-07 00:23:54 +01:00
|
|
|
esac
|
|
|
|
|
2004-05-12 21:32:15 +02:00
|
|
|
if [ "$bsd" = "yes" ] ; then
|
2006-04-16 15:28:56 +02:00
|
|
|
if [ "$darwin" != "yes" ] ; then
|
2004-07-05 23:25:26 +02:00
|
|
|
make="gmake"
|
2008-11-22 22:03:55 +01:00
|
|
|
usb="bsd"
|
2004-07-05 23:25:26 +02:00
|
|
|
fi
|
2008-10-26 21:33:16 +01:00
|
|
|
bsd_user="yes"
|
2004-05-12 21:32:15 +02:00
|
|
|
fi
|
|
|
|
|
2003-03-07 00:23:54 +01:00
|
|
|
# find source path
|
2006-04-16 14:41:07 +02:00
|
|
|
source_path=`dirname "$0"`
|
2008-02-03 05:22:24 +01:00
|
|
|
source_path_used="no"
|
|
|
|
workdir=`pwd`
|
2006-04-16 14:41:07 +02:00
|
|
|
if [ -z "$source_path" ]; then
|
2008-02-03 05:22:24 +01:00
|
|
|
source_path=$workdir
|
2006-04-16 14:41:07 +02:00
|
|
|
else
|
|
|
|
source_path=`cd "$source_path"; pwd`
|
2003-03-07 00:23:54 +01:00
|
|
|
fi
|
2008-02-03 20:20:13 +01:00
|
|
|
[ -f "$workdir/vl.c" ] || source_path_used="yes"
|
2003-03-07 00:23:54 +01:00
|
|
|
|
2007-11-11 21:17:03 +01:00
|
|
|
werror="no"
|
2007-11-11 21:24:30 +01:00
|
|
|
# generate compile errors on warnings for development builds
|
|
|
|
#if grep cvs $source_path/VERSION > /dev/null 2>&1 ; then
|
|
|
|
#werror="yes";
|
|
|
|
#fi
|
2007-11-11 21:17:03 +01:00
|
|
|
|
2003-03-07 00:23:54 +01:00
|
|
|
for opt do
|
2006-04-30 01:05:22 +02:00
|
|
|
optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`
|
2003-03-07 00:23:54 +01:00
|
|
|
case "$opt" in
|
2005-12-18 20:14:49 +01:00
|
|
|
--help|-h) show_help=yes
|
|
|
|
;;
|
2006-04-16 15:28:56 +02:00
|
|
|
--prefix=*) prefix="$optarg"
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2006-04-16 15:28:56 +02:00
|
|
|
--interp-prefix=*) interp_prefix="$optarg"
|
2003-04-11 02:16:16 +02:00
|
|
|
;;
|
2006-04-16 15:28:56 +02:00
|
|
|
--source-path=*) source_path="$optarg"
|
2006-04-16 14:41:07 +02:00
|
|
|
source_path_used="yes"
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2008-12-29 18:14:15 +01:00
|
|
|
--cross-prefix=*)
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2008-12-29 18:14:15 +01:00
|
|
|
--cc=*)
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2006-04-16 15:28:56 +02:00
|
|
|
--host-cc=*) host_cc="$optarg"
|
2005-07-23 16:27:54 +02:00
|
|
|
;;
|
2006-04-16 15:28:56 +02:00
|
|
|
--make=*) make="$optarg"
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2006-04-17 15:57:12 +02:00
|
|
|
--install=*) install="$optarg"
|
|
|
|
;;
|
2006-04-16 15:28:56 +02:00
|
|
|
--extra-cflags=*) CFLAGS="$optarg"
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2006-04-16 15:28:56 +02:00
|
|
|
--extra-ldflags=*) LDFLAGS="$optarg"
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2006-04-16 15:28:56 +02:00
|
|
|
--cpu=*) cpu="$optarg"
|
2003-03-07 00:23:54 +01:00
|
|
|
;;
|
2006-04-16 15:28:56 +02:00
|
|
|
--target-list=*) target_list="$optarg"
|
2003-06-15 22:25:43 +02:00
|
|
|
;;
|
2003-03-07 00:23:54 +01:00
|
|
|
--enable-gprof) gprof="yes"
|
|
|
|
;;
|
2003-06-09 21:53:12 +02:00
|
|
|
--static) static="yes"
|
|
|
|
;;
|
2003-08-10 23:36:04 +02:00
|
|
|
--disable-sdl) sdl="no"
|
|
|
|
;;
|
2008-06-25 23:04:05 +02:00
|
|
|
--fmod-lib=*) fmod_lib="$optarg"
|
2005-10-30 19:58:22 +01:00
|
|
|
;;
|
2008-06-28 21:13:06 +02:00
|
|
|
--fmod-inc=*) fmod_inc="$optarg"
|
|
|
|
;;
|
2008-08-21 20:00:53 +02:00
|
|
|
--oss-lib=*) oss_lib="$optarg"
|
|
|
|
;;
|
2008-07-29 14:58:44 +02:00
|
|
|
--audio-card-list=*) audio_card_list=`echo "$optarg" | sed -e 's/,/ /g'`
|
2004-11-14 20:57:29 +01:00
|
|
|
;;
|
2008-06-25 23:04:05 +02:00
|
|
|
--audio-drv-list=*) audio_drv_list="$optarg"
|
2004-11-14 20:57:29 +01:00
|
|
|
;;
|
2008-10-07 21:16:17 +02:00
|
|
|
--enable-sparse) sparse="yes"
|
|
|
|
;;
|
|
|
|
--disable-sparse) sparse="no"
|
|
|
|
;;
|
2007-08-25 03:37:51 +02:00
|
|
|
--disable-vnc-tls) vnc_tls="no"
|
|
|
|
;;
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-06 21:27:28 +01:00
|
|
|
--disable-vnc-sasl) vnc_sasl="no"
|
|
|
|
;;
|
2004-06-04 13:13:20 +02:00
|
|
|
--disable-slirp) slirp="no"
|
2005-10-30 19:58:22 +01:00
|
|
|
;;
|
2008-07-23 20:14:33 +02:00
|
|
|
--disable-vde) vde="no"
|
2008-07-19 11:56:24 +02:00
|
|
|
;;
|
2005-02-10 22:55:30 +01:00
|
|
|
--disable-kqemu) kqemu="no"
|
2005-10-30 19:58:22 +01:00
|
|
|
;;
|
2008-04-08 08:01:02 +02:00
|
|
|
--disable-brlapi) brlapi="no"
|
|
|
|
;;
|
2008-09-29 01:49:55 +02:00
|
|
|
--disable-bluez) bluez="no"
|
|
|
|
;;
|
2008-11-05 17:04:33 +01:00
|
|
|
--disable-kvm) kvm="no"
|
|
|
|
;;
|
2006-02-08 23:39:17 +01:00
|
|
|
--enable-profiler) profiler="yes"
|
|
|
|
;;
|
2008-06-28 21:13:06 +02:00
|
|
|
--enable-cocoa)
|
|
|
|
cocoa="yes" ;
|
|
|
|
sdl="no" ;
|
|
|
|
audio_drv_list="coreaudio `echo $audio_drv_list | sed s,coreaudio,,g`"
|
2005-10-30 19:58:22 +01:00
|
|
|
;;
|
2005-07-02 15:32:17 +02:00
|
|
|
--disable-gfx-check) check_gfx="no"
|
|
|
|
;;
|
2006-03-19 17:31:11 +01:00
|
|
|
--disable-system) softmmu="no"
|
2006-03-19 15:54:16 +01:00
|
|
|
;;
|
2006-03-19 17:31:11 +01:00
|
|
|
--enable-system) softmmu="yes"
|
2006-03-19 15:54:16 +01:00
|
|
|
;;
|
2007-01-18 21:06:33 +01:00
|
|
|
--disable-linux-user) linux_user="no"
|
2006-03-19 15:54:16 +01:00
|
|
|
;;
|
2007-01-18 21:06:33 +01:00
|
|
|
--enable-linux-user) linux_user="yes"
|
|
|
|
;;
|
|
|
|
--disable-darwin-user) darwin_user="no"
|
|
|
|
;;
|
|
|
|
--enable-darwin-user) darwin_user="yes"
|
2006-03-19 15:54:16 +01:00
|
|
|
;;
|
2008-10-26 21:33:16 +01:00
|
|
|
--disable-bsd-user) bsd_user="no"
|
|
|
|
;;
|
|
|
|
--enable-bsd-user) bsd_user="yes"
|
|
|
|
;;
|
2006-05-14 13:30:38 +02:00
|
|
|
--enable-uname-release=*) uname_release="$optarg"
|
|
|
|
;;
|
2007-04-16 20:27:06 +02:00
|
|
|
--sparc_cpu=*)
|
|
|
|
sparc_cpu="$optarg"
|
|
|
|
case $sparc_cpu in
|
|
|
|
v7|v8) SP_CFLAGS="-m32 -mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
|
|
|
|
target_cpu="sparc"; cpu="sparc" ;;
|
|
|
|
v8plus|v8plusa) SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
|
|
|
|
target_cpu="sparc"; cpu="sparc" ;;
|
|
|
|
v9) SP_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m64"
|
|
|
|
target_cpu="sparc64"; cpu="sparc64" ;;
|
|
|
|
*) echo "undefined SPARC architecture. Exiting";exit 1;;
|
|
|
|
esac
|
|
|
|
;;
|
2007-11-11 21:17:03 +01:00
|
|
|
--enable-werror) werror="yes"
|
|
|
|
;;
|
|
|
|
--disable-werror) werror="no"
|
|
|
|
;;
|
2008-02-10 17:33:14 +01:00
|
|
|
--disable-curses) curses="no"
|
|
|
|
;;
|
2008-05-29 16:34:11 +02:00
|
|
|
--disable-nptl) nptl="no"
|
|
|
|
;;
|
2008-06-23 20:33:30 +02:00
|
|
|
--enable-mixemu) mixemu="yes"
|
|
|
|
;;
|
2008-08-15 20:20:52 +02:00
|
|
|
--disable-aio) aio="no"
|
|
|
|
;;
|
2008-11-27 16:45:16 +01:00
|
|
|
--disable-blobs) blobs="no"
|
|
|
|
;;
|
2008-11-05 17:28:56 +01:00
|
|
|
--kerneldir=*) kerneldir="$optarg"
|
|
|
|
;;
|
2007-11-17 11:24:32 +01:00
|
|
|
*) echo "ERROR: unknown option $opt"; show_help="yes"
|
|
|
|
;;
|
2003-03-07 00:23:54 +01:00
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2007-01-05 02:00:47 +01:00
|
|
|
# default flags for all hosts
|
2008-09-14 08:46:31 +02:00
|
|
|
CFLAGS="$CFLAGS -O2 -g -fno-strict-aliasing"
|
2008-12-07 20:16:27 +01:00
|
|
|
CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
|
2007-01-05 02:00:47 +01:00
|
|
|
LDFLAGS="$LDFLAGS -g"
|
2007-11-11 21:17:03 +01:00
|
|
|
if test "$werror" = "yes" ; then
|
|
|
|
CFLAGS="$CFLAGS -Werror"
|
|
|
|
fi
|
2007-01-05 02:00:47 +01:00
|
|
|
|
2008-11-01 15:50:20 +01:00
|
|
|
if test "$solaris" = "no" ; then
|
|
|
|
if ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; then
|
|
|
|
LDFLAGS="$LDFLAGS -Wl,--warn-common"
|
|
|
|
fi
|
2008-09-17 21:05:19 +02:00
|
|
|
fi
|
|
|
|
|
2007-04-16 20:27:06 +02:00
|
|
|
#
|
|
|
|
# If cpu ~= sparc and sparc_cpu hasn't been defined, plug in the right
|
|
|
|
# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
|
|
|
|
#
|
2008-01-31 12:32:10 +01:00
|
|
|
case "$cpu" in
|
2007-04-16 20:27:06 +02:00
|
|
|
sparc) if test -z "$sparc_cpu" ; then
|
|
|
|
ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__"
|
|
|
|
ARCH_LDFLAGS="-m32"
|
|
|
|
else
|
|
|
|
ARCH_CFLAGS="${SP_CFLAGS}"
|
|
|
|
ARCH_LDFLAGS="${SP_LDFLAGS}"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
sparc64) if test -z "$sparc_cpu" ; then
|
|
|
|
ARCH_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__"
|
|
|
|
ARCH_LDFLAGS="-m64"
|
|
|
|
else
|
|
|
|
ARCH_CFLAGS="${SP_CFLAGS}"
|
|
|
|
ARCH_LDFLAGS="${SP_LDFLAGS}"
|
|
|
|
fi
|
|
|
|
;;
|
2007-11-18 22:22:10 +01:00
|
|
|
s390)
|
|
|
|
ARCH_CFLAGS="-march=z900"
|
|
|
|
;;
|
2008-01-31 12:32:10 +01:00
|
|
|
i386)
|
|
|
|
ARCH_CFLAGS="-m32"
|
|
|
|
ARCH_LDFLAGS="-m32"
|
|
|
|
;;
|
|
|
|
x86_64)
|
|
|
|
ARCH_CFLAGS="-m64"
|
|
|
|
ARCH_LDFLAGS="-m64"
|
|
|
|
;;
|
2007-04-16 20:27:06 +02:00
|
|
|
esac
|
|
|
|
|
2006-04-08 16:26:41 +02:00
|
|
|
if test x"$show_help" = x"yes" ; then
|
|
|
|
cat << EOF
|
|
|
|
|
|
|
|
Usage: configure [options]
|
|
|
|
Options: [defaults in brackets after descriptions]
|
|
|
|
|
|
|
|
EOF
|
|
|
|
echo "Standard options:"
|
|
|
|
echo " --help print this message"
|
|
|
|
echo " --prefix=PREFIX install in PREFIX [$prefix]"
|
|
|
|
echo " --interp-prefix=PREFIX where to find shared libraries, etc."
|
|
|
|
echo " use %M for cpu name [$interp_prefix]"
|
|
|
|
echo " --target-list=LIST set target list [$target_list]"
|
|
|
|
echo ""
|
|
|
|
echo "kqemu kernel acceleration support:"
|
|
|
|
echo " --disable-kqemu disable kqemu support"
|
|
|
|
echo ""
|
|
|
|
echo "Advanced options (experts only):"
|
|
|
|
echo " --source-path=PATH path of source code [$source_path]"
|
|
|
|
echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"
|
|
|
|
echo " --cc=CC use C compiler CC [$cc]"
|
|
|
|
echo " --host-cc=CC use C compiler CC [$host_cc] for dyngen etc."
|
|
|
|
echo " --make=MAKE use specified make [$make]"
|
2006-04-17 15:57:12 +02:00
|
|
|
echo " --install=INSTALL use specified install [$install]"
|
2006-04-08 16:26:41 +02:00
|
|
|
echo " --static enable static build [$static]"
|
2008-10-07 23:22:41 +02:00
|
|
|
echo " --enable-sparse enable sparse checker"
|
|
|
|
echo " --disable-sparse disable sparse checker (default)"
|
2007-11-11 21:17:03 +01:00
|
|
|
echo " --disable-werror disable compilation abort on warning"
|
2007-10-31 02:03:28 +01:00
|
|
|
echo " --disable-sdl disable SDL"
|
2006-04-08 16:26:41 +02:00
|
|
|
echo " --enable-cocoa enable COCOA (Mac OS X only)"
|
2008-06-28 21:13:06 +02:00
|
|
|
echo " --audio-drv-list=LIST set audio drivers list:"
|
|
|
|
echo " Available drivers: $audio_possible_drivers"
|
2009-01-09 11:46:34 +01:00
|
|
|
echo " --audio-card-list=LIST set list of emulated audio cards [$audio_card_list]"
|
|
|
|
echo " Available cards: $audio_possible_cards"
|
2008-06-23 20:33:30 +02:00
|
|
|
echo " --enable-mixemu enable mixer emulation"
|
2008-04-08 08:01:02 +02:00
|
|
|
echo " --disable-brlapi disable BrlAPI"
|
2007-08-25 03:37:51 +02:00
|
|
|
echo " --disable-vnc-tls disable TLS encryption for VNC server"
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-06 21:27:28 +01:00
|
|
|
echo " --disable-vnc-sasl disable SASL encryption for VNC server"
|
2008-03-23 01:47:42 +01:00
|
|
|
echo " --disable-curses disable curses output"
|
2008-09-29 01:49:55 +02:00
|
|
|
echo " --disable-bluez disable bluez stack connectivity"
|
2008-11-05 17:04:33 +01:00
|
|
|
echo " --disable-kvm disable KVM acceleration support"
|
2008-05-29 16:34:11 +02:00
|
|
|
echo " --disable-nptl disable usermode NPTL support"
|
2006-04-08 16:26:41 +02:00
|
|
|
echo " --enable-system enable all system emulation targets"
|
|
|
|
echo " --disable-system disable all system emulation targets"
|
2007-01-18 21:06:33 +01:00
|
|
|
echo " --enable-linux-user enable all linux usermode emulation targets"
|
|
|
|
echo " --disable-linux-user disable all linux usermode emulation targets"
|
|
|
|
echo " --enable-darwin-user enable all darwin usermode emulation targets"
|
|
|
|
echo " --disable-darwin-user disable all darwin usermode emulation targets"
|
2008-10-26 21:33:16 +01:00
|
|
|
echo " --enable-bsd-user enable all BSD usermode emulation targets"
|
|
|
|
echo " --disable-bsd-user disable all BSD usermode emulation targets"
|
2006-04-08 16:26:41 +02:00
|
|
|
echo " --fmod-lib path to FMOD library"
|
|
|
|
echo " --fmod-inc path to FMOD includes"
|
2008-08-21 20:00:53 +02:00
|
|
|
echo " --oss-lib path to OSS library"
|
2006-05-14 13:30:38 +02:00
|
|
|
echo " --enable-uname-release=R Return R for uname -r in usermode emulation"
|
2007-04-16 20:27:06 +02:00
|
|
|
echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9"
|
2008-07-23 20:14:33 +02:00
|
|
|
echo " --disable-vde disable support for vde network"
|
2008-08-15 20:20:52 +02:00
|
|
|
echo " --disable-aio disable AIO support"
|
2008-11-27 16:45:16 +01:00
|
|
|
echo " --disable-blobs disable installing provided firmware blobs"
|
2008-11-05 17:28:56 +01:00
|
|
|
echo " --kerneldir=PATH look for kernel includes in PATH"
|
2006-04-08 16:26:41 +02:00
|
|
|
echo ""
|
2006-12-23 01:33:26 +01:00
|
|
|
echo "NOTE: The object files are built at the place where configure is launched"
|
2006-04-08 16:26:41 +02:00
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2004-04-01 01:37:16 +02:00
|
|
|
if test "$mingw32" = "yes" ; then
|
2005-01-11 00:18:50 +01:00
|
|
|
linux="no"
|
2004-04-01 01:37:16 +02:00
|
|
|
EXESUF=".exe"
|
2004-11-14 19:59:52 +01:00
|
|
|
oss="no"
|
2008-08-21 21:25:45 +02:00
|
|
|
linux_user="no"
|
2008-10-26 21:33:16 +01:00
|
|
|
bsd_user="no"
|
2009-03-08 17:26:59 +01:00
|
|
|
OS_CFLAGS="$OS_CFLAGS -DWIN32_LEAN_AND_MEAN -DWINVER=0x501"
|
2008-08-21 21:25:45 +02:00
|
|
|
fi
|
|
|
|
|
2008-10-07 21:16:17 +02:00
|
|
|
if test ! -x "$(which cgcc 2>/dev/null)"; then
|
|
|
|
sparse="no"
|
|
|
|
fi
|
|
|
|
|
2006-04-26 00:36:06 +02:00
|
|
|
#
|
|
|
|
# Solaris specific configure tool chain decisions
|
|
|
|
#
|
|
|
|
if test "$solaris" = "yes" ; then
|
|
|
|
solinst=`which $install 2> /dev/null | /usr/bin/grep -v "no $install in"`
|
|
|
|
if test -z "$solinst" ; then
|
|
|
|
echo "Solaris install program not found. Use --install=/usr/ucb/install or"
|
|
|
|
echo "install fileutils from www.blastwave.org using pkg-get -i fileutils"
|
|
|
|
echo "to get ginstall which is used by default (which lives in /opt/csw/bin)"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
if test "$solinst" = "/usr/sbin/install" ; then
|
|
|
|
echo "Error: Solaris /usr/sbin/install is not an appropriate install program."
|
|
|
|
echo "try ginstall from the GNU fileutils available from www.blastwave.org"
|
|
|
|
echo "using pkg-get -i fileutils, or use --install=/usr/ucb/install"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
sol_ar=`which ar 2> /dev/null | /usr/bin/grep -v "no ar in"`
|
|
|
|
if test -z "$sol_ar" ; then
|
|
|
|
echo "Error: No path includes ar"
|
|
|
|
if test -f /usr/ccs/bin/ar ; then
|
|
|
|
echo "Add /usr/ccs/bin to your path and rerun configure"
|
|
|
|
fi
|
|
|
|
exit 1
|
|
|
|
fi
|
2007-09-16 23:08:06 +02:00
|
|
|
fi
|
2006-04-26 00:36:06 +02:00
|
|
|
|
|
|
|
|
2005-01-11 00:18:50 +01:00
|
|
|
if test -z "$target_list" ; then
|
|
|
|
# these targets are portable
|
2006-03-19 15:54:16 +01:00
|
|
|
if [ "$softmmu" = "yes" ] ; then
|
2008-04-20 22:19:44 +02:00
|
|
|
target_list="\
|
|
|
|
i386-softmmu \
|
|
|
|
x86_64-softmmu \
|
|
|
|
arm-softmmu \
|
|
|
|
cris-softmmu \
|
|
|
|
m68k-softmmu \
|
|
|
|
mips-softmmu \
|
|
|
|
mipsel-softmmu \
|
|
|
|
mips64-softmmu \
|
|
|
|
mips64el-softmmu \
|
|
|
|
ppc-softmmu \
|
|
|
|
ppcemb-softmmu \
|
|
|
|
ppc64-softmmu \
|
|
|
|
sh4-softmmu \
|
|
|
|
sh4eb-softmmu \
|
|
|
|
sparc-softmmu \
|
|
|
|
"
|
2006-03-19 15:54:16 +01:00
|
|
|
fi
|
2005-01-11 00:18:50 +01:00
|
|
|
# the following are Linux specific
|
2007-01-18 21:06:33 +01:00
|
|
|
if [ "$linux_user" = "yes" ] ; then
|
2008-04-20 22:19:44 +02:00
|
|
|
target_list="${target_list}\
|
|
|
|
i386-linux-user \
|
|
|
|
x86_64-linux-user \
|
|
|
|
alpha-linux-user \
|
|
|
|
arm-linux-user \
|
|
|
|
armeb-linux-user \
|
|
|
|
cris-linux-user \
|
|
|
|
m68k-linux-user \
|
|
|
|
mips-linux-user \
|
|
|
|
mipsel-linux-user \
|
|
|
|
ppc-linux-user \
|
|
|
|
ppc64-linux-user \
|
|
|
|
ppc64abi32-linux-user \
|
|
|
|
sh4-linux-user \
|
|
|
|
sh4eb-linux-user \
|
|
|
|
sparc-linux-user \
|
|
|
|
sparc64-linux-user \
|
|
|
|
sparc32plus-linux-user \
|
|
|
|
"
|
2007-01-18 21:06:33 +01:00
|
|
|
fi
|
|
|
|
# the following are Darwin specific
|
|
|
|
if [ "$darwin_user" = "yes" ] ; then
|
2009-01-06 19:57:51 +01:00
|
|
|
target_list="$target_list i386-darwin-user ppc-darwin-user "
|
2005-01-11 00:18:50 +01:00
|
|
|
fi
|
2008-10-26 21:33:16 +01:00
|
|
|
# the following are BSD specific
|
|
|
|
if [ "$bsd_user" = "yes" ] ; then
|
|
|
|
target_list="${target_list}\
|
|
|
|
sparc64-bsd-user \
|
|
|
|
"
|
|
|
|
fi
|
2005-06-05 17:56:02 +02:00
|
|
|
else
|
2006-04-16 15:28:56 +02:00
|
|
|
target_list=`echo "$target_list" | sed -e 's/,/ /g'`
|
2005-01-11 00:18:50 +01:00
|
|
|
fi
|
2006-03-19 15:54:16 +01:00
|
|
|
if test -z "$target_list" ; then
|
|
|
|
echo "No targets enabled"
|
|
|
|
exit 1
|
|
|
|
fi
|
2005-01-11 00:18:50 +01:00
|
|
|
|
2003-03-07 00:23:54 +01:00
|
|
|
if test -z "$cross_prefix" ; then
|
|
|
|
|
|
|
|
# ---
|
|
|
|
# big/little endian test
|
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <inttypes.h>
|
|
|
|
int main(int argc, char ** argv){
|
2005-10-30 19:58:22 +01:00
|
|
|
volatile uint32_t i=0x01234567;
|
|
|
|
return (*((uint8_t*)(&i))) == 0x67;
|
2003-03-07 00:23:54 +01:00
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2008-12-08 19:11:57 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
|
2003-03-07 00:23:54 +01:00
|
|
|
$TMPE && bigendian="yes"
|
|
|
|
else
|
|
|
|
echo big/little test failed
|
|
|
|
fi
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
# if cross compiling, cannot launch a program, so make a static guess
|
2008-04-11 23:36:06 +02:00
|
|
|
if test "$cpu" = "armv4b" \
|
2008-04-12 22:14:54 +02:00
|
|
|
-o "$cpu" = "hppa" \
|
2008-04-11 23:36:06 +02:00
|
|
|
-o "$cpu" = "m68k" \
|
|
|
|
-o "$cpu" = "mips" \
|
|
|
|
-o "$cpu" = "mips64" \
|
2009-01-14 19:39:52 +01:00
|
|
|
-o "$cpu" = "ppc" \
|
|
|
|
-o "$cpu" = "ppc64" \
|
2008-04-11 23:36:06 +02:00
|
|
|
-o "$cpu" = "s390" \
|
|
|
|
-o "$cpu" = "sparc" \
|
|
|
|
-o "$cpu" = "sparc64"; then
|
2003-03-07 00:23:54 +01:00
|
|
|
bigendian="yes"
|
|
|
|
fi
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
2005-06-05 19:10:39 +02:00
|
|
|
# host long bits test
|
|
|
|
hostlongbits="32"
|
2008-04-11 23:36:06 +02:00
|
|
|
if test "$cpu" = "x86_64" \
|
|
|
|
-o "$cpu" = "alpha" \
|
|
|
|
-o "$cpu" = "ia64" \
|
2009-01-14 19:39:52 +01:00
|
|
|
-o "$cpu" = "sparc64" \
|
|
|
|
-o "$cpu" = "ppc64"; then
|
2005-06-05 19:10:39 +02:00
|
|
|
hostlongbits="64"
|
|
|
|
fi
|
|
|
|
|
2003-06-25 18:08:13 +02:00
|
|
|
# check gcc options support
|
2003-03-20 23:33:23 +01:00
|
|
|
cat > $TMPC <<EOF
|
|
|
|
int main(void) {
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2008-05-29 16:34:11 +02:00
|
|
|
# Check host NPTL support
|
|
|
|
cat > $TMPC <<EOF
|
|
|
|
#include <sched.h>
|
2008-06-02 17:45:44 +02:00
|
|
|
#include <linux/futex.h>
|
2008-05-29 16:34:11 +02:00
|
|
|
void foo()
|
|
|
|
{
|
|
|
|
#if !defined(CLONE_SETTLS) || !defined(FUTEX_WAIT)
|
|
|
|
#error bork
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2008-12-15 04:15:36 +01:00
|
|
|
if $cc $ARCH_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null ; then
|
2008-05-29 16:34:11 +02:00
|
|
|
:
|
|
|
|
else
|
|
|
|
nptl="no"
|
|
|
|
fi
|
|
|
|
|
2008-10-11 11:56:04 +02:00
|
|
|
##########################################
|
|
|
|
# zlib check
|
|
|
|
|
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <zlib.h>
|
|
|
|
int main(void) { zlibVersion(); return 0; }
|
|
|
|
EOF
|
2008-12-15 04:15:36 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC -lz > /dev/null 2> /dev/null ; then
|
2008-10-11 11:56:04 +02:00
|
|
|
:
|
|
|
|
else
|
|
|
|
echo
|
|
|
|
echo "Error: zlib check failed"
|
|
|
|
echo "Make sure to have the zlib libs and headers installed."
|
|
|
|
echo
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2004-04-02 22:55:59 +02:00
|
|
|
##########################################
|
|
|
|
# SDL probe
|
|
|
|
|
|
|
|
sdl_too_old=no
|
|
|
|
|
|
|
|
if test -z "$sdl" ; then
|
2007-07-12 02:27:15 +02:00
|
|
|
sdl_config="sdl-config"
|
|
|
|
sdl=no
|
|
|
|
sdl_static=no
|
|
|
|
|
2004-04-02 22:55:59 +02:00
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <SDL.h>
|
|
|
|
#undef main /* We don't want SDL to override our main() */
|
|
|
|
int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
|
|
|
|
EOF
|
2008-12-15 04:15:36 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` > $TMPSDLLOG 2>&1 ; then
|
2008-08-21 21:25:45 +02:00
|
|
|
_sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
|
|
|
|
if test "$_sdlversion" -lt 121 ; then
|
|
|
|
sdl_too_old=yes
|
|
|
|
else
|
|
|
|
if test "$cocoa" = "no" ; then
|
|
|
|
sdl=yes
|
2007-07-12 02:27:15 +02:00
|
|
|
fi
|
2008-08-21 21:25:45 +02:00
|
|
|
fi
|
2004-04-02 22:55:59 +02:00
|
|
|
|
2008-08-21 21:25:45 +02:00
|
|
|
# static link with sdl ?
|
|
|
|
if test "$sdl" = "yes" ; then
|
|
|
|
aa="no"
|
|
|
|
`$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
|
|
|
|
sdl_static_libs=`$sdl_config --static-libs 2>/dev/null`
|
|
|
|
if [ "$aa" = "yes" ] ; then
|
|
|
|
sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
|
|
|
|
fi
|
|
|
|
|
2008-12-15 04:15:36 +01:00
|
|
|
if $cc -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs > /dev/null 2> /dev/null; then
|
2008-08-21 21:25:45 +02:00
|
|
|
sdl_static=yes
|
|
|
|
fi
|
|
|
|
fi # static link
|
|
|
|
fi # sdl compile test
|
2007-01-31 13:10:07 +01:00
|
|
|
else
|
2007-07-12 02:27:15 +02:00
|
|
|
# Make sure to disable cocoa if sdl was set
|
|
|
|
if test "$sdl" = "yes" ; then
|
|
|
|
cocoa="no"
|
2008-06-28 21:13:06 +02:00
|
|
|
audio_drv_list="`echo $audio_drv_list | sed s,coreaudio,,g`"
|
2007-07-12 02:27:15 +02:00
|
|
|
fi
|
2004-04-02 23:55:47 +02:00
|
|
|
fi # -z $sdl
|
2004-04-02 22:55:59 +02:00
|
|
|
|
2009-03-03 18:37:21 +01:00
|
|
|
if test "$sdl" = "yes" ; then
|
|
|
|
cat > $TMPC <<EOF
|
|
|
|
#include <SDL.h>
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_X11)
|
|
|
|
#include <X11/XKBlib.h>
|
|
|
|
#else
|
|
|
|
#error No x11 support
|
|
|
|
#endif
|
|
|
|
int main(void) { return 0; }
|
|
|
|
EOF
|
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` > /dev/null 2>&1 ; then
|
|
|
|
sdl_x11="yes"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2007-08-25 03:37:51 +02:00
|
|
|
##########################################
|
|
|
|
# VNC TLS detection
|
|
|
|
if test "$vnc_tls" = "yes" ; then
|
2008-08-06 18:55:50 +02:00
|
|
|
cat > $TMPC <<EOF
|
|
|
|
#include <gnutls/gnutls.h>
|
|
|
|
int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; }
|
|
|
|
EOF
|
|
|
|
vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null`
|
|
|
|
vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`
|
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_tls_cflags $TMPC \
|
2008-12-15 04:15:36 +01:00
|
|
|
$vnc_tls_libs > /dev/null 2> /dev/null ; then
|
2008-08-06 18:55:50 +02:00
|
|
|
:
|
|
|
|
else
|
|
|
|
vnc_tls="no"
|
|
|
|
fi
|
2007-08-25 03:37:51 +02:00
|
|
|
fi
|
|
|
|
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-06 21:27:28 +01:00
|
|
|
##########################################
|
|
|
|
# VNC SASL detection
|
|
|
|
if test "$vnc_sasl" = "yes" ; then
|
|
|
|
cat > $TMPC <<EOF
|
|
|
|
#include <sasl/sasl.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
int main(void) { sasl_server_init(NULL, "qemu"); return 0; }
|
|
|
|
EOF
|
|
|
|
# Assuming Cyrus-SASL installed in /usr prefix
|
|
|
|
vnc_sasl_cflags=""
|
|
|
|
vnc_sasl_libs="-lsasl2"
|
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_sasl_cflags $TMPC \
|
|
|
|
$vnc_sasl_libs 2> /dev/null ; then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
vnc_sasl="no"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
Support ACLs for controlling VNC access ("Daniel P. Berrange")
This patch introduces a generic internal API for access control lists
to be used by network servers in QEMU. It adds support for checking
these ACL in the VNC server, in two places. The first ACL is for the
SASL authentication mechanism, checking the SASL username. This ACL
is called 'vnc.username'. The second is for the TLS authentication
mechanism, when x509 client certificates are turned on, checking against
the Distinguished Name of the client. This ACL is called 'vnc.x509dname'
The internal API provides for an ACL with the following characteristics
- A unique name, eg vnc.username, and vnc.x509dname.
- A default policy, allow or deny
- An ordered series of match rules, with allow or deny policy
If none of the match rules apply, then the default policy is
used.
There is a monitor API to manipulate the ACLs, which I'll describe via
examples
(qemu) acl show vnc.username
policy: allow
(qemu) acl policy vnc.username denya
acl: policy set to 'deny'
(qemu) acl allow vnc.username fred
acl: added rule at position 1
(qemu) acl allow vnc.username bob
acl: added rule at position 2
(qemu) acl allow vnc.username joe 1
acl: added rule at position 1
(qemu) acl show vnc.username
policy: deny
0: allow fred
1: allow joe
2: allow bob
(qemu) acl show vnc.x509dname
policy: allow
(qemu) acl policy vnc.x509dname deny
acl: policy set to 'deny'
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=London,CN=*
acl: added rule at position 1
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=Boston,CN=bob
acl: added rule at position 2
(qemu) acl show vnc.x509dname
policy: deny
0: allow C=GB,O=ACME,L=London,CN=*
1: allow C=GB,O=ACME,L=Boston,CN=bob
By default the VNC server will not use any ACLs, allowing access to
the server if the user successfully authenticates. To enable use of
ACLs to restrict user access, the ',acl' flag should be given when
starting QEMU. The initial ACL activated will be a 'deny all' policy
and should be customized using monitor commands.
eg enable SASL auth and ACLs
qemu .... -vnc localhost:1,sasl,acl
The next patch will provide a way to load a pre-defined ACL when
starting up
Makefile | 6 +
b/acl.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
b/acl.h | 74 ++++++++++++++++++++++
configure | 18 +++++
monitor.c | 95 ++++++++++++++++++++++++++++
qemu-doc.texi | 49 ++++++++++++++
vnc-auth-sasl.c | 16 +++-
vnc-auth-sasl.h | 7 ++
vnc-tls.c | 19 +++++
vnc-tls.h | 3
vnc.c | 21 ++++++
vnc.h | 3
12 files changed, 491 insertions(+), 5 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6726 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-06 21:27:37 +01:00
|
|
|
##########################################
|
|
|
|
# fnmatch() probe, used for ACL routines
|
|
|
|
fnmatch="no"
|
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <fnmatch.h>
|
|
|
|
int main(void)
|
|
|
|
{
|
|
|
|
fnmatch("foo", "foo", 0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
|
|
|
|
fnmatch="yes"
|
|
|
|
fi
|
|
|
|
|
2008-07-19 11:56:24 +02:00
|
|
|
##########################################
|
|
|
|
# vde libraries probe
|
|
|
|
if test "$vde" = "yes" ; then
|
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <libvdeplug.h>
|
2008-09-07 18:42:53 +02:00
|
|
|
int main(void)
|
|
|
|
{
|
|
|
|
struct vde_open_args a = {0, 0, 0};
|
|
|
|
vde_open("", "", &a);
|
|
|
|
return 0;
|
|
|
|
}
|
2008-07-19 11:56:24 +02:00
|
|
|
EOF
|
2008-12-15 04:15:36 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lvdeplug > /dev/null 2> /dev/null ; then
|
2008-07-19 11:56:24 +02:00
|
|
|
:
|
|
|
|
else
|
2008-07-23 20:14:33 +02:00
|
|
|
vde="no"
|
2008-07-19 11:56:24 +02:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2007-01-05 22:25:54 +01:00
|
|
|
##########################################
|
2008-06-28 21:13:06 +02:00
|
|
|
# Sound support libraries probe
|
2007-01-05 22:25:54 +01:00
|
|
|
|
2008-06-28 21:13:06 +02:00
|
|
|
audio_drv_probe()
|
|
|
|
{
|
|
|
|
drv=$1
|
|
|
|
hdr=$2
|
|
|
|
lib=$3
|
|
|
|
exp=$4
|
|
|
|
cfl=$5
|
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <$hdr>
|
|
|
|
int main(void) { $exp }
|
2007-01-05 22:25:54 +01:00
|
|
|
EOF
|
2008-12-15 04:15:36 +01:00
|
|
|
if $cc $ARCH_CFLAGS $cfl -o $TMPE $TMPC $lib > /dev/null 2> /dev/null ; then
|
2008-06-28 21:13:06 +02:00
|
|
|
:
|
|
|
|
else
|
|
|
|
echo
|
|
|
|
echo "Error: $drv check failed"
|
|
|
|
echo "Make sure to have the $drv libs and headers installed."
|
|
|
|
echo
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2008-07-29 14:58:44 +02:00
|
|
|
audio_drv_list=`echo "$audio_drv_list" | sed -e 's/,/ /g'`
|
2008-06-28 21:13:06 +02:00
|
|
|
for drv in $audio_drv_list; do
|
|
|
|
case $drv in
|
|
|
|
alsa)
|
|
|
|
audio_drv_probe $drv alsa/asoundlib.h -lasound \
|
|
|
|
"snd_pcm_t **handle; return snd_pcm_close(*handle);"
|
|
|
|
;;
|
|
|
|
|
|
|
|
fmod)
|
|
|
|
if test -z $fmod_lib || test -z $fmod_inc; then
|
|
|
|
echo
|
|
|
|
echo "Error: You must specify path to FMOD library and headers"
|
|
|
|
echo "Example: --fmod-inc=/path/include/fmod --fmod-lib=/path/lib/libfmod-3.74.so"
|
|
|
|
echo
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
audio_drv_probe $drv fmod.h $fmod_lib "return FSOUND_GetVersion();" "-I $fmod_inc"
|
|
|
|
;;
|
|
|
|
|
|
|
|
esd)
|
|
|
|
audio_drv_probe $drv esd.h -lesd 'return esd_play_stream(0, 0, "", 0);'
|
|
|
|
;;
|
2008-07-02 23:03:08 +02:00
|
|
|
|
|
|
|
pa)
|
|
|
|
audio_drv_probe $drv pulse/simple.h -lpulse-simple \
|
|
|
|
"pa_simple *s = NULL; pa_simple_free(s); return 0;"
|
|
|
|
;;
|
|
|
|
|
2008-08-21 20:00:53 +02:00
|
|
|
oss|sdl|core|wav|dsound)
|
|
|
|
# XXX: Probes for CoreAudio, DirectSound, SDL(?)
|
|
|
|
;;
|
|
|
|
|
2008-07-19 18:15:16 +02:00
|
|
|
*)
|
2008-07-19 18:57:30 +02:00
|
|
|
echo "$audio_possible_drivers" | grep -q "\<$drv\>" || {
|
2008-07-19 18:15:16 +02:00
|
|
|
echo
|
|
|
|
echo "Error: Unknown driver '$drv' selected"
|
|
|
|
echo "Possible drivers are: $audio_possible_drivers"
|
|
|
|
echo
|
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
;;
|
2008-06-28 21:13:06 +02:00
|
|
|
esac
|
|
|
|
done
|
2007-01-05 22:25:54 +01:00
|
|
|
|
2008-04-08 08:01:02 +02:00
|
|
|
##########################################
|
|
|
|
# BrlAPI probe
|
|
|
|
|
|
|
|
if test -z "$brlapi" ; then
|
|
|
|
brlapi=no
|
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <brlapi.h>
|
|
|
|
int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
|
|
|
|
EOF
|
2008-12-08 19:11:57 +01:00
|
|
|
if $cc ${ARCH_CFLAGS} -o $TMPE ${OS_CFLAGS} $TMPC -lbrlapi > /dev/null 2> /dev/null ; then
|
2008-04-08 08:01:02 +02:00
|
|
|
brlapi=yes
|
|
|
|
fi # brlapi compile test
|
|
|
|
fi # -z $brlapi
|
|
|
|
|
2008-02-10 17:33:14 +01:00
|
|
|
##########################################
|
|
|
|
# curses probe
|
|
|
|
|
|
|
|
if test "$curses" = "yes" ; then
|
|
|
|
curses=no
|
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <curses.h>
|
|
|
|
int main(void) { return curses_version(); }
|
|
|
|
EOF
|
2008-12-08 19:11:57 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then
|
2008-02-10 17:33:14 +01:00
|
|
|
curses=yes
|
|
|
|
fi
|
|
|
|
fi # test "$curses"
|
|
|
|
|
2008-09-29 01:49:55 +02:00
|
|
|
##########################################
|
|
|
|
# bluez support probe
|
|
|
|
if test "$bluez" = "yes" ; then
|
|
|
|
`pkg-config bluez` || bluez="no"
|
|
|
|
fi
|
|
|
|
if test "$bluez" = "yes" ; then
|
2008-09-30 04:27:44 +02:00
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <bluetooth/bluetooth.h>
|
|
|
|
int main(void) { return bt_error(0); }
|
|
|
|
EOF
|
2008-09-29 01:49:55 +02:00
|
|
|
bluez_cflags=`pkg-config --cflags bluez`
|
|
|
|
bluez_libs=`pkg-config --libs bluez`
|
2008-10-11 14:00:42 +02:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $bluez_cflags $TMPC \
|
2008-12-15 04:15:36 +01:00
|
|
|
$bluez_libs > /dev/null 2> /dev/null ; then
|
2008-09-30 04:27:44 +02:00
|
|
|
:
|
|
|
|
else
|
|
|
|
bluez="no"
|
|
|
|
fi
|
2008-09-29 01:49:55 +02:00
|
|
|
fi
|
|
|
|
|
2008-11-05 17:04:33 +01:00
|
|
|
##########################################
|
|
|
|
# kvm probe
|
|
|
|
if test "$kvm" = "yes" ; then
|
|
|
|
cat > $TMPC <<EOF
|
|
|
|
#include <linux/kvm.h>
|
2009-01-15 22:57:30 +01:00
|
|
|
#if !defined(KVM_API_VERSION) || KVM_API_VERSION < 12 || KVM_API_VERSION > 12
|
2008-11-05 17:04:33 +01:00
|
|
|
#error Invalid KVM version
|
|
|
|
#endif
|
2009-01-15 22:57:30 +01:00
|
|
|
#if !defined(KVM_CAP_USER_MEMORY)
|
|
|
|
#error Missing KVM capability KVM_CAP_USER_MEMORY
|
|
|
|
#endif
|
|
|
|
#if !defined(KVM_CAP_SET_TSS_ADDR)
|
|
|
|
#error Missing KVM capability KVM_CAP_SET_TSS_ADDR
|
|
|
|
#endif
|
|
|
|
#if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS)
|
|
|
|
#error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS
|
|
|
|
#endif
|
2008-11-05 17:04:33 +01:00
|
|
|
int main(void) { return 0; }
|
|
|
|
EOF
|
2008-11-05 17:28:56 +01:00
|
|
|
if test "$kerneldir" != "" ; then
|
|
|
|
kvm_cflags=-I"$kerneldir"/include
|
2009-01-09 21:05:10 +01:00
|
|
|
if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) \
|
|
|
|
-a -d "$kerneldir/arch/x86/include" ; then
|
|
|
|
kvm_cflags="$kvm_cflags -I$kerneldir/arch/x86/include"
|
2009-01-15 22:13:33 +01:00
|
|
|
elif test "$cpu" = "ppc" -a -d "$kerneldir/arch/powerpc/include" ; then
|
|
|
|
kvm_cflags="$kvm_cflags -I$kerneldir/arch/powerpc/include"
|
2009-01-09 21:05:10 +01:00
|
|
|
elif test -d "$kerneldir/arch/$cpu/include" ; then
|
|
|
|
kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
|
|
|
|
fi
|
2008-11-05 17:28:56 +01:00
|
|
|
else
|
|
|
|
kvm_cflags=""
|
|
|
|
fi
|
2008-11-05 17:04:33 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $kvm_cflags $TMPC \
|
2008-12-15 04:15:36 +01:00
|
|
|
> /dev/null 2>/dev/null ; then
|
2008-11-05 17:04:33 +01:00
|
|
|
:
|
|
|
|
else
|
2009-01-15 22:57:30 +01:00
|
|
|
kvm="no";
|
|
|
|
if [ -x "`which awk 2>/dev/null`" ] && \
|
|
|
|
[ -x "`which grep 2>/dev/null`" ]; then
|
2009-03-09 18:36:50 +01:00
|
|
|
kvmerr=`LANG=C $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $kvm_cflags $TMPC 2>&1 \
|
2009-01-15 22:57:30 +01:00
|
|
|
| grep "error: " \
|
|
|
|
| awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`
|
|
|
|
if test "$kvmerr" != "" ; then
|
|
|
|
kvm="no - (${kvmerr})"
|
|
|
|
fi
|
|
|
|
fi
|
2008-11-05 17:04:33 +01:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2008-08-15 20:20:52 +02:00
|
|
|
##########################################
|
|
|
|
# AIO probe
|
2008-12-12 17:41:40 +01:00
|
|
|
AIOLIBS=""
|
|
|
|
|
2008-08-15 20:20:52 +02:00
|
|
|
if test "$aio" = "yes" ; then
|
|
|
|
aio=no
|
|
|
|
cat > $TMPC << EOF
|
2008-12-12 17:41:40 +01:00
|
|
|
#include <pthread.h>
|
2009-01-17 07:49:15 +01:00
|
|
|
int main(void) { pthread_mutex_t lock; return 0; }
|
2008-08-15 20:20:52 +02:00
|
|
|
EOF
|
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE $AIOLIBS $TMPC 2> /dev/null ; then
|
|
|
|
aio=yes
|
2008-12-12 17:41:40 +01:00
|
|
|
AIOLIBS="-lpthread"
|
2008-08-15 20:20:52 +02:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2008-12-05 21:05:26 +01:00
|
|
|
##########################################
|
|
|
|
# iovec probe
|
|
|
|
cat > $TMPC <<EOF
|
2009-01-14 19:03:53 +01:00
|
|
|
#include <sys/types.h>
|
2008-12-05 21:05:26 +01:00
|
|
|
#include <sys/uio.h>
|
2009-01-14 19:03:53 +01:00
|
|
|
#include <unistd.h>
|
2008-12-05 21:05:26 +01:00
|
|
|
int main(void) { struct iovec iov; return 0; }
|
|
|
|
EOF
|
|
|
|
iovec=no
|
2008-12-15 04:15:36 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
|
2008-12-05 21:05:26 +01:00
|
|
|
iovec=yes
|
|
|
|
fi
|
|
|
|
|
2008-12-16 11:43:48 +01:00
|
|
|
##########################################
|
|
|
|
# fdt probe
|
|
|
|
if test "$fdt" = "yes" ; then
|
|
|
|
fdt=no
|
|
|
|
cat > $TMPC << EOF
|
|
|
|
int main(void) { return 0; }
|
|
|
|
EOF
|
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC -lfdt 2> /dev/null ; then
|
|
|
|
fdt=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2006-04-23 19:57:59 +02:00
|
|
|
# Check if tools are available to build documentation.
|
2007-05-09 15:55:03 +02:00
|
|
|
if [ -x "`which texi2html 2>/dev/null`" ] && \
|
|
|
|
[ -x "`which pod2man 2>/dev/null`" ]; then
|
2006-04-23 19:57:59 +02:00
|
|
|
build_docs="yes"
|
|
|
|
fi
|
|
|
|
|
2008-12-12 21:02:52 +01:00
|
|
|
##########################################
|
|
|
|
# Do we need librt
|
|
|
|
cat > $TMPC <<EOF
|
|
|
|
#include <signal.h>
|
|
|
|
#include <time.h>
|
|
|
|
int main(void) { clockid_t id; return clock_gettime(id, NULL); }
|
|
|
|
EOF
|
|
|
|
|
|
|
|
rt=no
|
2008-12-15 04:15:36 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
|
2008-12-12 21:02:52 +01:00
|
|
|
:
|
2008-12-15 04:15:36 +01:00
|
|
|
elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lrt > /dev/null 2> /dev/null ; then
|
2008-12-12 21:02:52 +01:00
|
|
|
rt=yes
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$rt" = "yes" ; then
|
|
|
|
# Hack, we should have a general purpose LIBS for this sort of thing
|
|
|
|
AIOLIBS="$AIOLIBS -lrt"
|
|
|
|
fi
|
|
|
|
|
2004-04-02 22:55:59 +02:00
|
|
|
if test "$mingw32" = "yes" ; then
|
2007-02-27 01:52:01 +01:00
|
|
|
if test -z "$prefix" ; then
|
2008-10-24 16:11:41 +02:00
|
|
|
prefix="c:\\\\Program Files\\\\Qemu"
|
2007-02-27 01:52:01 +01:00
|
|
|
fi
|
|
|
|
mansuffix=""
|
|
|
|
datasuffix=""
|
|
|
|
docsuffix=""
|
|
|
|
binsuffix=""
|
2004-04-02 22:55:59 +02:00
|
|
|
else
|
2007-02-27 01:52:01 +01:00
|
|
|
if test -z "$prefix" ; then
|
|
|
|
prefix="/usr/local"
|
|
|
|
fi
|
|
|
|
mansuffix="/share/man"
|
|
|
|
datasuffix="/share/qemu"
|
|
|
|
docsuffix="/share/doc/qemu"
|
|
|
|
binsuffix="/bin"
|
2004-04-02 22:55:59 +02:00
|
|
|
fi
|
2003-10-01 02:13:48 +02:00
|
|
|
|
2003-06-09 21:53:12 +02:00
|
|
|
echo "Install prefix $prefix"
|
2007-02-27 01:52:01 +01:00
|
|
|
echo "BIOS directory $prefix$datasuffix"
|
|
|
|
echo "binary directory $prefix$binsuffix"
|
2004-04-02 22:55:59 +02:00
|
|
|
if test "$mingw32" = "no" ; then
|
2007-02-27 01:52:01 +01:00
|
|
|
echo "Manual directory $prefix$mansuffix"
|
2003-06-09 21:53:12 +02:00
|
|
|
echo "ELF interp prefix $interp_prefix"
|
2004-04-02 22:55:59 +02:00
|
|
|
fi
|
2003-10-01 02:13:48 +02:00
|
|
|
echo "Source path $source_path"
|
2003-06-09 21:53:12 +02:00
|
|
|
echo "C compiler $cc"
|
2005-07-23 16:27:54 +02:00
|
|
|
echo "Host C compiler $host_cc"
|
2008-02-03 17:27:13 +01:00
|
|
|
echo "ARCH_CFLAGS $ARCH_CFLAGS"
|
2003-06-09 21:53:12 +02:00
|
|
|
echo "make $make"
|
2006-04-17 15:57:12 +02:00
|
|
|
echo "install $install"
|
2003-06-09 21:53:12 +02:00
|
|
|
echo "host CPU $cpu"
|
2003-06-15 22:25:43 +02:00
|
|
|
echo "host big endian $bigendian"
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "target list $target_list"
|
2003-06-09 21:53:12 +02:00
|
|
|
echo "gprof enabled $gprof"
|
2008-10-07 21:16:17 +02:00
|
|
|
echo "sparse enabled $sparse"
|
2006-02-08 23:39:17 +01:00
|
|
|
echo "profiler $profiler"
|
2003-06-09 21:53:12 +02:00
|
|
|
echo "static build $static"
|
2007-11-11 21:17:03 +01:00
|
|
|
echo "-Werror enabled $werror"
|
2005-03-01 22:37:28 +01:00
|
|
|
if test "$darwin" = "yes" ; then
|
|
|
|
echo "Cocoa support $cocoa"
|
|
|
|
fi
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "SDL support $sdl"
|
2005-04-26 22:46:24 +02:00
|
|
|
if test "$sdl" != "no" ; then
|
|
|
|
echo "SDL static link $sdl_static"
|
|
|
|
fi
|
2008-02-10 17:33:14 +01:00
|
|
|
echo "curses support $curses"
|
2004-04-01 01:37:16 +02:00
|
|
|
echo "mingw32 support $mingw32"
|
2008-06-25 23:04:05 +02:00
|
|
|
echo "Audio drivers $audio_drv_list"
|
|
|
|
echo "Extra audio cards $audio_card_list"
|
2008-06-23 20:33:30 +02:00
|
|
|
echo "Mixer emulation $mixemu"
|
2007-08-25 03:37:51 +02:00
|
|
|
echo "VNC TLS support $vnc_tls"
|
|
|
|
if test "$vnc_tls" = "yes" ; then
|
|
|
|
echo " TLS CFLAGS $vnc_tls_cflags"
|
|
|
|
echo " TLS LIBS $vnc_tls_libs"
|
|
|
|
fi
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-06 21:27:28 +01:00
|
|
|
echo "VNC SASL support $vnc_sasl"
|
|
|
|
if test "$vnc_sasl" = "yes" ; then
|
|
|
|
echo " SASL CFLAGS $vnc_sasl_cflags"
|
|
|
|
echo " SASL LIBS $vnc_sasl_libs"
|
|
|
|
fi
|
2007-04-16 20:27:06 +02:00
|
|
|
if test -n "$sparc_cpu"; then
|
|
|
|
echo "Target Sparc Arch $sparc_cpu"
|
|
|
|
fi
|
2005-04-23 19:44:28 +02:00
|
|
|
echo "kqemu support $kqemu"
|
2008-04-08 08:01:02 +02:00
|
|
|
echo "brlapi support $brlapi"
|
2006-04-23 19:57:59 +02:00
|
|
|
echo "Documentation $build_docs"
|
2006-05-14 13:30:38 +02:00
|
|
|
[ ! -z "$uname_release" ] && \
|
|
|
|
echo "uname -r $uname_release"
|
2008-05-29 16:34:11 +02:00
|
|
|
echo "NPTL support $nptl"
|
2008-07-19 11:56:24 +02:00
|
|
|
echo "vde support $vde"
|
2008-08-15 20:20:52 +02:00
|
|
|
echo "AIO support $aio"
|
2008-11-27 16:45:16 +01:00
|
|
|
echo "Install blobs $blobs"
|
2008-11-05 17:04:33 +01:00
|
|
|
echo "KVM support $kvm"
|
2008-12-16 11:43:48 +01:00
|
|
|
echo "fdt support $fdt"
|
2004-04-01 01:37:16 +02:00
|
|
|
|
2003-08-10 23:36:04 +02:00
|
|
|
if test $sdl_too_old = "yes"; then
|
2005-03-01 23:30:41 +01:00
|
|
|
echo "-> Your SDL version is too old - please upgrade to have SDL support"
|
2004-04-22 02:02:08 +02:00
|
|
|
fi
|
2008-11-29 23:04:31 +01:00
|
|
|
if [ -s $TMPSDLLOG ]; then
|
2007-07-12 01:39:45 +02:00
|
|
|
echo "The error log from compiling the libSDL test is: "
|
2008-11-29 23:04:31 +01:00
|
|
|
cat $TMPSDLLOG
|
2007-07-12 01:39:45 +02:00
|
|
|
fi
|
2005-03-01 23:30:41 +01:00
|
|
|
#if test "$sdl_static" = "no"; then
|
|
|
|
# echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output"
|
|
|
|
#fi
|
2003-08-10 23:36:04 +02:00
|
|
|
config_mak="config-host.mak"
|
|
|
|
config_h="config-host.h"
|
2003-03-07 00:23:54 +01:00
|
|
|
|
2004-04-22 02:02:08 +02:00
|
|
|
#echo "Creating $config_mak and $config_h"
|
2003-03-07 00:23:54 +01:00
|
|
|
|
2007-08-01 01:07:32 +02:00
|
|
|
test -f $config_h && mv $config_h ${config_h}~
|
|
|
|
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "# Automatically generated by configure - do not modify" > $config_mak
|
2008-12-17 20:00:18 +01:00
|
|
|
printf "# Configured with:" >> $config_mak
|
2008-12-07 23:50:16 +01:00
|
|
|
printf " '%s'" "$0" "$@" >> $config_mak
|
|
|
|
echo >> $config_mak
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "/* Automatically generated by configure - do not modify */" > $config_h
|
2003-03-07 00:23:54 +01:00
|
|
|
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "prefix=$prefix" >> $config_mak
|
2007-02-27 01:52:01 +01:00
|
|
|
echo "bindir=\${prefix}$binsuffix" >> $config_mak
|
|
|
|
echo "mandir=\${prefix}$mansuffix" >> $config_mak
|
|
|
|
echo "datadir=\${prefix}$datasuffix" >> $config_mak
|
2007-03-03 22:47:02 +01:00
|
|
|
echo "docdir=\${prefix}$docsuffix" >> $config_mak
|
2007-02-27 01:52:01 +01:00
|
|
|
echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "MAKE=$make" >> $config_mak
|
2006-04-17 15:57:12 +02:00
|
|
|
echo "INSTALL=$install" >> $config_mak
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "CC=$cc" >> $config_mak
|
|
|
|
echo "HOST_CC=$host_cc" >> $config_mak
|
|
|
|
echo "AR=$ar" >> $config_mak
|
|
|
|
echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak
|
2008-01-31 12:32:10 +01:00
|
|
|
# XXX: only use CFLAGS and LDFLAGS ?
|
|
|
|
# XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross
|
|
|
|
# compilation of dyngen tool (useful for win32 build on Linux host)
|
2007-01-05 02:00:47 +01:00
|
|
|
echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak
|
2007-04-16 20:27:06 +02:00
|
|
|
echo "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak
|
|
|
|
echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak
|
|
|
|
echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "CFLAGS=$CFLAGS" >> $config_mak
|
|
|
|
echo "LDFLAGS=$LDFLAGS" >> $config_mak
|
2004-04-01 01:37:16 +02:00
|
|
|
echo "EXESUF=$EXESUF" >> $config_mak
|
2007-03-17 16:00:37 +01:00
|
|
|
echo "AIOLIBS=$AIOLIBS" >> $config_mak
|
2008-04-20 22:19:44 +02:00
|
|
|
case "$cpu" in
|
|
|
|
i386)
|
|
|
|
echo "ARCH=i386" >> $config_mak
|
|
|
|
echo "#define HOST_I386 1" >> $config_h
|
|
|
|
;;
|
|
|
|
x86_64)
|
|
|
|
echo "ARCH=x86_64" >> $config_mak
|
|
|
|
echo "#define HOST_X86_64 1" >> $config_h
|
|
|
|
;;
|
|
|
|
alpha)
|
|
|
|
echo "ARCH=alpha" >> $config_mak
|
|
|
|
echo "#define HOST_ALPHA 1" >> $config_h
|
|
|
|
;;
|
|
|
|
armv4b)
|
|
|
|
echo "ARCH=arm" >> $config_mak
|
|
|
|
echo "#define HOST_ARM 1" >> $config_h
|
|
|
|
;;
|
|
|
|
armv4l)
|
|
|
|
echo "ARCH=arm" >> $config_mak
|
|
|
|
echo "#define HOST_ARM 1" >> $config_h
|
|
|
|
;;
|
|
|
|
cris)
|
|
|
|
echo "ARCH=cris" >> $config_mak
|
|
|
|
echo "#define HOST_CRIS 1" >> $config_h
|
|
|
|
;;
|
|
|
|
hppa)
|
|
|
|
echo "ARCH=hppa" >> $config_mak
|
|
|
|
echo "#define HOST_HPPA 1" >> $config_h
|
|
|
|
;;
|
|
|
|
ia64)
|
|
|
|
echo "ARCH=ia64" >> $config_mak
|
|
|
|
echo "#define HOST_IA64 1" >> $config_h
|
|
|
|
;;
|
|
|
|
m68k)
|
|
|
|
echo "ARCH=m68k" >> $config_mak
|
|
|
|
echo "#define HOST_M68K 1" >> $config_h
|
|
|
|
;;
|
|
|
|
mips)
|
|
|
|
echo "ARCH=mips" >> $config_mak
|
|
|
|
echo "#define HOST_MIPS 1" >> $config_h
|
|
|
|
;;
|
|
|
|
mips64)
|
|
|
|
echo "ARCH=mips64" >> $config_mak
|
|
|
|
echo "#define HOST_MIPS64 1" >> $config_h
|
|
|
|
;;
|
2009-01-14 19:39:52 +01:00
|
|
|
ppc)
|
|
|
|
echo "ARCH=ppc" >> $config_mak
|
|
|
|
echo "#define HOST_PPC 1" >> $config_h
|
|
|
|
;;
|
|
|
|
ppc64)
|
|
|
|
echo "ARCH=ppc64" >> $config_mak
|
|
|
|
echo "#define HOST_PPC64 1" >> $config_h
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
s390)
|
|
|
|
echo "ARCH=s390" >> $config_mak
|
|
|
|
echo "#define HOST_S390 1" >> $config_h
|
|
|
|
;;
|
|
|
|
sparc)
|
|
|
|
echo "ARCH=sparc" >> $config_mak
|
|
|
|
echo "#define HOST_SPARC 1" >> $config_h
|
|
|
|
;;
|
|
|
|
sparc64)
|
|
|
|
echo "ARCH=sparc64" >> $config_mak
|
|
|
|
echo "#define HOST_SPARC64 1" >> $config_h
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "Unsupported CPU = $cpu"
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|
2008-10-07 21:16:17 +02:00
|
|
|
if test "$sparse" = "yes" ; then
|
|
|
|
echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_mak
|
|
|
|
echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_mak
|
|
|
|
echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_mak
|
|
|
|
fi
|
2003-03-07 00:23:54 +01:00
|
|
|
if test "$bigendian" = "yes" ; then
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "WORDS_BIGENDIAN=yes" >> $config_mak
|
|
|
|
echo "#define WORDS_BIGENDIAN 1" >> $config_h
|
|
|
|
fi
|
2005-06-05 19:10:39 +02:00
|
|
|
echo "#define HOST_LONG_BITS $hostlongbits" >> $config_h
|
2004-04-01 01:37:16 +02:00
|
|
|
if test "$mingw32" = "yes" ; then
|
|
|
|
echo "CONFIG_WIN32=yes" >> $config_mak
|
2004-04-02 22:55:59 +02:00
|
|
|
echo "#define CONFIG_WIN32 1" >> $config_h
|
2007-02-27 22:04:49 +01:00
|
|
|
else
|
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <byteswap.h>
|
|
|
|
int main(void) { return bswap_32(0); }
|
|
|
|
EOF
|
2008-12-08 19:11:57 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
|
2007-02-27 22:04:49 +01:00
|
|
|
echo "#define HAVE_BYTESWAP_H 1" >> $config_h
|
|
|
|
fi
|
2008-12-05 18:54:09 +01:00
|
|
|
cat > $TMPC << EOF
|
|
|
|
#include <sys/endian.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <machine/bswap.h>
|
|
|
|
int main(void) { return bswap32(0); }
|
|
|
|
EOF
|
2008-12-08 19:11:57 +01:00
|
|
|
if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
|
2008-12-05 18:54:09 +01:00
|
|
|
echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
|
|
|
|
fi
|
2004-04-01 01:37:16 +02:00
|
|
|
fi
|
2008-08-15 20:33:42 +02:00
|
|
|
|
|
|
|
if [ "$openbsd" = "yes" ] ; then
|
|
|
|
echo "#define ENOTSUP 4096" >> $config_h
|
|
|
|
fi
|
|
|
|
|
2004-07-05 23:25:26 +02:00
|
|
|
if test "$darwin" = "yes" ; then
|
|
|
|
echo "CONFIG_DARWIN=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_DARWIN 1" >> $config_h
|
|
|
|
fi
|
2008-11-18 02:42:22 +01:00
|
|
|
|
|
|
|
if test "$aix" = "yes" ; then
|
|
|
|
echo "CONFIG_AIX=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_AIX 1" >> $config_h
|
|
|
|
fi
|
|
|
|
|
2006-04-26 00:36:06 +02:00
|
|
|
if test "$solaris" = "yes" ; then
|
|
|
|
echo "CONFIG_SOLARIS=yes" >> $config_mak
|
2006-05-01 15:58:07 +02:00
|
|
|
echo "#define HOST_SOLARIS $solarisrev" >> $config_h
|
2007-04-01 20:54:44 +02:00
|
|
|
if test "$needs_libsunmath" = "yes" ; then
|
|
|
|
echo "NEEDS_LIBSUNMATH=yes" >> $config_mak
|
|
|
|
echo "#define NEEDS_LIBSUNMATH 1" >> $config_h
|
|
|
|
fi
|
2006-04-26 00:36:06 +02:00
|
|
|
fi
|
2007-04-16 20:27:06 +02:00
|
|
|
if test -n "$sparc_cpu"; then
|
|
|
|
echo "CONFIG__sparc_${sparc_cpu}__=yes" >> $config_mak
|
|
|
|
echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h
|
|
|
|
fi
|
2004-04-01 01:37:16 +02:00
|
|
|
if test "$gdbstub" = "yes" ; then
|
|
|
|
echo "CONFIG_GDBSTUB=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_GDBSTUB 1" >> $config_h
|
|
|
|
fi
|
2003-08-10 23:36:04 +02:00
|
|
|
if test "$gprof" = "yes" ; then
|
|
|
|
echo "TARGET_GPROF=yes" >> $config_mak
|
|
|
|
echo "#define HAVE_GPROF 1" >> $config_h
|
|
|
|
fi
|
|
|
|
if test "$static" = "yes" ; then
|
|
|
|
echo "CONFIG_STATIC=yes" >> $config_mak
|
2003-10-29 00:04:01 +01:00
|
|
|
echo "#define CONFIG_STATIC 1" >> $config_h
|
2003-03-07 00:23:54 +01:00
|
|
|
fi
|
2006-02-08 23:39:17 +01:00
|
|
|
if test $profiler = "yes" ; then
|
|
|
|
echo "#define CONFIG_PROFILER 1" >> $config_h
|
|
|
|
fi
|
2004-04-22 01:27:19 +02:00
|
|
|
if test "$slirp" = "yes" ; then
|
|
|
|
echo "CONFIG_SLIRP=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_SLIRP 1" >> $config_h
|
|
|
|
fi
|
2008-07-19 11:56:24 +02:00
|
|
|
if test "$vde" = "yes" ; then
|
|
|
|
echo "CONFIG_VDE=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_VDE 1" >> $config_h
|
|
|
|
echo "VDE_LIBS=-lvdeplug" >> $config_mak
|
|
|
|
fi
|
2008-06-25 23:04:05 +02:00
|
|
|
for card in $audio_card_list; do
|
2008-06-29 03:00:34 +02:00
|
|
|
def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`
|
2008-06-25 23:04:05 +02:00
|
|
|
echo "$def=yes" >> $config_mak
|
|
|
|
echo "#define $def 1" >> $config_h
|
|
|
|
done
|
|
|
|
echo "#define AUDIO_DRIVERS \\" >> $config_h
|
|
|
|
for drv in $audio_drv_list; do
|
|
|
|
echo " &${drv}_audio_driver, \\" >>$config_h
|
2008-06-29 03:00:34 +02:00
|
|
|
def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
|
2008-06-25 23:04:05 +02:00
|
|
|
echo "$def=yes" >> $config_mak
|
2008-07-02 20:13:46 +02:00
|
|
|
if test "$drv" = "fmod"; then
|
2008-06-25 23:04:05 +02:00
|
|
|
echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
|
|
|
|
echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
|
2008-08-21 20:00:53 +02:00
|
|
|
elif test "$drv" = "oss"; then
|
|
|
|
echo "CONFIG_OSS_LIB=$oss_lib" >> $config_mak
|
2008-06-25 23:04:05 +02:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
echo "" >>$config_h
|
2008-06-23 20:33:30 +02:00
|
|
|
if test "$mixemu" = "yes" ; then
|
|
|
|
echo "CONFIG_MIXEMU=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_MIXEMU 1" >> $config_h
|
|
|
|
fi
|
2007-08-25 03:37:51 +02:00
|
|
|
if test "$vnc_tls" = "yes" ; then
|
|
|
|
echo "CONFIG_VNC_TLS=yes" >> $config_mak
|
|
|
|
echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
|
|
|
|
echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
|
|
|
|
echo "#define CONFIG_VNC_TLS 1" >> $config_h
|
|
|
|
fi
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-06 21:27:28 +01:00
|
|
|
if test "$vnc_sasl" = "yes" ; then
|
|
|
|
echo "CONFIG_VNC_SASL=yes" >> $config_mak
|
|
|
|
echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak
|
|
|
|
echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak
|
|
|
|
echo "#define CONFIG_VNC_SASL 1" >> $config_h
|
|
|
|
fi
|
Support ACLs for controlling VNC access ("Daniel P. Berrange")
This patch introduces a generic internal API for access control lists
to be used by network servers in QEMU. It adds support for checking
these ACL in the VNC server, in two places. The first ACL is for the
SASL authentication mechanism, checking the SASL username. This ACL
is called 'vnc.username'. The second is for the TLS authentication
mechanism, when x509 client certificates are turned on, checking against
the Distinguished Name of the client. This ACL is called 'vnc.x509dname'
The internal API provides for an ACL with the following characteristics
- A unique name, eg vnc.username, and vnc.x509dname.
- A default policy, allow or deny
- An ordered series of match rules, with allow or deny policy
If none of the match rules apply, then the default policy is
used.
There is a monitor API to manipulate the ACLs, which I'll describe via
examples
(qemu) acl show vnc.username
policy: allow
(qemu) acl policy vnc.username denya
acl: policy set to 'deny'
(qemu) acl allow vnc.username fred
acl: added rule at position 1
(qemu) acl allow vnc.username bob
acl: added rule at position 2
(qemu) acl allow vnc.username joe 1
acl: added rule at position 1
(qemu) acl show vnc.username
policy: deny
0: allow fred
1: allow joe
2: allow bob
(qemu) acl show vnc.x509dname
policy: allow
(qemu) acl policy vnc.x509dname deny
acl: policy set to 'deny'
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=London,CN=*
acl: added rule at position 1
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=Boston,CN=bob
acl: added rule at position 2
(qemu) acl show vnc.x509dname
policy: deny
0: allow C=GB,O=ACME,L=London,CN=*
1: allow C=GB,O=ACME,L=Boston,CN=bob
By default the VNC server will not use any ACLs, allowing access to
the server if the user successfully authenticates. To enable use of
ACLs to restrict user access, the ',acl' flag should be given when
starting QEMU. The initial ACL activated will be a 'deny all' policy
and should be customized using monitor commands.
eg enable SASL auth and ACLs
qemu .... -vnc localhost:1,sasl,acl
The next patch will provide a way to load a pre-defined ACL when
starting up
Makefile | 6 +
b/acl.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
b/acl.h | 74 ++++++++++++++++++++++
configure | 18 +++++
monitor.c | 95 ++++++++++++++++++++++++++++
qemu-doc.texi | 49 ++++++++++++++
vnc-auth-sasl.c | 16 +++-
vnc-auth-sasl.h | 7 ++
vnc-tls.c | 19 +++++
vnc-tls.h | 3
vnc.c | 21 ++++++
vnc.h | 3
12 files changed, 491 insertions(+), 5 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6726 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-06 21:27:37 +01:00
|
|
|
if test "$fnmatch" = "yes" ; then
|
|
|
|
echo "#define HAVE_FNMATCH_H 1" >> $config_h
|
|
|
|
fi
|
2006-04-16 15:28:56 +02:00
|
|
|
qemu_version=`head $source_path/VERSION`
|
|
|
|
echo "VERSION=$qemu_version" >>$config_mak
|
2006-04-16 15:49:23 +02:00
|
|
|
echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
|
2003-08-10 23:36:04 +02:00
|
|
|
|
|
|
|
echo "SRC_PATH=$source_path" >> $config_mak
|
2006-04-16 14:41:07 +02:00
|
|
|
if [ "$source_path_used" = "yes" ]; then
|
|
|
|
echo "VPATH=$source_path" >> $config_mak
|
|
|
|
fi
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "TARGET_DIRS=$target_list" >> $config_mak
|
2006-04-23 19:57:59 +02:00
|
|
|
if [ "$build_docs" = "yes" ] ; then
|
|
|
|
echo "BUILD_DOCS=yes" >> $config_mak
|
|
|
|
fi
|
2007-11-07 20:25:15 +01:00
|
|
|
if test "$static" = "yes"; then
|
|
|
|
sdl1=$sdl_static
|
|
|
|
else
|
|
|
|
sdl1=$sdl
|
|
|
|
fi
|
|
|
|
if test "$sdl1" = "yes" ; then
|
|
|
|
echo "#define CONFIG_SDL 1" >> $config_h
|
|
|
|
echo "CONFIG_SDL=yes" >> $config_mak
|
|
|
|
if test "$target_softmmu" = "no" -o "$static" = "yes"; then
|
|
|
|
echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
|
2009-03-03 18:37:21 +01:00
|
|
|
elif test "$sdl_x11" = "yes" ; then
|
|
|
|
echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_mak
|
2007-11-07 20:25:15 +01:00
|
|
|
else
|
|
|
|
echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
|
|
|
|
fi
|
|
|
|
if [ "${aa}" = "yes" ] ; then
|
|
|
|
echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_mak
|
|
|
|
else
|
|
|
|
echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$cocoa" = "yes" ; then
|
2008-02-10 17:33:14 +01:00
|
|
|
echo "#define CONFIG_COCOA 1" >> $config_h
|
|
|
|
echo "CONFIG_COCOA=yes" >> $config_mak
|
|
|
|
fi
|
|
|
|
if test "$curses" = "yes" ; then
|
|
|
|
echo "#define CONFIG_CURSES 1" >> $config_h
|
|
|
|
echo "CONFIG_CURSES=yes" >> $config_mak
|
|
|
|
echo "CURSES_LIBS=-lcurses" >> $config_mak
|
2007-11-07 20:25:15 +01:00
|
|
|
fi
|
2008-04-08 08:01:02 +02:00
|
|
|
if test "$brlapi" = "yes" ; then
|
|
|
|
echo "CONFIG_BRLAPI=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_BRLAPI 1" >> $config_h
|
|
|
|
echo "BRLAPI_LIBS=-lbrlapi" >> $config_mak
|
|
|
|
fi
|
2008-09-29 01:49:55 +02:00
|
|
|
if test "$bluez" = "yes" ; then
|
|
|
|
echo "CONFIG_BLUEZ=yes" >> $config_mak
|
|
|
|
echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_mak
|
|
|
|
echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_mak
|
|
|
|
echo "#define CONFIG_BLUEZ 1" >> $config_h
|
|
|
|
fi
|
2008-08-15 20:20:52 +02:00
|
|
|
if test "$aio" = "yes" ; then
|
|
|
|
echo "#define CONFIG_AIO 1" >> $config_h
|
2008-09-11 20:00:19 +02:00
|
|
|
echo "CONFIG_AIO=yes" >> $config_mak
|
2008-08-15 20:20:52 +02:00
|
|
|
fi
|
2008-11-27 16:45:16 +01:00
|
|
|
if test "$blobs" = "yes" ; then
|
|
|
|
echo "INSTALL_BLOBS=yes" >> $config_mak
|
|
|
|
fi
|
2008-12-05 21:05:26 +01:00
|
|
|
if test "$iovec" = "yes" ; then
|
|
|
|
echo "#define HAVE_IOVEC 1" >> $config_h
|
|
|
|
fi
|
2008-12-16 11:43:48 +01:00
|
|
|
if test "$fdt" = "yes" ; then
|
|
|
|
echo "#define HAVE_FDT 1" >> $config_h
|
|
|
|
echo "FDT_LIBS=-lfdt" >> $config_mak
|
|
|
|
fi
|
2003-08-10 23:36:04 +02:00
|
|
|
|
2004-07-05 23:25:26 +02:00
|
|
|
# XXX: suppress that
|
2004-05-12 21:32:15 +02:00
|
|
|
if [ "$bsd" = "yes" ] ; then
|
2004-05-20 15:23:39 +02:00
|
|
|
echo "#define O_LARGEFILE 0" >> $config_h
|
|
|
|
echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h
|
2009-03-08 09:23:32 +01:00
|
|
|
echo "#define HOST_BSD 1" >> $config_h
|
2004-05-12 21:32:15 +02:00
|
|
|
fi
|
|
|
|
|
2006-05-14 13:30:38 +02:00
|
|
|
echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
|
|
|
|
|
2008-11-22 22:03:55 +01:00
|
|
|
# USB host support
|
|
|
|
case "$usb" in
|
|
|
|
linux)
|
|
|
|
echo "HOST_USB=linux" >> $config_mak
|
|
|
|
;;
|
|
|
|
bsd)
|
|
|
|
echo "HOST_USB=bsd" >> $config_mak
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "HOST_USB=stub" >> $config_mak
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2007-09-22 18:49:14 +02:00
|
|
|
tools=
|
|
|
|
if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
|
|
|
|
tools="qemu-img\$(EXESUF) $tools"
|
2008-05-27 23:13:40 +02:00
|
|
|
if [ "$linux" = "yes" ] ; then
|
|
|
|
tools="qemu-nbd\$(EXESUF) $tools"
|
|
|
|
fi
|
2007-09-22 18:49:14 +02:00
|
|
|
fi
|
|
|
|
echo "TOOLS=$tools" >> $config_mak
|
|
|
|
|
2007-08-01 01:07:32 +02:00
|
|
|
test -f ${config_h}~ && cmp -s $config_h ${config_h}~ && mv ${config_h}~ $config_h
|
|
|
|
|
2005-10-30 19:58:22 +01:00
|
|
|
for target in $target_list; do
|
2003-08-10 23:36:04 +02:00
|
|
|
target_dir="$target"
|
|
|
|
config_mak=$target_dir/config.mak
|
|
|
|
config_h=$target_dir/config.h
|
|
|
|
target_cpu=`echo $target | cut -d '-' -f 1`
|
|
|
|
target_bigendian="no"
|
2004-12-20 00:33:47 +01:00
|
|
|
[ "$target_cpu" = "armeb" ] && target_bigendian=yes
|
2008-04-11 23:36:06 +02:00
|
|
|
[ "$target_cpu" = "m68k" ] && target_bigendian=yes
|
|
|
|
[ "$target_cpu" = "mips" ] && target_bigendian=yes
|
|
|
|
[ "$target_cpu" = "mipsn32" ] && target_bigendian=yes
|
|
|
|
[ "$target_cpu" = "mips64" ] && target_bigendian=yes
|
2003-11-23 18:05:30 +01:00
|
|
|
[ "$target_cpu" = "ppc" ] && target_bigendian=yes
|
2007-04-24 09:34:03 +02:00
|
|
|
[ "$target_cpu" = "ppcemb" ] && target_bigendian=yes
|
2007-10-14 10:38:29 +02:00
|
|
|
[ "$target_cpu" = "ppc64" ] && target_bigendian=yes
|
2007-10-18 21:59:49 +02:00
|
|
|
[ "$target_cpu" = "ppc64abi32" ] && target_bigendian=yes
|
2006-06-18 21:16:53 +02:00
|
|
|
[ "$target_cpu" = "sh4eb" ] && target_bigendian=yes
|
2008-04-11 23:36:06 +02:00
|
|
|
[ "$target_cpu" = "sparc" ] && target_bigendian=yes
|
|
|
|
[ "$target_cpu" = "sparc64" ] && target_bigendian=yes
|
|
|
|
[ "$target_cpu" = "sparc32plus" ] && target_bigendian=yes
|
2003-08-10 23:36:04 +02:00
|
|
|
target_softmmu="no"
|
2003-10-27 22:10:39 +01:00
|
|
|
target_user_only="no"
|
2007-01-18 21:06:33 +01:00
|
|
|
target_linux_user="no"
|
|
|
|
target_darwin_user="no"
|
2008-10-26 21:33:16 +01:00
|
|
|
target_bsd_user="no"
|
2007-05-26 18:38:53 +02:00
|
|
|
case "$target" in
|
|
|
|
${target_cpu}-softmmu)
|
|
|
|
target_softmmu="yes"
|
|
|
|
;;
|
|
|
|
${target_cpu}-linux-user)
|
|
|
|
target_user_only="yes"
|
|
|
|
target_linux_user="yes"
|
|
|
|
;;
|
|
|
|
${target_cpu}-darwin-user)
|
|
|
|
target_user_only="yes"
|
|
|
|
target_darwin_user="yes"
|
|
|
|
;;
|
2008-10-26 21:33:16 +01:00
|
|
|
${target_cpu}-bsd-user)
|
|
|
|
target_user_only="yes"
|
|
|
|
target_bsd_user="yes"
|
|
|
|
;;
|
2007-05-26 18:38:53 +02:00
|
|
|
*)
|
|
|
|
echo "ERROR: Target '$target' not recognised"
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|
2007-01-18 21:06:33 +01:00
|
|
|
|
2005-07-02 15:32:17 +02:00
|
|
|
if test "$target_user_only" = "no" -a "$check_gfx" = "yes" \
|
2005-10-30 19:58:22 +01:00
|
|
|
-a "$sdl" = "no" -a "$cocoa" = "no" ; then
|
2005-07-02 15:32:17 +02:00
|
|
|
echo "ERROR: QEMU requires SDL or Cocoa for graphical output"
|
2006-04-16 17:19:15 +02:00
|
|
|
echo "To build QEMU without graphical output configure with --disable-gfx-check"
|
2008-02-10 17:33:14 +01:00
|
|
|
echo "Note that this will disable all output from the virtual graphics card"
|
|
|
|
echo "except through VNC or curses."
|
2005-07-02 15:32:17 +02:00
|
|
|
exit 1;
|
|
|
|
fi
|
|
|
|
|
2004-04-22 02:02:08 +02:00
|
|
|
#echo "Creating $config_mak, $config_h and $target_dir/Makefile"
|
2003-08-10 23:36:04 +02:00
|
|
|
|
2007-08-01 01:07:32 +02:00
|
|
|
test -f $config_h && mv $config_h ${config_h}~
|
|
|
|
|
2003-08-10 23:36:04 +02:00
|
|
|
mkdir -p $target_dir
|
2005-03-13 17:54:06 +01:00
|
|
|
mkdir -p $target_dir/fpu
|
2008-02-01 11:50:11 +01:00
|
|
|
mkdir -p $target_dir/tcg
|
2008-10-26 21:33:16 +01:00
|
|
|
if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then
|
2004-02-16 22:40:43 +01:00
|
|
|
mkdir -p $target_dir/nwfpe
|
|
|
|
fi
|
|
|
|
|
2006-04-26 00:36:06 +02:00
|
|
|
#
|
|
|
|
# don't use ln -sf as not all "ln -sf" over write the file/link
|
|
|
|
#
|
|
|
|
rm -f $target_dir/Makefile
|
|
|
|
ln -s $source_path/Makefile.target $target_dir/Makefile
|
|
|
|
|
2003-08-10 23:36:04 +02:00
|
|
|
|
|
|
|
echo "# Automatically generated by configure - do not modify" > $config_mak
|
|
|
|
echo "/* Automatically generated by configure - do not modify */" > $config_h
|
|
|
|
|
2003-06-15 22:25:43 +02:00
|
|
|
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "include ../config-host.mak" >> $config_mak
|
|
|
|
echo "#include \"../config-host.h\"" >> $config_h
|
2003-09-30 22:54:24 +02:00
|
|
|
|
2006-06-11 15:32:59 +02:00
|
|
|
bflt="no"
|
2007-10-09 18:34:29 +02:00
|
|
|
elfload32="no"
|
2008-05-29 16:34:11 +02:00
|
|
|
target_nptl="no"
|
2003-09-30 22:54:24 +02:00
|
|
|
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
|
|
|
|
echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
|
2008-10-11 19:55:29 +02:00
|
|
|
gdb_xml_files=""
|
2003-08-10 23:36:04 +02:00
|
|
|
|
2008-11-05 20:59:25 +01:00
|
|
|
# Make sure the target and host cpus are compatible
|
|
|
|
if test "$kvm" = "yes" -a ! \( "$target_cpu" = "$cpu" -o \
|
2009-01-14 19:39:52 +01:00
|
|
|
\( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \
|
2008-11-05 20:59:25 +01:00
|
|
|
\( "$target_cpu" = "x86_64" -a "$cpu" = "i386" \) -o \
|
|
|
|
\( "$target_cpu" = "i386" -a "$cpu" = "x86_64" \) \) ; then
|
2008-11-05 17:04:33 +01:00
|
|
|
kvm="no"
|
|
|
|
fi
|
|
|
|
# Disable KVM for linux-user
|
|
|
|
if test "$kvm" = "yes" -a "$target_softmmu" = "no" ; then
|
|
|
|
kvm="no"
|
|
|
|
fi
|
|
|
|
|
2008-04-20 22:19:44 +02:00
|
|
|
case "$target_cpu" in
|
|
|
|
i386)
|
|
|
|
echo "TARGET_ARCH=i386" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"i386\"" >> $config_h
|
|
|
|
echo "#define TARGET_I386 1" >> $config_h
|
2008-05-30 22:48:25 +02:00
|
|
|
if test $kqemu = "yes" -a "$target_softmmu" = "yes"
|
2008-04-20 22:19:44 +02:00
|
|
|
then
|
|
|
|
echo "#define USE_KQEMU 1" >> $config_h
|
|
|
|
fi
|
2008-11-05 17:04:33 +01:00
|
|
|
if test "$kvm" = "yes" ; then
|
|
|
|
echo "CONFIG_KVM=yes" >> $config_mak
|
|
|
|
echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
|
2008-11-05 20:59:25 +01:00
|
|
|
echo "#define CONFIG_KVM 1" >> $config_h
|
2008-11-05 17:04:33 +01:00
|
|
|
fi
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
x86_64)
|
|
|
|
echo "TARGET_ARCH=x86_64" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"x86_64\"" >> $config_h
|
|
|
|
echo "#define TARGET_I386 1" >> $config_h
|
|
|
|
echo "#define TARGET_X86_64 1" >> $config_h
|
|
|
|
if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64"
|
|
|
|
then
|
|
|
|
echo "#define USE_KQEMU 1" >> $config_h
|
|
|
|
fi
|
2008-11-05 17:04:33 +01:00
|
|
|
if test "$kvm" = "yes" ; then
|
|
|
|
echo "CONFIG_KVM=yes" >> $config_mak
|
|
|
|
echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
|
|
|
|
echo "#define CONFIG_KVM 1" >> $config_h
|
|
|
|
fi
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
alpha)
|
|
|
|
echo "TARGET_ARCH=alpha" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"alpha\"" >> $config_h
|
|
|
|
echo "#define TARGET_ALPHA 1" >> $config_h
|
|
|
|
;;
|
|
|
|
arm|armeb)
|
|
|
|
echo "TARGET_ARCH=arm" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"arm\"" >> $config_h
|
|
|
|
echo "#define TARGET_ARM 1" >> $config_h
|
|
|
|
bflt="yes"
|
2008-05-29 16:34:11 +02:00
|
|
|
target_nptl="yes"
|
2008-10-11 19:55:29 +02:00
|
|
|
gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
cris)
|
|
|
|
echo "TARGET_ARCH=cris" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"cris\"" >> $config_h
|
|
|
|
echo "#define TARGET_CRIS 1" >> $config_h
|
2009-01-07 21:07:09 +01:00
|
|
|
target_nptl="yes"
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
m68k)
|
|
|
|
echo "TARGET_ARCH=m68k" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"m68k\"" >> $config_h
|
|
|
|
echo "#define TARGET_M68K 1" >> $config_h
|
|
|
|
bflt="yes"
|
2008-10-11 19:55:29 +02:00
|
|
|
gdb_xml_files="cf-core.xml cf-fp.xml"
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
mips|mipsel)
|
|
|
|
echo "TARGET_ARCH=mips" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"mips\"" >> $config_h
|
|
|
|
echo "#define TARGET_MIPS 1" >> $config_h
|
|
|
|
echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
|
|
|
|
;;
|
|
|
|
mipsn32|mipsn32el)
|
|
|
|
echo "TARGET_ARCH=mipsn32" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h
|
|
|
|
echo "#define TARGET_MIPS 1" >> $config_h
|
|
|
|
echo "#define TARGET_ABI_MIPSN32 1" >> $config_h
|
|
|
|
;;
|
|
|
|
mips64|mips64el)
|
|
|
|
echo "TARGET_ARCH=mips64" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"mips64\"" >> $config_h
|
|
|
|
echo "#define TARGET_MIPS 1" >> $config_h
|
|
|
|
echo "#define TARGET_MIPS64 1" >> $config_h
|
|
|
|
echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
|
|
|
|
;;
|
|
|
|
ppc)
|
|
|
|
echo "TARGET_ARCH=ppc" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"ppc\"" >> $config_h
|
|
|
|
echo "#define TARGET_PPC 1" >> $config_h
|
2009-01-24 16:07:34 +01:00
|
|
|
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
ppcemb)
|
|
|
|
echo "TARGET_ARCH=ppcemb" >> $config_mak
|
|
|
|
echo "TARGET_ABI_DIR=ppc" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
|
|
|
|
echo "#define TARGET_PPC 1" >> $config_h
|
|
|
|
echo "#define TARGET_PPCEMB 1" >> $config_h
|
2008-12-16 11:43:58 +01:00
|
|
|
if test "$kvm" = "yes" ; then
|
|
|
|
echo "CONFIG_KVM=yes" >> $config_mak
|
|
|
|
echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
|
|
|
|
echo "#define CONFIG_KVM 1" >> $config_h
|
|
|
|
fi
|
2009-01-24 16:07:34 +01:00
|
|
|
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
ppc64)
|
|
|
|
echo "TARGET_ARCH=ppc64" >> $config_mak
|
|
|
|
echo "TARGET_ABI_DIR=ppc" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
|
|
|
|
echo "#define TARGET_PPC 1" >> $config_h
|
|
|
|
echo "#define TARGET_PPC64 1" >> $config_h
|
2009-01-24 16:07:34 +01:00
|
|
|
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
ppc64abi32)
|
|
|
|
echo "TARGET_ARCH=ppc64" >> $config_mak
|
|
|
|
echo "TARGET_ABI_DIR=ppc" >> $config_mak
|
|
|
|
echo "TARGET_ARCH2=ppc64abi32" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
|
|
|
|
echo "#define TARGET_PPC 1" >> $config_h
|
|
|
|
echo "#define TARGET_PPC64 1" >> $config_h
|
|
|
|
echo "#define TARGET_ABI32 1" >> $config_h
|
2009-01-24 16:07:34 +01:00
|
|
|
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
sh4|sh4eb)
|
|
|
|
echo "TARGET_ARCH=sh4" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"sh4\"" >> $config_h
|
|
|
|
echo "#define TARGET_SH4 1" >> $config_h
|
|
|
|
bflt="yes"
|
2008-09-15 09:43:43 +02:00
|
|
|
target_nptl="yes"
|
2008-04-20 22:19:44 +02:00
|
|
|
;;
|
|
|
|
sparc)
|
|
|
|
echo "TARGET_ARCH=sparc" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"sparc\"" >> $config_h
|
|
|
|
echo "#define TARGET_SPARC 1" >> $config_h
|
|
|
|
;;
|
|
|
|
sparc64)
|
|
|
|
echo "TARGET_ARCH=sparc64" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
|
|
|
|
echo "#define TARGET_SPARC 1" >> $config_h
|
|
|
|
echo "#define TARGET_SPARC64 1" >> $config_h
|
|
|
|
elfload32="yes"
|
|
|
|
;;
|
|
|
|
sparc32plus)
|
|
|
|
echo "TARGET_ARCH=sparc64" >> $config_mak
|
|
|
|
echo "TARGET_ABI_DIR=sparc" >> $config_mak
|
|
|
|
echo "TARGET_ARCH2=sparc32plus" >> $config_mak
|
|
|
|
echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
|
|
|
|
echo "#define TARGET_SPARC 1" >> $config_h
|
|
|
|
echo "#define TARGET_SPARC64 1" >> $config_h
|
|
|
|
echo "#define TARGET_ABI32 1" >> $config_h
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "Unsupported target CPU"
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|
2003-06-15 22:25:43 +02:00
|
|
|
if test "$target_bigendian" = "yes" ; then
|
2003-08-10 23:36:04 +02:00
|
|
|
echo "TARGET_WORDS_BIGENDIAN=yes" >> $config_mak
|
|
|
|
echo "#define TARGET_WORDS_BIGENDIAN 1" >> $config_h
|
2003-06-15 22:25:43 +02:00
|
|
|
fi
|
2003-08-10 23:36:04 +02:00
|
|
|
if test "$target_softmmu" = "yes" ; then
|
|
|
|
echo "CONFIG_SOFTMMU=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_SOFTMMU 1" >> $config_h
|
2003-06-09 21:53:12 +02:00
|
|
|
fi
|
2003-10-27 22:10:39 +01:00
|
|
|
if test "$target_user_only" = "yes" ; then
|
|
|
|
echo "CONFIG_USER_ONLY=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_USER_ONLY 1" >> $config_h
|
|
|
|
fi
|
2007-01-18 21:06:33 +01:00
|
|
|
if test "$target_linux_user" = "yes" ; then
|
|
|
|
echo "CONFIG_LINUX_USER=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_LINUX_USER 1" >> $config_h
|
|
|
|
fi
|
|
|
|
if test "$target_darwin_user" = "yes" ; then
|
|
|
|
echo "CONFIG_DARWIN_USER=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_DARWIN_USER 1" >> $config_h
|
|
|
|
fi
|
2008-10-11 19:55:29 +02:00
|
|
|
list=""
|
|
|
|
if test ! -z "$gdb_xml_files" ; then
|
|
|
|
for x in $gdb_xml_files; do
|
|
|
|
list="$list $source_path/gdb-xml/$x"
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
echo "TARGET_XML_FILES=$list" >> $config_mak
|
2003-08-10 23:36:04 +02:00
|
|
|
|
2008-04-11 23:36:06 +02:00
|
|
|
if test "$target_cpu" = "arm" \
|
|
|
|
-o "$target_cpu" = "armeb" \
|
|
|
|
-o "$target_cpu" = "m68k" \
|
|
|
|
-o "$target_cpu" = "mips" \
|
|
|
|
-o "$target_cpu" = "mipsel" \
|
|
|
|
-o "$target_cpu" = "mipsn32" \
|
|
|
|
-o "$target_cpu" = "mipsn32el" \
|
|
|
|
-o "$target_cpu" = "mips64" \
|
|
|
|
-o "$target_cpu" = "mips64el" \
|
2008-12-15 07:34:37 +01:00
|
|
|
-o "$target_cpu" = "ppc" \
|
|
|
|
-o "$target_cpu" = "ppc64" \
|
2008-12-15 18:13:19 +01:00
|
|
|
-o "$target_cpu" = "ppc64abi32" \
|
|
|
|
-o "$target_cpu" = "ppcemb" \
|
2008-04-11 23:36:06 +02:00
|
|
|
-o "$target_cpu" = "sparc" \
|
|
|
|
-o "$target_cpu" = "sparc64" \
|
|
|
|
-o "$target_cpu" = "sparc32plus"; then
|
2005-03-13 17:54:06 +01:00
|
|
|
echo "CONFIG_SOFTFLOAT=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
|
|
|
|
fi
|
2006-06-11 15:32:59 +02:00
|
|
|
if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
|
|
|
|
echo "TARGET_HAS_BFLT=yes" >> $config_mak
|
|
|
|
echo "#define TARGET_HAS_BFLT 1" >> $config_h
|
|
|
|
fi
|
2008-05-29 16:34:11 +02:00
|
|
|
if test "$target_user_only" = "yes" \
|
|
|
|
-a "$nptl" = "yes" -a "$target_nptl" = "yes"; then
|
|
|
|
echo "#define USE_NPTL 1" >> $config_h
|
|
|
|
fi
|
2007-10-09 18:34:29 +02:00
|
|
|
# 32 bit ELF loader in addition to native 64 bit loader?
|
|
|
|
if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then
|
|
|
|
echo "TARGET_HAS_ELFLOAD32=yes" >> $config_mak
|
|
|
|
echo "#define TARGET_HAS_ELFLOAD32 1" >> $config_h
|
|
|
|
fi
|
2008-10-26 21:33:16 +01:00
|
|
|
if test "$target_bsd_user" = "yes" ; then
|
|
|
|
echo "CONFIG_BSD_USER=yes" >> $config_mak
|
|
|
|
echo "#define CONFIG_BSD_USER 1" >> $config_h
|
|
|
|
fi
|
2005-03-01 22:37:28 +01:00
|
|
|
|
2007-08-01 01:07:32 +02:00
|
|
|
test -f ${config_h}~ && cmp -s $config_h ${config_h}~ && mv ${config_h}~ $config_h
|
|
|
|
|
2003-08-10 23:36:04 +02:00
|
|
|
done # for target in $targets
|
2003-03-07 00:23:54 +01:00
|
|
|
|
|
|
|
# build tree in object directory if source path is different from current one
|
|
|
|
if test "$source_path_used" = "yes" ; then
|
2007-11-07 20:25:15 +01:00
|
|
|
DIRS="tests tests/cris slirp audio"
|
2003-03-07 00:23:54 +01:00
|
|
|
FILES="Makefile tests/Makefile"
|
2007-10-08 15:38:27 +02:00
|
|
|
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
|
2008-03-01 23:23:17 +01:00
|
|
|
FILES="$FILES tests/test-mmap.c"
|
2003-03-07 00:23:54 +01:00
|
|
|
for dir in $DIRS ; do
|
|
|
|
mkdir -p $dir
|
|
|
|
done
|
2006-04-26 00:36:06 +02:00
|
|
|
# remove the link and recreate it, as not all "ln -sf" overwrite the link
|
2003-03-07 00:23:54 +01:00
|
|
|
for f in $FILES ; do
|
2006-04-26 00:36:06 +02:00
|
|
|
rm -f $f
|
|
|
|
ln -s $source_path/$f $f
|
2003-03-07 00:23:54 +01:00
|
|
|
done
|
|
|
|
fi
|