[PATCH v2 15/20] pci-assign: Drop configure switches
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: 2012-08-17 06:59:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <jan.kiszka@siemens.com> --- configure | 11 ----------- hw/i386/Makefile.objs | 2 +- 2 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index 5808764..69ee7a9 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))
--
1.7.3.4