Patchwork [1/2] kvm: Use kvm-kmod headers if available

login
register
mail settings
Submitter Jan Kiszka
Date Jan. 12, 2010, 6:53 p.m.
Message ID <4B4CC539.10306@siemens.com>
Download mbox | patch
Permalink /patch/42742/
State New
Headers show

Comments

Jan Kiszka - Jan. 12, 2010, 6:53 p.m.
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.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Note: This is the upstream version first. qemu-kvm differs in this area,
I will post corresponding patches for that tree later.

 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Doug Goldstein - Jan. 12, 2010, 8:20 p.m.
On Tue, Jan 12, 2010 at 12:53 PM, Jan Kiszka <jan.kiszka@siemens.com> wrote:
> 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.
>

Would it be possible to turn this into a configure option? Such that I
could say ./configure --with-kvm-kmod{=optional/path/to} because
otherwise this adds a potential automagical dependency onto kvm-kmod
(i.e. if the user had kvm-kmod installed at the time of build but then
removed them and went back with their kernel provided version)

Thanks.
Anthony Liguori - Jan. 12, 2010, 8:36 p.m.
On 01/12/2010 12:53 PM, Jan Kiszka wrote:
> 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.
>
> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
>    

Applied all.  Thanks.

Regards,

Anthony Liguori
> ---
>
> Note: This is the upstream version first. qemu-kvm differs in this area,
> I will post corresponding patches for that tree later.
>
>   configure |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/configure b/configure
> index 5c056f5..623c30e 100755
> --- a/configure
> +++ b/configure
> @@ -1384,7 +1384,7 @@ EOF
>               kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
>         fi
>     else
> -      kvm_cflags=""
> +    kvm_cflags=`pkg-config --cflags kvm-kmod 2>  /dev/null`
>     fi
>     if compile_prog "$kvm_cflags" "" ; then
>       kvm=yes
>
>
>
>
Jan Kiszka - Jan. 12, 2010, 9:22 p.m.
Doug Goldstein wrote:
> On Tue, Jan 12, 2010 at 12:53 PM, Jan Kiszka <jan.kiszka@siemens.com> wrote:
>> 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.
>>
> 
> Would it be possible to turn this into a configure option? Such that I
> could say ./configure --with-kvm-kmod{=optional/path/to} because
> otherwise this adds a potential automagical dependency onto kvm-kmod
> (i.e. if the user had kvm-kmod installed at the time of build but then
> removed them and went back with their kernel provided version)

I don't see the problem yet. Either the qemu version built against the
previously installed headers will detect during runtime that the loaded
kvm support is restricted or even unsuited and handle this properly. Or
the user will happen to generate a new qemu which lacks the same
features as the installed kvm.

There is only the case that the distribution ships more powerful kvm
modules than their kernel headers advertise. But that's a distribution
bug we can only solve by filing bug reports there and installing
kvm-kmod in the meantime.

Jan

Patch

diff --git a/configure b/configure
index 5c056f5..623c30e 100755
--- a/configure
+++ b/configure
@@ -1384,7 +1384,7 @@  EOF
             kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
       fi
   else
-      kvm_cflags=""
+    kvm_cflags=`pkg-config --cflags kvm-kmod 2> /dev/null`
   fi
   if compile_prog "$kvm_cflags" "" ; then
     kvm=yes