2 files changed, 2 insertions(+), 8 deletions(-)
qemu/Makefile.target | 3 +--
qemu/configure | 7 +------
Now that kvm headers are synced locally, qemu does not need a specific option
to find the kernel headers as they can now be specified in the --extra-cflags
option.
Signed-off-by: Jerone Young <[EMAIL PROTECTED]>
diff --git a/qemu/Makefile.target b/qemu/Makefile.target
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -546,8 +546,7 @@ SOUND_HW += gus.o gusemu_hal.o gusemu_mi
SOUND_HW += gus.o gusemu_hal.o gusemu_mixer.o
endif
-ifdef CONFIG_KVM_KERNEL_INC
-CFLAGS += -I $(CONFIG_KVM_KERNEL_INC)
+ifeq ($(USE_KVM), 1)
LIBS += -lkvm
DEPLIBS += ../libkvm/libkvm.a
endif
diff --git a/qemu/configure b/qemu/configure
--- a/qemu/configure
+++ b/qemu/configure
@@ -102,7 +102,6 @@ kvm="no"
kvm="no"
kvm_cap_pit="no"
profiler="no"
-kernel_path=""
cocoa="no"
check_gfx="yes"
check_gcc="yes"
@@ -305,8 +304,6 @@ for opt do
;;
--enable-profiler) profiler="yes"
;;
- --kernel-path=*) kernel_path="$optarg"
- ;;
--enable-cocoa) cocoa="yes" ; coreaudio="yes" ; sdl="no"
;;
--disable-gfx-check) check_gfx="no"
@@ -418,7 +415,6 @@ echo ""
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):"
@@ -627,7 +623,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 -o $TMPE ${OS_CFLAGS} $TMPC 2> /dev/null ; then
kvm_cap_pit="yes"
fi
fi
@@ -1184,7 +1180,6 @@ 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
if test $kvm_cap_pit = "yes" ; then
echo "USE_KVM_PIT=1" >> $config_mak
fi
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
