Merge branch 'master' of git://git.sv.gnu.org/qemu into next
* 'master' of git://git.sv.gnu.org/qemu: (26 commits)
seabios: Update to 0.6.1
qemu-timer: move commonly used timer code to qemu-timer-common
rewrite i386 tests Makefile
fix test_path
make runcom compile on recent distributions
disable test_enter on i386, it is broken
unbreak "make" from vpath-built tests directory
unbreak "make" from tests directory
mips_fulong2e: fix ram allocation
Replace remaining gcc format attributes by macro GCC_FMT_ATTR (format checking)
Remove special handling of system include files (no longer needed)
virtio-blk: Respect werror option for flushes
ide: Handle flush failure
ide: Factor ide_flush_cache out
qemu-img: Fix qemu-img convert -obacking_file
block: Use GCC_FMT_ATTR and fix a format error
qemu-io: New command map
Copy snapshots out of QCOW2 disk
ide: set WCACHE supported in IDENTIFY data
qcow2: Remove old image creation function
...
Signed-off-by: Avi Kivity <avi@redhat.com>