Merge remote branch 'spice/submit.6' into staging

Conflicts:
	configure

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --cc Makefile.objs
index 9c13bb3,a3113d8..816194a
--- 1/Makefile.objs
--- 2/Makefile.objs
+++ b/Makefile.objs
@@@ -87,8 -87,9 +88,10 @@@ common-obj-y += pflib.
  
  common-obj-$(CONFIG_BRLAPI) += baum.o
  common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
 +common-obj-$(CONFIG_WIN32) += version.o
  
+ common-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display.o
+ 
  audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
  audio-obj-$(CONFIG_SDL) += sdlaudio.o
  audio-obj-$(CONFIG_OSS) += ossaudio.o

diff --cc configure
index e0d34fd,695a632..9e65de0
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -15,12 -15,12 +15,14 @@@ TMPC="${TMPDIR1}/qemu-conf-${RANDOM}-$$
  TMPO="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.o"
  TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.exe"
  
 -trap "rm -f $TMPC $TMPO $TMPE ; exit" EXIT INT QUIT TERM
 +# NB: do not call "exit" in the trap handler; this is buggy with some shells;
 +# see <1285349658-3122-1-git-send-email-loic.minier@linaro.org>
 +trap "rm -f $TMPC $TMPO $TMPE" EXIT INT QUIT TERM
+ rm -f config.log
  
  compile_object() {
-   $cc $QEMU_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null
+   echo $cc $QEMU_CFLAGS -c -o $TMPO $TMPC >> config.log
+   $cc $QEMU_CFLAGS -c -o $TMPO $TMPC >> config.log 2>&1
  }
  
  compile_prog() {
@@@ -2533,13 -2512,11 +2567,17 @@@ f
  if test "$fdatasync" = "yes" ; then
    echo "CONFIG_FDATASYNC=y" >> $config_host_mak
  fi
 +if test "$madvise" = "yes" ; then
 +  echo "CONFIG_MADVISE=y" >> $config_host_mak
 +fi
 +if test "$posix_madvise" = "yes" ; then
 +  echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak
 +fi
  
+ if test "$spice" = "yes" ; then
+   echo "CONFIG_SPICE=y" >> $config_host_mak
+ fi
+ 
  # XXX: suppress that
  if [ "$bsd" = "yes" ] ; then
    echo "CONFIG_BSD=y" >> $config_host_mak

diff --cc qemu-config.c
Simple merge

diff --cc vl.c
Simple merge