[PATCH] qemu-kvm: Remove old kvm-kmod traces from build system

[Jan Kiszka <jan.kiszka@siemens.com>]

This became a separate package long ago.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 Makefile  |   15 ---------------
 configure |   22 ----------------------
 2 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/Makefile b/Makefile
index 2cd87be..49e2a3f 100644
--- a/Makefile
+++ b/Makefile
@@ -72,18 +72,6 @@ config-host.h-timestamp: config-host.mak
 
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
 
-ifeq ($(KVM_KMOD),yes)
-
-.PHONEY: kvm-kmod
-
-all: kvm-kmod
-
-kvm-kmod:
-	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C kvm/kernel V="$(V)" )
-
-
-endif
-
 subdir-%: $(GENERATED_HEADERS)
 	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)
 
@@ -245,9 +233,6 @@ endif
 	for d in $(TARGET_DIRS); do \
 	$(MAKE) -C $$d $@ || exit 1 ; \
         done
-ifeq ($(KVM_KMOD),yes)
-	$(MAKE) -C kvm/kernel $@
-endif
 
 # various test targets
 test speed: all
diff --git a/configure b/configure
index 08883e7..47e621a 100755
--- a/configure
+++ b/configure
@@ -314,7 +314,6 @@ guest_base=""
 uname_release=""
 io_thread="no"
 mixemu="no"
-kvm_trace="no"
 kvm_cap_pit=""
 kvm_cap_device_assignment=""
 kerneldir=""
@@ -322,7 +321,6 @@ aix="no"
 blobs="yes"
 pkgversion=" ($(kvm_version))"
 cpu_emulation="yes"
-kvm_kmod="no"
 check_utests="no"
 user_pie="no"
 zero_malloc=""
@@ -707,8 +705,6 @@ for opt do
   ;;
   --kerneldir=*) kerneldir="$optarg"
   ;;
-  --with-kvm-trace) kvm_trace="yes"
-  ;;
   --with-pkgversion=*) pkgversion=" ($optarg)"
   ;;
   --disable-docs) docs="no"
@@ -899,7 +895,6 @@ echo "  --enable-linux-aio       enable Linux AIO support"
 echo "  --enable-io-thread       enable IO thread"
 echo "  --disable-blobs          disable installing provided firmware blobs"
 echo "  --kerneldir=PATH         look for kernel includes in PATH"
-echo "  --with-kvm-trace         enable building the KVM module with the kvm trace option"
 echo "  --disable-cpu-emulation  disables use of qemu cpu emulation code"
 echo "  --enable-docs            enable documentation build"
 echo "  --disable-docs           disable documentation build"
@@ -2164,20 +2159,6 @@ if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
 fi
 
 
-if test -f kvm/kernel/configure; then
-    kvm_kmod="yes"
-    kmod_args=""
-    if test -n "$kerneldir"; then
-        kmod_args="--kerneldir=$kerneldir"
-    fi
-    if test "$kvm_trace" = "yes"; then
-        kmod_args="$kmod_args --with-kvm-trace"
-    fi
-    # hope there are no spaces in kmod_args; can't use arrays because of
-    # dash.
-    (cd kvm/kernel; ./configure $kmod_args)
-fi
-
 echo "Install prefix    $prefix"
 echo "BIOS directory    `eval echo $datadir`"
 echo "binary directory  `eval echo $bindir`"
@@ -2239,7 +2220,6 @@ echo "Install blobs     $blobs"
 echo "KVM support       $kvm"
 echo "KVM PIT support   $kvm_cap_pit"
 echo "KVM device assig. $kvm_cap_device_assignment"
-echo "KVM trace support $kvm_trace"
 echo "fdt support       $fdt"
 echo "preadv support    $preadv"
 echo "fdatasync         $fdatasync"
@@ -2493,8 +2473,6 @@ bsd)
 ;;
 esac
 
-echo "KVM_KMOD=$kvm_kmod" >> $config_host_mak
-
 echo "TOOLS=$tools" >> $config_host_mak
 echo "ROMS=$roms" >> $config_host_mak
 echo "MAKE=$make" >> $config_host_mak
-- 
1.6.0.2