From patchwork Wed Feb 11 08:12:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 6632 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1B8COkE014230 for ; Wed, 11 Feb 2009 08:12:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753559AbZBKIMR (ORCPT ); Wed, 11 Feb 2009 03:12:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753341AbZBKIMQ (ORCPT ); Wed, 11 Feb 2009 03:12:16 -0500 Received: from mga02.intel.com ([134.134.136.20]:6146 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753559AbZBKIMN (ORCPT ); Wed, 11 Feb 2009 03:12:13 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 11 Feb 2009 00:07:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,191,1233561600"; d="scan'208";a="385847101" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.102]) by orsmga002.jf.intel.com with ESMTP; 11 Feb 2009 00:21:05 -0800 Received: from yasker by syang10-desktop with local (Exim 4.69) (envelope-from ) id 1LXACX-0000sN-Gq; Wed, 11 Feb 2009 16:12:09 +0800 From: Sheng Yang To: Avi Kivity Cc: kvm@vger.kernel.org, Anthony Liguori , Sheng Yang Subject: [PATCH 2/7] Make device assignment depend on libpci Date: Wed, 11 Feb 2009 16:12:04 +0800 Message-Id: <1234339929-3345-3-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1234339929-3345-1-git-send-email-sheng@linux.intel.com> References: <1234339929-3345-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Which is used later for capability detection. Signed-off-by: Sheng Yang --- qemu/Makefile.target | 1 + qemu/configure | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/qemu/Makefile.target b/qemu/Makefile.target index 2c7c0d5..28704ce 100644 --- a/qemu/Makefile.target +++ b/qemu/Makefile.target @@ -637,6 +637,7 @@ OBJS += device-hotplug.o ifeq ($(USE_KVM_DEVICE_ASSIGNMENT), 1) OBJS+= device-assignment.o +LIBS+=-lpci endif ifeq ($(TARGET_BASE_ARCH), i386) diff --git a/qemu/configure b/qemu/configure index 902bba3..b6aa7d7 100755 --- a/qemu/configure +++ b/qemu/configure @@ -792,6 +792,26 @@ EOF fi fi +# libpci probe for kvm_cap_device_assignment +if test $kvm_cap_device_assignment = "yes" ; then +cat > $TMPC << EOF +#include +#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