spice (resp. the QXL graphics device) support has been finally merged at qemu-upstream, added a USE flag for it. Added USE flags to toggle vhost-net support (which requires newer kernel-headers) and rados block device storage backend support.

(Portage version: 2.1.9.31/cvs/Linux x86_64)

3 files changed, 25 insertions, 7 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 88c7fd14aec6..c3c0b532f73d 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.49 2011/01/17 18:56:42 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.50 2011/01/21 13:49:43 dev-zero Exp $
+
+  21 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> qemu-kvm-9999.ebuild,
+  metadata.xml:
+  spice (resp. the QXL graphics device) support has been finally merged at
+  qemu-upstream, added a USE flag for it. Added USE flags to toggle vhost-net
+  support (which requires newer kernel-headers) and rados block device storage
+  backend support.
 
   17 Jan 2011; Jory A. Pratt <anarchy@gentoo.org> qemu-kvm-0.13.0-r1.ebuild,
   qemu-kvm-0.13.0-r2.ebuild, qemu-kvm-9999.ebuild:
diff --git a/app-emulation/qemu-kvm/metadata.xml b/app-emulation/qemu-kvm/metadata.xml
index 958396a7435e..29522f71160f 100644
--- a/app-emulation/qemu-kvm/metadata.xml
+++ b/app-emulation/qemu-kvm/metadata.xml
@@ -14,10 +14,13 @@
     <flag name='png'>Enable PNG compression for the VNC console server</flag>
     <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
     <flag name='qemu-ifup'>Provides the qemu-ifup script for use with QEMU's
-      built in bridging</flag>
-    <flag name='sdl'>Enable the SDL-based console</flag>
+		built in bridging</flag>
+	<flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
+	<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='vde'>Enable VDE-based networking</flag>
+	<flag name='vde'>Enable VDE-based networking</flag>
+	<flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
     <flag name='xen'>Enables support for Xen backends</flag>
 </use>
 </pkgmetadata>
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 2214ec2171c9..d16b49afffbb 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.14 2011/01/17 18:56:42 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.15 2011/01/21 13:49:43 dev-zero Exp $
 
 EAPI="2"
 
@@ -27,7 +27,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # xen is disabled until the deps are fixed
 IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
-png pulseaudio qemu-ifup sasl sdl ssl static vde xen"
+png pulseaudio qemu-ifup rbd sasl sdl ssl spice static vde vhost-net xen"
 
 # Updated targets to use the only supported upstream target - x86_64-softmmu
 COMMON_TARGETS=""
@@ -68,8 +68,10 @@ RDEPEND="
 	png? ( media-libs/libpng )
 	pulseaudio? ( media-sound/pulseaudio )
 	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
+	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	spice? ( app-emulation/spice )
 	ssl? ( net-libs/gnutls )
 	vde? ( net-misc/vde )
 	xen? ( app-emulation/xen )
@@ -77,7 +79,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.29
+	>=sys-kernel/linux-headers-2.6.35
 	ssl? ( dev-util/pkgconfig )
 "
 
@@ -109,6 +111,9 @@ pkg_setup() {
 		elif ! linux_chkconfig_present KVM; then
 			kvm_kern_warn
 		fi
+		if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
+			ewarn "You have to enable CONFIG_VHOST_NET in the kernel to get vhost-net support."
+		fi
 	fi
 
 	enewgroup kvm
@@ -172,10 +177,13 @@ src_configure() {
 	conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
 	conf_opts="${conf_opts} $(use_enable ncurses curses)"
 	conf_opts="${conf_opts} $(use_enable png vnc-png)"
+	conf_opts="${conf_opts} $(use_enable rbd)"
 	conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
 	conf_opts="${conf_opts} $(use_enable sdl)"
 	conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+	conf_opts="${conf_opts} $(use_enable spice)"
 	conf_opts="${conf_opts} $(use_enable vde)"
+	conf_opts="${conf_opts} $(use_enable vhost-net)"
 	conf_opts="${conf_opts} $(use_enable xen)"
 #	conf_opts="${conf_opts} --disable-xen"
 	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"