Fix kvm with vtd; bug #256685

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 49 insertions, 7 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index 543394e1577b..d42661570972 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/kvm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.26 2009/01/26 19:33:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.27 2009/02/08 19:36:43 dang Exp $
+
+  08 Feb 2009; Daniel Gryniewicz <dang@gentoo.org> +files/kvm-83-vtd.patch,
+  kvm-83.ebuild:
+  Fix kvm with vtd; bug #256685
 
 *kvm-83 (26 Jan 2009)
 
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index a9be205cd0db..a851d8266e58 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kvm-83-vtd.patch 1286 RMD160 0dffa8d385f88c7452c5fbee9e8af8373f6b3ea7 SHA1 696d03063413ecb17658452957fbf2fcc44f9ce0 SHA256 b0fcda4000c1f8e52098593838127a180599f535cea318880169cf9d0b890c73
 DIST kvm-75.tar.gz 4108859 RMD160 e536cce39653111c1eb4d9eda8e908ae381362b8 SHA1 6b86df5554748998a31a1609cd8b4593af7cd3f0 SHA256 fff3add1e16b3ece8edfb29b10cbdcefed95d8a18ceac77b008a241a2427d0bf
 DIST kvm-77.tar.gz 7320987 RMD160 3bb7cf48af0af2062769b95485c4a504a1274cd7 SHA1 bb3d0d09b369a4561e4cfe5de58bdf77b1d6a16e SHA256 9b6c1d61d27e5e67daea751b908927fc7290e0f15b3f4bbe391e154404d8abca
 DIST kvm-78.tar.gz 4231476 RMD160 b4b06a717f6d9212feebd2b2744f3fc89a586a45 SHA1 18d0cb5958d9d3968710cd7a62349ae3d23ca830 SHA256 1ade8847ea3f72b662eedb01f7447325915ca243c3ea86b22ecbb5fafbed6217
@@ -23,13 +24,13 @@ EBUILD kvm-79-r1.ebuild 6847 RMD160 6c956f6eee0253e0fb12b86235b7c87cdc1a582d SHA
 EBUILD kvm-79.ebuild 6844 RMD160 b81124ea07c87970460fc62168f7d6be46d50596 SHA1 4a2c098cdf52ddcbc720df5b3d18ccfedbd332c2 SHA256 4a9f9461f5acd8f53cd59b39a21420cde59a3f7257ae35d5e66c2f2d101c12eb
 EBUILD kvm-81.ebuild 6994 RMD160 4ad0d79d6543c836f6d9c6b4f0d34daf400b1f1d SHA1 33d30a519f6ff405ea89351691b28a271adad931 SHA256 241a3422de81b30b083969c9ece3d34f55af89affeb4b3af3dd430ca04f999fd
 EBUILD kvm-82.ebuild 6950 RMD160 f379ec52f9ca2957bef915c507195a2ce6fff45c SHA1 30c211ef5f192fbb0438d036d44a9fc28ceffcdf SHA256 02b34f93f24b5ce9245dce2e8ac8e77bb3b5b6af6f2c98cd80b5ac1a09dc59e3
-EBUILD kvm-83.ebuild 6950 RMD160 faa83c58d44b7cab81ce8733eee341204916fa72 SHA1 0c5f2b774c885003a2addc37cbe98e86b06a681f SHA256 7fca33c9c63365cc9b5ba858d8144948930da54b1265016e6ecb349f02f3761d
-MISC ChangeLog 7534 RMD160 c689e4dd2f689a0bdede11d3a622f35944b33d6e SHA1 9d0da9e13fde1a7a96308c8cd0286dbf405aaec1 SHA256 131aa6114cff4111aeee71fd2075f01e4da4cab7a7b78acfe1089ca74bb64a29
+EBUILD kvm-83.ebuild 7026 RMD160 22762b31ff3fcfede53eba6e0e3c469d13e422af SHA1 c258b36a2fb5d2c75449ab1e4ab46bce458b8fda SHA256 2b22318aa2af01591ecd51cd6771d4dcd50885b5beb652a3d82bb16c6fab9f14
+MISC ChangeLog 7660 RMD160 31b6e91a83f34cd787ff54d826dbb0c3aa937cd9 SHA1 3459157bd7aa42f5bb867ce98200f888a230b7a7 SHA256 4c57120caa0d10eb0cfb34fb4e606af80cf8235f12ad5cc2de0d0b9de56d69c6
 MISC metadata.xml 1282 RMD160 2c8cc65da23f96cfd73f757000192d4af7b29e9f SHA1 3b84cbafe2190715df0310fe8bde8dc6d483e6df SHA256 af8ea32fd7dedeb7401d4df31016c3e6a4a12d9720577bbb9673d4ae22b3dc54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFJfhARomPajV0RnrERApNwAJ4smllEFswh6VCsc+F4Wo4b3HTlnACfcYU3
-p/TbTIrDdrKYS+bC6WFMiJ0=
-=fzY9
+iD8DBQFJjzRYomPajV0RnrERAjeMAJ42/+ZJKHt8YYbFHCpQIWtj7xaDjACfQn7b
+77NBOIddl6ciZEpFQI1Kci0=
+=4WLq
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/files/kvm-83-vtd.patch b/app-emulation/kvm/files/kvm-83-vtd.patch
new file mode 100644
index 000000000000..b26ece46786d
--- /dev/null
+++ b/app-emulation/kvm/files/kvm-83-vtd.patch
@@ -0,0 +1,34 @@
+From: Sheng Yang <sheng@linux.intel.com>
+Date: Wed, 21 Jan 2009 06:33:00 +0000 (+0800)
+Subject: kvm: external module: Fix build for VT-d/AMD IOMMU
+X-Git-Url: http://git.kernel.org/?p=virt%2Fkvm%2Fkvm-userspace.git;a=commitdiff_plain;h=f4d1fb9baa37ac54414ea21d910937a33d885e9a;hp=7b2bbc4aa31828a78bd33ae5b6b39fd925c5de7e
+
+kvm: external module: Fix build for VT-d/AMD IOMMU
+
+The vtd.c has renamed to iommu.c, and config option has changed to
+CONFIG_IOMMU_API.
+
+Notice now the host kernel before 2.6.29 can't work with VT-d due to API
+changed... At least this patch enabled building with host kernel before 2.6.29
+with CONFIG_DMAR.
+
+Signed-off-by: Wei Huang <wei.w.huang@intel.com>
+Signed-off-by: Sheng Yang <sheng@linux.intel.com>
+Signed-off-by: Avi Kivity <avi@redhat.com>
+---
+
+diff --git a/kernel/x86/Kbuild b/kernel/x86/Kbuild
+index c4723b1..4ef1168 100644
+--- a/kernel/x86/Kbuild
++++ b/kernel/x86/Kbuild
+@@ -9,8 +9,8 @@ kvm-objs := kvm_main.o x86.o mmu.o x86_emulate.o ../anon_inodes.o irq.o i8259.o
+ ifeq ($(EXT_CONFIG_KVM_TRACE),y)
+ kvm-objs += kvm_trace.o
+ endif
+-ifeq ($(CONFIG_DMAR),y)
+-kvm-objs += vtd.o
++ifeq ($(CONFIG_IOMMU_API),y)
++kvm-objs += iommu.o
+ endif
+ kvm-intel-objs := vmx.o vmx-debug.o ../external-module-compat.o
+ kvm-amd-objs := svm.o ../external-module-compat.o
diff --git a/app-emulation/kvm/kvm-83.ebuild b/app-emulation/kvm/kvm-83.ebuild
index d1db41ef11c0..15ffd6b70db6 100644
--- a/app-emulation/kvm/kvm-83.ebuild
+++ b/app-emulation/kvm/kvm-83.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-83.ebuild,v 1.1 2009/01/26 19:33:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-83.ebuild,v 1.2 2009/02/08 19:36:43 dang Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-mod
 
@@ -103,6 +103,9 @@ src_unpack() {
 	# avoid strip
 	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
 
+	# Fix building with vtd; bug #256685
+	epatch "${FILESDIR}"/${P}-vtd.patch
+
 	# apply patchset
 	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
 	EPATCH_SUFFIX="patch"