From 863f7b922254caf48087fb82f3e37aa18e725a38 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Sun, 9 Nov 2008 19:14:21 +0200
Subject: [PATCH] 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>
---
 configure     | 18 +++++-------------
 kvm/configure |  2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index eeb7f4db57..de30a957c7 100755
--- a/configure
+++ b/configure
@@ -100,11 +100,7 @@ bsd="no"
 linux="no"
 solaris="no"
 kqemu="no"
-kvm="no"
-kvm_cap_pit="no"
-kvm_cap_device_assignment="no"
 profiler="no"
-kernel_path=""
 cocoa="no"
 check_gfx="yes"
 check_gcc="yes"
@@ -120,6 +116,8 @@ nptl="yes"
 mixemu="no"
 bluez="yes"
 kvm="yes"
+kvm_cap_pit="no"
+kvm_cap_device_assignment="no"
 kerneldir=""
 signalfd="no"
 eventfd="no"
@@ -320,8 +318,6 @@ for opt do
   ;;
   --disable-kqemu) kqemu="no"
   ;;
-  --disable-kvm) kvm="no"
-  ;;
   --disable-brlapi) brlapi="no"
   ;;
   --disable-bluez) bluez="no"
@@ -330,8 +326,6 @@ for opt do
   ;;
   --enable-profiler) profiler="yes"
   ;;
-  --kernel-path=*) kernel_path="$optarg"
-  ;;
   --enable-cocoa)
       cocoa="yes" ;
       sdl="no" ;
@@ -458,8 +452,6 @@ echo "  --target-list=LIST       set target list [$target_list]"
 echo ""
 echo "kqemu kernel acceleration support:"
 echo "  --disable-kqemu          disable kqemu support"
-echo "  --kernel-path=PATH       set the kernel path (configure probes it)"
-echo "  --disable-kvm            disable kernel virtual machine support"
 echo ""
 echo "Advanced options (experts only):"
 echo "  --source-path=PATH       path of source code [$source_path]"
@@ -786,7 +778,7 @@ cat > $TMPC <<EOF
 #endif
 int main(void) { return 0; }
 EOF
-    if $cc $ARCH_CFLAGS $CFLAGS -I"$kernel_path"/include -o $TMPE ${OS_CFLAGS} $TMPC 2> /dev/null ; then
+    if $cc $ARCH_CFLAGS $CFLAGS -I"$kerneldir"/include -o $TMPE ${OS_CFLAGS} $TMPC 2> /dev/null ; then
 	kvm_cap_pit="yes"
     fi
 
@@ -799,7 +791,7 @@ cat > $TMPC <<EOF
 #endif
 int main(void) { return 0; }
 EOF
-    if $cc $ARCH_CFLAGS $CFLAGS -I"$kernel_path"/include -o $TMPE ${OS_CFLAGS} $TMPC 2> /dev/null ; then
+    if $cc $ARCH_CFLAGS $CFLAGS -I"$kerneldir"/include -o $TMPE ${OS_CFLAGS} $TMPC 2> /dev/null ; then
 	kvm_cap_device_assignment="yes"
     fi
 fi
@@ -1586,7 +1578,7 @@ configure_kvm() {
           \( "$cpu" = "i386" -o "$cpu" = "x86_64" -o "$cpu" = "ia64" -o "$cpu" = "powerpc" \); then
     echo "#define USE_KVM 1" >> $config_h
     echo "USE_KVM=1" >> $config_mak
-    echo "CONFIG_KVM_KERNEL_INC=$kernel_path/include" >> $config_mak
+    echo "CONFIG_KVM_KERNEL_INC=$kerneldir/include" >> $config_mak
     if test $kvm_cap_pit = "yes" ; then
 	echo "USE_KVM_PIT=1" >> $config_mak
 	echo "#define USE_KVM_PIT 1" >> $config_h
diff --git a/kvm/configure b/kvm/configure
index 6d50b7242b..63f956c670 100755
--- a/kvm/configure
+++ b/kvm/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[@]}"
-- 
2.11.4.GIT