Bump to kvm-74

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 243 insertions, 5 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index 7e793b9446fb..83cd3fbb0649 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for app-emulation/kvm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.14 2008/09/09 14:11:05 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.15 2008/09/09 14:36:49 dang Exp $
+
+*kvm-74 (09 Sep 2008)
+
+  09 Sep 2008; Daniel Gryniewicz <dang@gentoo.org> -kvm-73.ebuild,
+  +kvm-74.ebuild:
+  Bump to kvm-74
+  Changes from kvm-73:
+  - make real-mode startup state conform to spec
+  - fix scheduling error in experimental big real mode support
+  - fix reboot fault handler exception table entry (Eduardo Habkost)
+  - x86 emulator code cleanup (Roel Kluin)
+  - fix 'neg r/m' instruction emulation forced to byte size
+  - fix shadow ptes corruption on i386 hosts running smp guests
+  - fix kvmtrace ABI breakage (Adrian Bunk)
+  - enable virtio for ia64
+  - add generic shadow page table walker
+  - allocate internal guest memory as MAP_PRIVATE
+  - don't call get_user_pages(.force=1)
+  - paves the way for get_user_pages_fast()
+  - add mov r, imm instructions to the emulator (Mohammed Gamal)
+  - realmode emulator testsuite
+  - ia64 external module support (Xiantao Zhang)
+  - support tap IFF_VNET_HDR (Mark McLoughlin)
+  - merge qemu-svn
+  - improved usb support
+  - usb auto connect/disconnect
+  - protect against possible corruption during qemu fork() on older hosts
+
+  (Marcelo Tosatti)
 
   09 Sep 2008; Daniel Gryniewicz <dang@gentoo.org> -kvm-70.ebuild,
   -kvm-70-r1.ebuild:
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index 682de6bb8863..8726c94cfa35 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -4,18 +4,20 @@ Hash: SHA1
 DIST kvm-71.tar.gz 3999621 RMD160 c0845bbdb12e917366076855bdca6d89b0acc275 SHA1 6293efaa2d192f03f99fc9fc030d6b3ef85b730b SHA256 b19e7996c9562b1f692e85ba6042f537873ef42c210e4c9e23600a543e00d381
 DIST kvm-72.tar.gz 3959930 RMD160 fc4d225bf8591515a44ead1323aa08eff7765a16 SHA1 3fbb2127dd43c02183206e568d3fe2f30710e85c SHA256 5040d7305de1b0921c6b3e184ac3157a455c145404dea40604d8cf75d6b248b8
 DIST kvm-73.tar.gz 4575585 RMD160 8e87c05fb27ec2fd069a5c511ac0cfee55589e32 SHA1 c67080f8640f620d83da76f731d27e4025a7eb85 SHA256 cd5e0a13baa0e6db7f0b03c298e3b70439a1e6d2d7253c7090ff08b0ece6edae
+DIST kvm-74.tar.gz 4203618 RMD160 adfd0d3e3c79c75e8a9dd5d470c5104cf11307ac SHA1 c2580cd19e867ff77029326f412b8dfcf115bb3a SHA256 4454f0c2516cf4794c9ca5c6f9797c6be251db36643f04e5c8aaa2c5532ecd3e
 DIST kvm-patches-20080716.tar.gz 31882 RMD160 ebe8151d661095e667d1b36b85217ace89590a17 SHA1 491b4d4b754d7f1a4621fc82ac3f8e2d7d5a1d81 SHA256 34d70b7ef448bee74fd229fb3b75797d1da9aba0fccb0eaac701c2e14c37edbd
 DIST kvm-patches-20080822.tar.gz 25178 RMD160 4640f1da457b3ab2da66f8ef6dc98f83464b741e SHA1 827f7a932968e4027902892191cf29cafc5f662a SHA256 811d8541f395c682d98384c7304486e0b47d8fcf6e3df2e02f5ccd7dee353dfb
 EBUILD kvm-71-r2.ebuild 6233 RMD160 b45fe4f99911c479900ba9d457f823e30e28551f SHA1 f84942e2e937ececc4410eab1345952f2081bb74 SHA256 ea33cccd78455dbe9f797d1570e0b18a087349d1a2e867702807fc9b7161e834
 EBUILD kvm-72-r1.ebuild 6308 RMD160 2d2a58c823f5789b2c0c158ce46f8728193e88d9 SHA1 2138a395443155690810fd04cf2646863fd90970 SHA256 9a0e03bb60deca3810356616c9d1c474202afba9db15c117fb80b6f0ed9a53bd
 EBUILD kvm-72.ebuild 6230 RMD160 81bcdbe7ebef70301c4ad782d4c5279e6f7b9ae0 SHA1 7629aa4bca2834261f887d565740b314b736b027 SHA256 e58644c6ae6d668cce279b1ddf191444663de90a4c00f78e54f5a799f991f09b
 EBUILD kvm-73.ebuild 6884 RMD160 108667886cb428bbe4fb6833c13138f5a442bae5 SHA1 d63d35e90f7378cdcb780713f80fa06c00effe82 SHA256 d433ddcfdf745b1fff00b7237248c888f64171cb5dfc3b15bd63d18fa9ec0dc5
-MISC ChangeLog 3454 RMD160 2fc7abd3e3fe53c15adc4916e5971334590b3912 SHA1 2602e8b511b15333ffda67fa8c54529d9f63b439 SHA256 0deaf933bce8986f735d51e6f7a78161155eb492ac595ee63499da99e596de12
+EBUILD kvm-74.ebuild 6884 RMD160 0430399ea1e5905725270c6f729a9c2e3eb56225 SHA1 fc751a2154dafc48e2b23a244f5cffaa2f879c97 SHA256 14c196bcd5dbb6e4257159880d8226d30413d197bb1531ad763a691510758ce9
+MISC ChangeLog 4561 RMD160 333e384854c3161e7b019b284657e47246fd6359 SHA1 28d9bfc52044164988fd83c794282e1b9cb5c4bc SHA256 41ee7c75aa36812a986db9c9c4bd3ab859b87ca41d51461c547ff584698448d8
 MISC metadata.xml 1282 RMD160 2c8cc65da23f96cfd73f757000192d4af7b29e9f SHA1 3b84cbafe2190715df0310fe8bde8dc6d483e6df SHA256 af8ea32fd7dedeb7401d4df31016c3e6a4a12d9720577bbb9673d4ae22b3dc54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIxoQFomPajV0RnrERAk1EAJ9RekpM9Q6HNXzzk+ZNO3Th4RI1CgCdHDOr
-CsB20Z+tFHpQsZsjgKi7ww4=
-=R0w6
+iD8DBQFIxooHomPajV0RnrERAv4nAJwJy6YCXS3AEY7af/mSm8+V/d7dUQCeOA+B
+U9PcleA84yEWMPRdcswjyUM=
+=RtIb
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/kvm-74.ebuild b/app-emulation/kvm/kvm-74.ebuild
new file mode 100644
index 000000000000..9723e9f0d94a
--- /dev/null
+++ b/app-emulation/kvm/kvm-74.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-74.ebuild,v 1.1 2008/09/09 14:36:49 dang Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-mod
+
+# Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
+PATCHSET="kvm-patches-20080822"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${PATCHSET}.tar.gz"
+
+DESCRIPTION="Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+# Add bios back when it builds again
+IUSE="alsa esd gnutls havekernel modules ncurses pulseaudio sdl test vde"
+RESTRICT="test"
+
+RDEPEND="sys-libs/zlib
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	esd? ( media-sound/esound )
+	pulseaudio? ( media-sound/pulseaudio )
+	gnutls? ( net-libs/gnutls )
+	ncurses? ( sys-libs/ncurses )
+	sdl? ( >=media-libs/libsdl-1.2.11 )
+	vde? ( net-misc/vde )"
+
+#    bios? (
+#        sys-devel/dev86
+#        dev-lang/perl
+#        sys-power/iasl
+#    )
+DEPEND="${RDEPEND}
+	gnutls? ( dev-util/pkgconfig )
+	app-text/texi2html"
+
+QA_TEXTRELS="usr/bin/kvm"
+
+pkg_setup() {
+	if use havekernel && use modules ; then
+		ewarn "You have the 'havekernel' and 'modules' use flags enabled."
+		ewarn "'havekernel' trumps 'modules'; the kvm modules will not"
+		ewarn "be built.  You must ensure you have a compatible kernel"
+		ewarn "with the kvm modules on your own"
+	elif use havekernel ; then
+		ewarn "You have the 'havekernel' use flag set.  This means you"
+		ewarn "must ensure you have a compatible kernel on your own."
+	elif use modules ; then
+		BUILD_TARGETS="all"
+		MODULE_NAMES="kvm(kvm:${S}/kernel:${S}/kernel/x86)"
+		MODULE_NAMES="${MODULE_NAMES} kvm-intel(kvm:${S}/kernel:${S}/kernel/x86)"
+		MODULE_NAMES="${MODULE_NAMES} kvm-amd(kvm:${S}/kernel:${S}/kernel/x86)"
+		linux-mod_pkg_setup
+	elif kernel_is lt 2 6 22; then
+		eerror "the kvm in your kernel requires an older version of"
+		eerror "kvm as shown in :"
+		eerror "  http://kvm.qumranet.com/kvmwiki/Downloads"
+		eerror "Either upgrade your kernel, or enable the 'modules'"
+		eerror "USE flag."
+		die "kvm version not compatible"
+	elif ! linux_chkconfig_present KVM; then
+		eerror "Please enable KVM support in your kernel, found at:"
+		eerror
+		eerror "  Virtualization"
+		eerror "    Kernel-based Virtual Machine (KVM) support"
+		eerror
+		eerror "or enable the 'modules' USE flag."
+		die "KVM support not detected!"
+	fi
+
+	enewgroup kvm
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# prevent docs to get automatically installed
+	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+		qemu/Makefile qemu/Makefile.target
+	[[ -x /sbin/paxctl ]] && \
+		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
+			qemu/Makefile.target
+	# avoid strip
+	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
+
+	epatch \
+		"${WORKDIR}/${PATCHSET}"/kvm-45-qemu-configure.patch \
+		"${WORKDIR}/${PATCHSET}"/kvm-61-qemu-kvm.patch \
+		"${WORKDIR}/${PATCHSET}"/kvm-57-qemu-kvm-cmdline.patch \
+		"${WORKDIR}/${PATCHSET}"/kvm-68-libkvm-no-kernel.patch \
+		"${WORKDIR}/${PATCHSET}"/kvm-69-qemu-ifup_ifdown.patch \
+		"${WORKDIR}/${PATCHSET}"/kvm-70-block-rw-range-check.patch \
+		"${WORKDIR}/${PATCHSET}"/kvm-73-qemu-no-blobs.patch \
+		"${WORKDIR}/${PATCHSET}"/kvm-73-qemu-kvm-doc.patch \
+		"${WORKDIR}/${PATCHSET}"/kvm-73-kernel-longmode.patch
+}
+
+src_compile() {
+	local mycc conf_opts audio_opts
+
+	audio_opts="oss"
+	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
+	use ncurses || conf_opts="$conf_opts --disable-curses"
+	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
+	use vde || conf_opts="$conf_opts --disable-vde"
+	use alsa && audio_opts="alsa $audio_opts"
+	use esd && audio_opts="esd $audio_opts"
+	use pulseaudio && audio_opts="pa $audio_opts"
+	use sdl && audio_opts="sdl $audio_opts"
+	conf_opts="$conf_opts --disable-gcc-check"
+	conf_opts="$conf_opts --prefix=/usr"
+	#conf_opts="$conf_opts --audio-drv-list=\"$audio_opts\""
+
+	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
+
+	emake libkvm || die "emake libkvm failed"
+
+	if use test; then
+		emake user || die "emake user failed"
+	fi
+
+	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
+
+	filter-flags -fpie -fstack-protector
+
+	# If using gentoo's compiler set the SPEC to non-hardened
+	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
+		local myccver=$(${mycc} -dumpversion)
+		local gccver=$($(tc-getBUILD_CC) -dumpversion)
+
+		#Is this a SPEC for the right compiler version?
+		myspec="${GCC_SPECS/${gccver}/${myccver}}"
+		if [ "${myspec}" == "${GCC_SPECS}" ]; then
+			shopt -s extglob
+			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
+			shopt -u extglob
+		else
+			unset GCC_SPECS
+		fi
+	fi
+
+#    if use bios; then
+#        emake bios || die "emake bios failed"
+#        emake vgabios || die "emake vgabios failed"
+#    fi
+
+	emake qemu || die "emake qemu failed"
+
+	if use modules && ! use havekernel ; then
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	# kcmd so we don't install kernel modules which weren't build
+	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
+
+	exeinto /usr/bin/
+	doexe "${S}/kvm_stat"
+
+	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
+	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
+	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
+	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
+	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
+
+	insinto /etc/udev/rules.d/
+	doins scripts/65-kvm.rules
+
+	insinto /etc/kvm/
+	insopts -m0755
+	newins scripts/qemu-ifup kvm-ifup
+	newins scripts/qemu-ifdown kvm-ifdown
+
+	dodoc qemu/pc-bios/README
+	newdoc qemu/qemu-doc.html kvm-doc.html
+	newdoc qemu/qemu-tech.html kvm-tech.html
+
+	if use modules && ! use havekernel ; then
+		linux-mod_src_install
+	fi
+}
+
+pkg_postinst() {
+	elog "If you don't have kvm compiled into the kernel, make sure you have"
+	elog "the kernel module loaded before running kvm. The easiest way to"
+	elog "ensure that the kernel module is loaded is to load it on boot."
+	elog "For AMD CPUs the module is called 'kvm-amd'"
+	elog "For Intel CPUs the module is called 'kvm-intel'"
+	elog "Please review /etc/conf.d/modules for how to load these"
+	elog
+	elog "Make sure your user is in the 'kvm' group"
+	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+	elog
+	elog "You will need the Universal TUN/TAP driver compiled into your"
+	elog "kernel or loaded as a module to use the virtual network device"
+	elog "if using -net tap.  You will also need support for 802.1d"
+	elog "Ethernet Bridging and a configured bridge if using the provided"
+	elog "kvm-ifup script from /etc/kvm."
+	echo
+}