From patchwork Thu Aug 16 13:54:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 1332251 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3F2C540210 for ; Thu, 16 Aug 2012 13:56:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757063Ab2HPNyk (ORCPT ); Thu, 16 Aug 2012 09:54:40 -0400 Received: from thoth.sbs.de ([192.35.17.2]:30047 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756838Ab2HPNyj (ORCPT ); Thu, 16 Aug 2012 09:54:39 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id q7GDsZqS008152; Thu, 16 Aug 2012 15:54:35 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q7GDsYJO012893; Thu, 16 Aug 2012 15:54:35 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Alex Williamson Subject: [PATCH 14/19] pci-assign: Drop configure switches Date: Thu, 16 Aug 2012 15:54:28 +0200 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org There are no other dependencies of device assignment except for CONFIG_KVM and an x86 target. So there is also no point in controlling this feature via configure. Signed-off-by: Jan Kiszka --- configure | 11 ----------- hw/i386/Makefile.objs | 2 +- 2 files changed, 1 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 5c3ad51..87424ce 100755 --- a/configure +++ b/configure @@ -211,7 +211,6 @@ bsd_user="no" guest_base="" uname_release="" mixemu="no" -kvm_cap_device_assignment="yes" aix="no" blobs="yes" pkgversion=" ($(kvm_version))" @@ -729,10 +728,6 @@ for opt do ;; --enable-tcg-interpreter) tcg_interpreter="yes" ;; - --disable-kvm-device-assignment) kvm_cap_device_assignment="no" - ;; - --enable-kvm-device-assignment) kvm_cap_device_assignment="yes" - ;; --disable-cap-ng) cap_ng="no" ;; --enable-cap-ng) cap_ng="yes" @@ -1091,8 +1086,6 @@ echo " --disable-slirp disable SLIRP userspace network connectivity" echo " --disable-kvm disable KVM acceleration support" echo " --enable-kvm enable KVM acceleration support" echo " --enable-tcg-interpreter enable TCG with bytecode interpreter (TCI)" -echo " --disable-kvm-device-assignment disable KVM device assignment support" -echo " --enable-kvm-device-assignment enable KVM device assignment support" echo " --disable-nptl disable usermode NPTL support" echo " --enable-nptl enable usermode NPTL support" echo " --enable-system enable all system emulation targets" @@ -3118,7 +3111,6 @@ echo "ATTR/XATTR support $attr" echo "Install blobs $blobs" echo "KVM support $kvm" echo "TCG interpreter $tcg_interpreter" -echo "KVM device assig. $kvm_cap_device_assignment" echo "fdt support $fdt" echo "preadv support $preadv" echo "fdatasync $fdatasync" @@ -3845,9 +3837,6 @@ case "$target_arch2" in if test "$vhost_net" = "yes" ; then echo "CONFIG_VHOST_NET=y" >> $config_target_mak fi - if test $kvm_cap_device_assignment = "yes" ; then - echo "CONFIG_KVM_DEVICE_ASSIGNMENT=y" >> $config_target_mak - fi fi esac case "$target_arch2" in diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index ad52387..29f3e6f 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -14,7 +14,7 @@ obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o obj-y += testdev.o obj-y += acpi.o acpi_piix4.o -obj-$(CONFIG_KVM_DEVICE_ASSIGNMENT) += device-assignment.o +obj-$(CONFIG_KVM) += device-assignment.o obj-y := $(addprefix ../,$(obj-y))