From patchwork Thu Jun 24 11:45:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 107844 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5OBjIgt025548 for ; Thu, 24 Jun 2010 11:45:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754713Ab0FXLpP (ORCPT ); Thu, 24 Jun 2010 07:45:15 -0400 Received: from goliath.siemens.de ([192.35.17.28]:19499 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753736Ab0FXLpO (ORCPT ); Thu, 24 Jun 2010 07:45:14 -0400 Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o5OBj22o014357 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Jun 2010 13:45:02 +0200 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o5OBj1Tn015695; Thu, 24 Jun 2010 13:45:02 +0200 Message-ID: <4C23453D.5030905@siemens.com> Date: Thu, 24 Jun 2010 13:45:01 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm Subject: [PATCH] qemu-kvm: Remove old kvm-kmod traces from build system Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 24 Jun 2010 11:45:18 +0000 (UTC) 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