From ae494a6312210ba308a99c8f8bc5989aea7b3c6f Mon Sep 17 00:00:00 2001 From: Eduardo Habkost <ehabkost@redhat.com> Date: Fri, 2 Oct 2009 14:15:30 -0300 Subject: [PATCH 09/10] move kvm extra features detection after kvm detection RH-Author: Juan Quintela <quintela@redhat.com> Message-id: <0db75d458b7a33a44e1e9450b2f27da59f2bd0c6.1253124450.git.quintela@redhat.com> Patchwork-id: 3422 O-Subject: [PATCH 2/2] move kvm extra features detection after kvm detection Bugzilla: 489900 RH-Acked-by: Markus Armbruster <armbru@redhat.com> RH-Acked-by: Kevin Wolf <kwolf@redhat.com> RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com> --- qemu/configure | 103 +++++++++++++++++++++++++++---------------------------- 1 files changed, 51 insertions(+), 52 deletions(-) Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- qemu/configure | 103 +++++++++++++++++++++++++++---------------------------- 1 files changed, 51 insertions(+), 52 deletions(-) diff --git a/qemu/configure b/qemu/configure index 6a3a38e..91cc6a0 100755 --- a/qemu/configure +++ b/qemu/configure @@ -829,58 +829,6 @@ else fi ########################################## -# KVM probe - -if test "$kvm" != "no" ; then - -# test for KVM_CAP_PIT - -cat > $TMPC <<EOF -#include <libkvm.h> -#ifndef KVM_CAP_PIT -#error "kvm no pit capability" -#endif -int main(void) { return 0; } -EOF - if $cc $ARCH_CFLAGS $CFLAGS -I"$kerneldir"/include -o $TMPE ${OS_CFLAGS} $TMPC 2> /dev/null ; then - kvm_cap_pit="yes" - fi - -# test for KVM_CAP_DEVICE_ASSIGNMENT - -cat > $TMPC <<EOF -#include <libkvm.h> -#ifndef KVM_CAP_DEVICE_ASSIGNMENT -#error "kvm no device assignment capability" -#endif -int main(void) { return 0; } -EOF - if $cc $ARCH_CFLAGS $CFLAGS -I"$kerneldir"/include -o $TMPE ${OS_CFLAGS} $TMPC 2> /dev/null ; then - kvm_cap_device_assignment="yes" - fi -fi - -# libpci probe for kvm_cap_device_assignment -if test $kvm_cap_device_assignment = "yes" ; then -cat > $TMPC << EOF -#include <pci/pci.h> -#ifndef PCI_VENDOR_ID -#error NO LIBPCI -#endif -int main(void) { return 0; } -EOF - if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC 2>/dev/null ; then - : - else - echo - echo "Error: libpci check failed" - echo "Disable KVM Device Assignment capability." - echo - kvm_cap_device_assignment="no" - fi -fi - -########################################## # zlib check cat > $TMPC << EOF @@ -1161,6 +1109,57 @@ EOF kvm=no fi fi +########################################## +# KVM probe + +if test "$kvm" != "no" ; then + +# test for KVM_CAP_PIT + +cat > $TMPC <<EOF +#include <libkvm.h> +#ifndef KVM_CAP_PIT +#error "kvm no pit capability" +#endif +int main(void) { return 0; } +EOF + if $cc $ARCH_CFLAGS $CFLAGS -I"$kerneldir"/include -o $TMPE ${OS_CFLAGS} $TMPC 2> /dev/null ; then + kvm_cap_pit="yes" + fi + +# test for KVM_CAP_DEVICE_ASSIGNMENT + +cat > $TMPC <<EOF +#include <libkvm.h> +#ifndef KVM_CAP_DEVICE_ASSIGNMENT +#error "kvm no device assignment capability" +#endif +int main(void) { return 0; } +EOF + if $cc $ARCH_CFLAGS $CFLAGS -I"$kerneldir"/include -o $TMPE ${OS_CFLAGS} $TMPC 2> /dev/null ; then + kvm_cap_device_assignment="yes" + fi +fi + +# libpci probe for kvm_cap_device_assignment +if test $kvm_cap_device_assignment = "yes" ; then +cat > $TMPC << EOF +#include <pci/pci.h> +#ifndef PCI_VENDOR_ID +#error NO LIBPCI +#endif +int main(void) { return 0; } +EOF + if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC 2>/dev/null ; then + : + else + echo + echo "Error: libpci check failed" + echo "Disable KVM Device Assignment capability." + echo + kvm_cap_device_assignment="no" + fi +fi ########################################## # AIO probe -- 1.6.3.rc4.29.g8146