Conflicts:

	qemu/block-raw-posix.c
	qemu/configure
	qemu/exec.c
	qemu/hw/pc.c
	qemu/sysemu.h
	qemu/vl.c

Signed-off-by: Avi Kivity <avi@qumranet.com>