Add support for SystemTAP/DTrace. Add support for audio mixer emulation. More use of REQUIRED_USE to detect problems with the build earlier than dying in src_configure. Clean out old commented out. Remove executable stacks.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

4 files changed, 390 insertions, 23 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 864c61688568..8b9fe01d0f4c 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.148 2012/08/12 22:13:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.149 2012/08/12 23:03:17 cardoe Exp $
+
+*qemu-kvm-1.1.1-r2 (12 Aug 2012)
+
+  12 Aug 2012; Doug Goldstein <cardoe@gentoo.org> +qemu-kvm-1.1.1-r2.ebuild,
+  qemu-kvm-9999.ebuild, metadata.xml:
+  Add support for SystemTAP/DTrace. Add support for audio mixer emulation. More
+  use of REQUIRED_USE to detect problems with the build earlier than dying in
+  src_configure. Clean out old commented out. Remove executable stacks.
 
   12 Aug 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
   Switch from QA_PRESTRIPPED to QA_PREBUILT since these files are actually
diff --git a/app-emulation/qemu-kvm/metadata.xml b/app-emulation/qemu-kvm/metadata.xml
index a84b891d0dd6..90e4b04e58a0 100644
--- a/app-emulation/qemu-kvm/metadata.xml
+++ b/app-emulation/qemu-kvm/metadata.xml
@@ -9,6 +9,7 @@
 	<flag name='curl'>Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
     <flag name='fdt'>Enables firmware device tree support</flag>
     <flag name='jpeg'>Enable JPEG compression for the VNC console server</flag>
+	<flag name='mixemu'>Enable audio mixer emulation. On Fedora, known to cause performance problems when using SDL output and ALSA. For OSS, locks the sound device from other applications.</flag>
     <flag name='ncurses'>Enable the ncurses-based console</flag>
     <flag name='nss'>Build support for Smartcard devices emulation using <pkg>dev-libs/nss</pkg></flag>
     <flag name='png'>Enable PNG compression for the VNC console server</flag>
@@ -19,6 +20,7 @@
     <flag name='sdl'>Enable the SDL-based console</flag>
     <flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
     <flag name='ssl'>Enable TLS support for the VNC console server</flag>
+	<flag name='systemtap'>Enable SystemTAP/DTrace tracing</flag>
 	<flag name='tci'>Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
     <flag name='tls'>Enable TLS support for the VNC console server</flag>
     <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..f5af9cab8807
--- /dev/null
+++ b/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r2.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r2.ebuild,v 1.1 2012/08/12 23:03:17 cardoe Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
+BACKPORTS=1
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
+	${BACKPORTS:+
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
+kernel_FreeBSD mixemu ncurses opengl pulseaudio python rbd sasl sdl \
+smartcard spice static systemtap tci tls usbredir vde +vhost-net \
+virtfs xattr xen xfs"
+
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets. x86_64 should be the only
+# defaults on for qemu-kvm
+IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
+REQUIRED_USE="|| ( qemu_softmmu_targets_x86_64"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+	if [ "x${target}" = "xx86_64" ]; then
+		continue
+	fi
+	IUSE="${IUSE} qemu_softmmu_targets_${target}"
+	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
+done
+REQUIRED_USE="${REQUIRED_USE} )"
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} qemu_user_targets_${target}"
+done
+
+REQUIRED_USE="${REQUIRED_USE}
+	static? ( !alsa !pulseaudio )
+	amd64? ( qemu_softmmu_targets_x86_64 )
+	x86? ( qemu_softmmu_targets_x86_64 )
+	virtfs? ( xattr )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+RDEPEND="
+	!app-emulation/kqemu
+	!app-emulation/qemu
+	!<app-emulation/qemu-1.0
+	>=dev-libs/glib-2.0
+	media-libs/libpng
+	sys-apps/pciutils
+	>=sys-firmware/seabios-1.7.0
+	sys-firmware/sgabios
+	sys-firmware/vgabios
+	virtual/jpeg
+	aio? ( dev-libs/libaio )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
+	caps? ( sys-libs/libcap-ng )
+	curl? ( >=net-misc/curl-7.15.4 )
+	fdt? ( >=sys-apps/dtc-1.2.0 )
+	kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
+	ncurses? ( sys-libs/ncurses )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( =dev-lang/python-2*[ncurses] )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
+		!static? ( >=media-libs/libsdl-1.2.11[X] ) )
+	static? ( sys-libs/zlib[static-libs(+)] )
+	!static? ( sys-libs/zlib )
+	smartcard? ( dev-libs/nss )
+	spice? ( >=app-emulation/spice-protocol-0.8.1
+			static? ( >=app-emulation/spice-0.9.0[static-libs] )
+			!static? ( >=app-emulation/spice-0.9.0 )
+	)
+	systemtap? ( dev-util/systemtap )
+	tls? ( net-libs/gnutls )
+	usbredir? ( sys-apps/usbredir )
+	vde? ( net-misc/vde )
+	virtfs? ( sys-libs/libcap )
+	xattr? ( sys-apps/attr )
+	xen? ( app-emulation/xen-tools )
+	xfs? ( sys-fs/xfsprogs )"
+
+DEPEND="${RDEPEND}
+	app-text/texi2html
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper"
+
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup kvm 78
+}
+
+src_prepare() {
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	epatch_user
+}
+
+src_configure() {
+	local conf_opts audio_opts user_targets
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${target}" && \
+		softmmu_targets="${softmmu_targets} ${target}-softmmu"
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${target}" && \
+		user_targets="${user_targets} ${target}-linux-user"
+	done
+
+	einfo "Building the following softmmu targets: ${softmmu_targets}"
+
+	if [[ -n ${user_targets} ]]; then
+		einfo "Building the following user targets: ${user_targets}"
+		conf_opts="${conf_opts} --enable-linux-user"
+	else
+		conf_opts="${conf_opts} --disable-linux-user"
+	fi
+
+	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+	# Add support for static builds
+	use static && conf_opts="${conf_opts} --static --disable-pie"
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if ! use static && gcc-specs-pie; then
+		conf_opts="${conf_opts} --enable-pie"
+	fi
+
+	# audio options
+	audio_opts="oss"
+	use alsa && audio_opts="alsa ${audio_opts}"
+	use pulseaudio && audio_opts="pa ${audio_opts}"
+	use sdl && audio_opts="sdl ${audio_opts}"
+
+	# conditionally making UUID work on Linux only is wrong
+	# but the Gentoo/FreeBSD guys need to figure out what
+	# provides libuuid on their platform
+	# --enable-vnc-thread will go away in 1.2
+	# $(use_enable xen xen-pci-passthrough) for 1.2
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-bsd-user \
+		--disable-guest-agent \
+		--disable-libiscsi \
+		--disable-strip \
+		--disable-werror \
+		--enable-vnc-jpeg \
+		--enable-vnc-png \
+		--enable-vnc-thread \
+		--python=python2 \
+		$(use_enable aio linux-aio) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable brltty brlapi) \
+		$(use_enable caps cap-ng) \
+		$(use_enable curl) \
+		$(use_enable debug debug-info) \
+		$(use_enable debug debug-mon) \
+		$(use_enable debug debug-tcg) \
+		$(use_enable doc docs) \
+		$(use_enable fdt) \
+		$(use_enable kernel_linux kvm) \
+		$(use_enable kernel_linux kvm-device-assignment) \
+		$(use_enable kernel_linux nptl) \
+		$(use_enable kernel_linux uuid) \
+		$(use_enable mixemu) \
+		$(use_enable ncurses curses) \
+		$(use_enable opengl) \
+		$(use_enable rbd) \
+		$(use_enable sasl vnc-sasl) \
+		$(use_enable sdl) \
+		$(use_enable smartcard smartcard) \
+		$(use_enable smartcard smartcard-nss) \
+		$(use_enable spice) \
+		$(use_enable systemtap trace-backend=dtrace) \
+		$(use_enable tci tcg-interpreter) \
+		$(use_enable tls vnc-tls) \
+		$(use_enable usbredir usb-redir) \
+		$(use_enable vde) \
+		$(use_enable vhost-net) \
+		$(use_enable virtfs) \
+		$(use_enable xattr attr) \
+		$(use_enable xen) \
+		$(use_enable xfs xfsctl) \
+		--audio-drv-list="${audio_opts}" \
+		--target-list="${softmmu_targets} ${user_targets}" \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		${conf_opts} \
+		|| die "configure failed"
+
+		# FreeBSD's kernel does not support QEMU assigning/grabbing
+		# host USB devices yet
+		use kernel_FreeBSD && \
+			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	if [[ -n ${softmmu_targets} ]]; then
+		if use kernel_linux; then
+			insinto /lib/udev/rules.d/
+			doins "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use qemu_softmmu_targets_x86_64 ; then
+			dobin "${FILESDIR}"/qemu-kvm
+			ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
+			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
+			ewarn "your libvirt configs or other wrappers for ${PN}"
+		else
+			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+			elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+		fi
+	fi
+
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	if use doc; then
+		dohtml qemu-doc.html qemu-tech.html || die
+	fi
+
+	use python & dobin scripts/kvm/kvm_stat
+
+	# Remove SeaBIOS since we're using the SeaBIOS packaged one
+	rm "${ED}/usr/share/qemu/bios.bin"
+	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+
+	# Remove vgabios since we're using the vgabios packaged one
+	rm "${ED}/usr/share/qemu/vgabios.bin"
+	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+
+	# Remove sgabios since we're using the sgabios packaged one
+	rm "${ED}/usr/share/qemu/sgabios.bin"
+	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]]; then
+		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 "The ssl USE flag was renamed to tls, so adjust your USE flags."
+		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
+	fi
+}
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 8cb3480379f9..81cc3a51e2a4 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.51 2012/08/12 22:13:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.52 2012/08/12 23:03:17 cardoe Exp $
 
 EAPI="4"
 
 PYTHON_DEPEND="2"
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
-#BACKPORTS=1
+BACKPORTS=1
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
@@ -26,8 +26,9 @@ HOMEPAGE="http://www.linux-kvm.org"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
-kernel_FreeBSD ncurses opengl pulseaudio python rbd sasl sdl \
-smartcard spice static tci tls usbredir vde +vhost-net virtfs xattr xen xfs"
+kernel_FreeBSD mixemu ncurses opengl pulseaudio python rbd sasl sdl \
+smartcard spice static systemtap tci tls usbredir vde +vhost-net \
+virtfs xattr xen xfs"
 
 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
@@ -37,19 +38,23 @@ IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
 # below to setup the other targets. x86_64 should be the only
 # defaults on for qemu-kvm
 IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
+REQUIRED_USE="|| ( qemu_softmmu_targets_x86_64"
 
 for target in ${IUSE_SOFTMMU_TARGETS}; do
 	if [ "x${target}" = "xx86_64" ]; then
 		continue
 	fi
 	IUSE="${IUSE} qemu_softmmu_targets_${target}"
+	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
 done
+REQUIRED_USE="${REQUIRED_USE} )"
 
 for target in ${IUSE_USER_TARGETS}; do
 	IUSE="${IUSE} qemu_user_targets_${target}"
 done
 
-REQUIRED_USE="static? ( !alsa !pulseaudio )
+REQUIRED_USE="${REQUIRED_USE}
+	static? ( !alsa !pulseaudio )
 	amd64? ( qemu_softmmu_targets_x86_64 )
 	x86? ( qemu_softmmu_targets_x86_64 )
 	virtfs? ( xattr )"
@@ -89,6 +94,7 @@ RDEPEND="
 			static? ( >=app-emulation/spice-0.9.0[static-libs] )
 			!static? ( >=app-emulation/spice-0.9.0 )
 	)
+	systemtap? ( dev-util/systemtap )
 	tls? ( net-libs/gnutls )
 	usbredir? ( sys-apps/usbredir )
 	vde? ( net-misc/vde )
@@ -177,9 +183,6 @@ src_prepare() {
 	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
 		Makefile Makefile.target || die
 
-	# remove part to make udev happy
-	#sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
-
 	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
 
 	[[ -n ${BACKPORTS} ]] && \
@@ -202,12 +205,7 @@ src_configure() {
 		user_targets="${user_targets} ${target}-linux-user"
 	done
 
-	if [[ -z ${softmmu_targets} ]]; then
-		eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
-		die "At least 1 SoftMMU target must be enabled"
-	else
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
+	einfo "Building the following softmmu targets: ${softmmu_targets}"
 
 	if [[ -n ${user_targets} ]]; then
 		einfo "Building the following user targets: ${user_targets}"
@@ -217,7 +215,7 @@ src_configure() {
 	fi
 
 	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
 	# Add support for static builds
 	use static && conf_opts="${conf_opts} --static --disable-pie"
@@ -243,10 +241,10 @@ src_configure() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-bsd-user \
+		--disable-guest-agent \
 		--disable-libiscsi \
 		--disable-strip \
 		--disable-werror \
-		--disable-guest-agent \
 		--enable-vnc-jpeg \
 		--enable-vnc-png \
 		--python=python2 \
@@ -264,6 +262,7 @@ src_configure() {
 		$(use_enable kernel_linux kvm-device-assignment) \
 		$(use_enable kernel_linux nptl) \
 		$(use_enable kernel_linux uuid) \
+		$(use_enable mixemu) \
 		$(use_enable ncurses curses) \
 		$(use_enable opengl) \
 		$(use_enable rbd) \
@@ -272,6 +271,7 @@ src_configure() {
 		$(use_enable smartcard smartcard) \
 		$(use_enable smartcard smartcard-nss) \
 		$(use_enable spice) \
+		$(use_enable systemtap trace-backend=dtrace) \
 		$(use_enable tci tcg-interpreter) \
 		$(use_enable tls vnc-tls) \
 		$(use_enable usbredir usb-redir) \
@@ -289,12 +289,6 @@ src_configure() {
 		${conf_opts} \
 		|| die "configure failed"
 
-		# this is for qemu upstream's threaded support which is
-		# in development and broken
-		# the kvm project has its own support for threaded IO
-		# which is always on and works
-		# --enable-io-thread \
-
 		# FreeBSD's kernel does not support QEMU assigning/grabbing
 		# host USB devices yet
 		use kernel_FreeBSD && \