From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH 1/2] qemu-kvm: Use kvm-kmod headers if available Date: Tue, 12 Jan 2010 22:21:27 +0100 Message-ID: <4B4CE7D7.9060500@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Cc: Gleb Natapov , kvm To: Avi Kivity , Marcelo Tosatti Return-path: Received: from fmmailgate02.web.de ([217.72.192.227]:35420 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752219Ab0ALVV3 (ORCPT ); Tue, 12 Jan 2010 16:21:29 -0500 Sender: kvm-owner@vger.kernel.org List-ID: Since kvm-kmod-2.6.32.2 we have an alternative source for recent KVM kernel headers. Use it when available and not overruled by --kerneldir. If there is no kvm-kmod and no --kerneldir, we continue to fall back to the qemu-kvm's kernel headers. Signed-off-by: Jan Kiszka --- configure | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 20c374a..6ba565a 100755 --- a/configure +++ b/configure @@ -1424,6 +1424,8 @@ EOF kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include" fi else + kvm_cflags=`pkg-config --cflags kvm-kmod 2> /dev/null` + if test "$kvm_cflags" = ""; then case "$cpu" in i386 | x86_64) kvm_arch="x86" @@ -1438,6 +1440,7 @@ EOF kvm_cflags="-I$source_path/kvm/include" kvm_cflags="$kvm_cflags -include $source_path/kvm/include/linux/config.h" kvm_cflags="$kvm_cflags -I$source_path/kvm/include/$kvm_arch" + fi fi kvm_cflags="$kvm_cflags -idirafter $source_path/compat" if compile_prog "$kvm_cflags" "" ; then