Merge branch 'qemu-cvs'

Conflicts:
	qemu/block.c
	qemu/configure
	qemu/cpu-exec.c
	qemu/exec.c
	qemu/hw/acpi.c
	qemu/hw/pc.c
	qemu/monitor.c
	qemu/target-i386/cpu.h
	qemu/target-i386/helper.c
	qemu/vl.c

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

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index 6d50b724..63f956c6 100755
--- a/configure
+++ b/configure
@@ -123,7 +123,7 @@ fi
     --disable-gcc-check \
     --extra-cflags="-I $PWD/../libkvm $qemu_cflags" \
     --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \
-    --kernel-path="$libkvm_kerneldir" \
+    --kerneldir="$libkvm_kerneldir" \
     --prefix="$prefix" \
     ${cross_prefix:+"--cross-prefix=$cross_prefix"} \
     ${cross_prefix:+"--cpu=$arch"} "${qemu_opts[@]}"