Merge branch 'qemu'

diff --cc Makefile
Simple merge

diff --cc Makefile.target
Simple merge

diff --cc block-raw-posix.c
index b1740d2f1a22f4bed09d6e2fea63cc72ece27ab9,ec817e98f084e42c73c3455fa2e0ace180c65ba7..3e20b2bc78f99873fe1f795e7b4de6185b5bc100
--- 1/block-raw-posix.c
--- 2/block-raw-posix.c
+++ b/block-raw-posix.c
@@@ -575,8 -580,8 +580,9 @@@ BlockDriver bdrv_raw = 
      .bdrv_aio_read = raw_aio_read,
      .bdrv_aio_write = raw_aio_write,
      .bdrv_aio_cancel = raw_aio_cancel,
 +    .bdrv_aio_flush = raw_aio_flush,
      .aiocb_size = sizeof(RawAIOCB),
+ #endif
      .protocol_name = "file",
      .bdrv_pread = raw_pread,
      .bdrv_pwrite = raw_pwrite,

diff --cc configure
index 0ef254027c7645949caf82e5f02dc8cf0abfaadd,97aad44f739b8d6e8c9b7637149f1053c762c881..9ff039e79f382659902a450a47acc0b9dcf75826
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -825,9 -807,9 +829,10 @@@ echo "SDL support       $sdl
  if test "$sdl" != "no" ; then
      echo "SDL static link   $sdl_static"
  fi
 +echo "OpenGL support    $opengl"
  echo "curses support    $curses"
  echo "mingw32 support   $mingw32"
+ echo "Audio support     $audio"
  echo "Adlib support     $adlib"
  echo "AC97 support      $ac97"
  echo "GUS support       $gus"