From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 15 Jul 2008 17:46:25 +0000 (+0100)
Subject: Merge branch 'qemu'
X-Git-Tag: xen-3.3.0-rc1~29
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2972ec39706b75cf5f81ca2ca128e3ecbb289936;p=qemu-xen-4.0-testing.git

Merge branch 'qemu'
---

2972ec39706b75cf5f81ca2ca128e3ecbb289936
diff --cc block-raw-posix.c
index b1740d2f,ec817e98..3e20b2bc
--- a/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 0ef25402,97aad44f..9ff039e7
--- a/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"