app-emulation/ganeti: now with QEMU Guest Agent support (merged upstream for 2.16, not yet released).

Package-Manager: portage-2.3.2

7 files changed, 734 insertions, 2 deletions

diff --git a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
new file mode 100644
index 000000000000..460636fa6340
--- /dev/null
+++ b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
@@ -0,0 +1,122 @@
+From c3697936405ed8c95b674a7d412886e364306f5f Mon Sep 17 00:00:00 2001
+Message-Id: <c3697936405ed8c95b674a7d412886e364306f5f.1483650125.git.robbat2@gentoo.org>
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Thu, 29 Sep 2016 08:57:28 -0700
+Subject: [PATCH-2.15] kvm: use_guest_agent: QEMU Guest Agent support
+
+Implement the QEMU Guest Agent sockets, so that code/scripts on the
+hypervisors can communicate with guest operating systems easily.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ lib/hypervisor/hv_kvm/__init__.py | 23 +++++++++++++++++++++++
+ man/gnt-instance.rst              |  7 +++++++
+ src/Ganeti/Constants.hs           |  5 +++++
+ 3 files changed, 35 insertions(+)
+
+diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
+index cd29baa38..89bc18b85 100644
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -351,6 +351,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     constants.HV_MIGRATION_BANDWIDTH: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+     constants.HV_MIGRATION_DOWNTIME: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+     constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
++    constants.HV_USE_GUEST_AGENT: hv_base.NO_CHECK,
+     constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
+     constants.HV_DISK_CACHE:
+       hv_base.ParamInSet(True, constants.HT_VALID_CACHE_TYPES),
+@@ -581,6 +582,13 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     """
+     return utils.PathJoin(cls._CTRL_DIR, "%s.qmp" % instance_name)
+ 
++  @classmethod
++  def _InstanceQemuGuestAgentMonitor(cls, instance_name):
++    """Returns the instance serial QEMU Guest Agent socket name
++
++    """
++    return utils.PathJoin(cls._CTRL_DIR, "%s.qga" % instance_name)
++
+   @classmethod
+   def _InstanceKvmdMonitor(cls, instance_name):
+     """Returns the instance kvm daemon socket name
+@@ -667,6 +675,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     utils.RemoveFile(cls._InstanceMonitor(instance_name))
+     utils.RemoveFile(cls._InstanceSerial(instance_name))
+     utils.RemoveFile(cls._InstanceQmpMonitor(instance_name))
++    utils.RemoveFile(cls._InstanceQemuGuestAgentMonitor(instance_name))
+     utils.RemoveFile(cls._InstanceKVMRuntime(instance_name))
+     utils.RemoveFile(cls._InstanceKeymapFile(instance_name))
+     uid_file = cls._InstanceUidFile(instance_name)
+@@ -1376,6 +1385,20 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     if self._UUID_RE.search(kvmhelp):
+       kvm_cmd.extend(["-uuid", instance.uuid])
+ 
++    # Add guest agent socket
++    if hvp[constants.HV_USE_GUEST_AGENT]:
++      qga_addr = utils.GetFreeSlot(pci_reservations, reserve=True)
++      qga_pci_info = "bus=%s,addr=%s" % ('pci.0', hex(qga_addr))
++      qga_path = self._InstanceQemuGuestAgentMonitor(instance.name)
++      logging.info("KVM: Guest Agent available at %s", qga_path)
++      # The 'qga0' identified can change, but the 'org.qemu.guest_agent.0' string is
++      # the default expected by the Guest Agent.
++      kvm_cmd.extend([
++        "-chardev", "socket,path=%s,server,nowait,id=qga0" % qga_path,
++        "-device", "virtio-serial,id=qga0,%s" % qga_pci_info,
++        "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0",
++        ])
++
+     if hvp[constants.HV_KVM_EXTRA]:
+       kvm_cmd.extend(hvp[constants.HV_KVM_EXTRA].split(" "))
+ 
+diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
+index a29fd7972..433b1f3b1 100644
+--- a/man/gnt-instance.rst
++++ b/man/gnt-instance.rst
+@@ -526,6 +526,13 @@ viridian
+     viridian (Hyper-V) for this instance. The default is false,
+     disabling viridian support.
+ 
++use\_guest\_agent
++    Valid for the KVM hypervisor.
++
++    A boolean option that specifies if the hypervisor should enable
++    the QEMU Guest Agent protocol for this instance. By default, the
++    Guest Agent is disabled.
++
+ use\_localtime
+     Valid for the Xen HVM and KVM hypervisors.
+ 
+diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
+index 09783d4bf..cf5421946 100644
+--- a/src/Ganeti/Constants.hs
++++ b/src/Ganeti/Constants.hs
+@@ -1806,6 +1806,9 @@ hvUsbMouse = "usb_mouse"
+ hvUseBootloader :: String
+ hvUseBootloader = "use_bootloader"
+ 
++hvUseGuestAgent :: String
++hvUseGuestAgent = "use_guest_agent"
++
+ hvUseLocaltime :: String
+ hvUseLocaltime = "use_localtime"
+ 
+@@ -1938,6 +1941,7 @@ hvsParameterTypes = Map.fromList
+   , (hvUsbDevices,                      VTypeString)
+   , (hvUsbMouse,                        VTypeString)
+   , (hvUseBootloader,                   VTypeBool)
++  , (hvUseGuestAgent,                   VTypeBool)
+   , (hvUseLocaltime,                    VTypeBool)
+   , (hvVga,                             VTypeString)
+   , (hvVhostNet,                        VTypeBool)
+@@ -3996,6 +4000,7 @@ hvcDefaults =
+           , (hvMigrationBandwidth,              PyValueEx (32 :: Int))
+           , (hvMigrationDowntime,               PyValueEx (30 :: Int))
+           , (hvMigrationMode,                   PyValueEx htMigrationLive)
++          , (hvUseGuestAgent,                   PyValueEx False)
+           , (hvUseLocaltime,                    PyValueEx False)
+           , (hvDiskCache,                       PyValueEx htCacheDefault)
+           , (hvSecurityModel,                   PyValueEx htSmNone)
+-- 
+2.11.0.rc2
+
diff --git a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch
new file mode 100644
index 000000000000..6bca593a08d6
--- /dev/null
+++ b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch
@@ -0,0 +1,122 @@
+From 16a08ecb268062a2634dbfc081b4729cb749b7b4 Mon Sep 17 00:00:00 2001
+Message-Id: <16a08ecb268062a2634dbfc081b4729cb749b7b4.1483650125.git.robbat2@gentoo.org>
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Thu, 29 Sep 2016 08:57:28 -0700
+Subject: [PATCH-2.16] kvm: use_guest_agent: QEMU Guest Agent support
+
+Implement the QEMU Guest Agent sockets, so that code/scripts on the
+hypervisors can communicate with guest operating systems easily.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ lib/hypervisor/hv_kvm/__init__.py | 23 +++++++++++++++++++++++
+ man/gnt-instance.rst              |  7 +++++++
+ src/Ganeti/Constants.hs           |  5 +++++
+ 3 files changed, 35 insertions(+)
+
+diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
+index ac02ff56c..b865d6f3a 100644
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -497,6 +497,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     constants.HV_MIGRATION_BANDWIDTH: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+     constants.HV_MIGRATION_DOWNTIME: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+     constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
++    constants.HV_USE_GUEST_AGENT: hv_base.NO_CHECK,
+     constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
+     constants.HV_DISK_CACHE:
+       hv_base.ParamInSet(True, constants.HT_VALID_CACHE_TYPES),
+@@ -750,6 +751,13 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     """
+     return utils.PathJoin(cls._CTRL_DIR, "%s.qmp" % instance_name)
+ 
++  @classmethod
++  def _InstanceQemuGuestAgentMonitor(cls, instance_name):
++    """Returns the instance serial QEMU Guest Agent socket name
++
++    """
++    return utils.PathJoin(cls._CTRL_DIR, "%s.qga" % instance_name)
++
+   @classmethod
+   def _InstanceKvmdMonitor(cls, instance_name):
+     """Returns the instance kvm daemon socket name
+@@ -836,6 +844,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     utils.RemoveFile(cls._InstanceMonitor(instance_name))
+     utils.RemoveFile(cls._InstanceSerial(instance_name))
+     utils.RemoveFile(cls._InstanceQmpMonitor(instance_name))
++    utils.RemoveFile(cls._InstanceQemuGuestAgentMonitor(instance_name))
+     utils.RemoveFile(cls._InstanceKVMRuntime(instance_name))
+     utils.RemoveFile(cls._InstanceKeymapFile(instance_name))
+     uid_file = cls._InstanceUidFile(instance_name)
+@@ -1544,6 +1553,20 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     if self._UUID_RE.search(kvmhelp):
+       kvm_cmd.extend(["-uuid", instance.uuid])
+ 
++    # Add guest agent socket
++    if hvp[constants.HV_USE_GUEST_AGENT]:
++      qga_addr = utils.GetFreeSlot(bus_slots[_PCI_BUS], reserve=True)
++      qga_pci_info = "bus=%s,addr=%s" % (_PCI_BUS, hex(qga_addr))
++      qga_path = self._InstanceQemuGuestAgentMonitor(instance.name)
++      logging.info("KVM: Guest Agent available at %s", qga_path)
++      # The 'qga0' identified can change, but the 'org.qemu.guest_agent.0' string is
++      # the default expected by the Guest Agent.
++      kvm_cmd.extend([
++        "-chardev", "socket,path=%s,server,nowait,id=qga0" % qga_path,
++        "-device", "virtio-serial,id=qga0,%s" % qga_pci_info,
++        "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0",
++        ])
++
+     if hvp[constants.HV_KVM_EXTRA]:
+       kvm_cmd.extend(hvp[constants.HV_KVM_EXTRA].split(" "))
+ 
+diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
+index 283392cc8..493ae929d 100644
+--- a/man/gnt-instance.rst
++++ b/man/gnt-instance.rst
+@@ -545,6 +545,13 @@ viridian
+     viridian (Hyper-V) for this instance. The default is false,
+     disabling viridian support.
+ 
++use\_guest\_agent
++    Valid for the KVM hypervisor.
++
++    A boolean option that specifies if the hypervisor should enable
++    the QEMU Guest Agent protocol for this instance. By default, the
++    Guest Agent is disabled.
++
+ use\_localtime
+     Valid for the Xen HVM and KVM hypervisors.
+ 
+diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
+index 420ccb6cd..4aa5edf63 100644
+--- a/src/Ganeti/Constants.hs
++++ b/src/Ganeti/Constants.hs
+@@ -1814,6 +1814,9 @@ hvUsbMouse = "usb_mouse"
+ hvUseBootloader :: String
+ hvUseBootloader = "use_bootloader"
+ 
++hvUseGuestAgent :: String
++hvUseGuestAgent = "use_guest_agent"
++
+ hvUseLocaltime :: String
+ hvUseLocaltime = "use_localtime"
+ 
+@@ -1948,6 +1951,7 @@ hvsParameterTypes = Map.fromList
+   , (hvUsbDevices,                      VTypeString)
+   , (hvUsbMouse,                        VTypeString)
+   , (hvUseBootloader,                   VTypeBool)
++  , (hvUseGuestAgent,                   VTypeBool)
+   , (hvUseLocaltime,                    VTypeBool)
+   , (hvVga,                             VTypeString)
+   , (hvVhostNet,                        VTypeBool)
+@@ -4099,6 +4103,7 @@ hvcDefaults =
+           , (hvMigrationBandwidth,              PyValueEx (32 :: Int))
+           , (hvMigrationDowntime,               PyValueEx (30 :: Int))
+           , (hvMigrationMode,                   PyValueEx htMigrationLive)
++          , (hvUseGuestAgent,                   PyValueEx False)
+           , (hvUseLocaltime,                    PyValueEx False)
+           , (hvDiskCache,                       PyValueEx htCacheDefault)
+           , (hvSecurityModel,                   PyValueEx htSmNone)
+-- 
+2.11.0.rc2
+
diff --git a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch
new file mode 100644
index 000000000000..f7a664fa776d
--- /dev/null
+++ b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch
@@ -0,0 +1,122 @@
+From e91ae73f593115dba1f77af6a3af30cf2219f880 Mon Sep 17 00:00:00 2001
+Message-Id: <e91ae73f593115dba1f77af6a3af30cf2219f880.1483650125.git.robbat2@gentoo.org>
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Thu, 29 Sep 2016 08:57:28 -0700
+Subject: [PATCH-2.17] kvm: use_guest_agent: QEMU Guest Agent support
+
+Implement the QEMU Guest Agent sockets, so that code/scripts on the
+hypervisors can communicate with guest operating systems easily.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ lib/hypervisor/hv_kvm/__init__.py | 23 +++++++++++++++++++++++
+ man/gnt-instance.rst              |  7 +++++++
+ src/Ganeti/Constants.hs           |  5 +++++
+ 3 files changed, 35 insertions(+)
+
+diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
+index ac02ff56c..b865d6f3a 100644
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -497,6 +497,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     constants.HV_MIGRATION_BANDWIDTH: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+     constants.HV_MIGRATION_DOWNTIME: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+     constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
++    constants.HV_USE_GUEST_AGENT: hv_base.NO_CHECK,
+     constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
+     constants.HV_DISK_CACHE:
+       hv_base.ParamInSet(True, constants.HT_VALID_CACHE_TYPES),
+@@ -750,6 +751,13 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     """
+     return utils.PathJoin(cls._CTRL_DIR, "%s.qmp" % instance_name)
+ 
++  @classmethod
++  def _InstanceQemuGuestAgentMonitor(cls, instance_name):
++    """Returns the instance serial QEMU Guest Agent socket name
++
++    """
++    return utils.PathJoin(cls._CTRL_DIR, "%s.qga" % instance_name)
++
+   @classmethod
+   def _InstanceKvmdMonitor(cls, instance_name):
+     """Returns the instance kvm daemon socket name
+@@ -836,6 +844,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     utils.RemoveFile(cls._InstanceMonitor(instance_name))
+     utils.RemoveFile(cls._InstanceSerial(instance_name))
+     utils.RemoveFile(cls._InstanceQmpMonitor(instance_name))
++    utils.RemoveFile(cls._InstanceQemuGuestAgentMonitor(instance_name))
+     utils.RemoveFile(cls._InstanceKVMRuntime(instance_name))
+     utils.RemoveFile(cls._InstanceKeymapFile(instance_name))
+     uid_file = cls._InstanceUidFile(instance_name)
+@@ -1544,6 +1553,20 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     if self._UUID_RE.search(kvmhelp):
+       kvm_cmd.extend(["-uuid", instance.uuid])
+ 
++    # Add guest agent socket
++    if hvp[constants.HV_USE_GUEST_AGENT]:
++      qga_addr = utils.GetFreeSlot(bus_slots[_PCI_BUS], reserve=True)
++      qga_pci_info = "bus=%s,addr=%s" % (_PCI_BUS, hex(qga_addr))
++      qga_path = self._InstanceQemuGuestAgentMonitor(instance.name)
++      logging.info("KVM: Guest Agent available at %s", qga_path)
++      # The 'qga0' identified can change, but the 'org.qemu.guest_agent.0' string is
++      # the default expected by the Guest Agent.
++      kvm_cmd.extend([
++        "-chardev", "socket,path=%s,server,nowait,id=qga0" % qga_path,
++        "-device", "virtio-serial,id=qga0,%s" % qga_pci_info,
++        "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0",
++        ])
++
+     if hvp[constants.HV_KVM_EXTRA]:
+       kvm_cmd.extend(hvp[constants.HV_KVM_EXTRA].split(" "))
+ 
+diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
+index 283392cc8..493ae929d 100644
+--- a/man/gnt-instance.rst
++++ b/man/gnt-instance.rst
+@@ -545,6 +545,13 @@ viridian
+     viridian (Hyper-V) for this instance. The default is false,
+     disabling viridian support.
+ 
++use\_guest\_agent
++    Valid for the KVM hypervisor.
++
++    A boolean option that specifies if the hypervisor should enable
++    the QEMU Guest Agent protocol for this instance. By default, the
++    Guest Agent is disabled.
++
+ use\_localtime
+     Valid for the Xen HVM and KVM hypervisors.
+ 
+diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
+index 13bff2e71..7f43f89f9 100644
+--- a/src/Ganeti/Constants.hs
++++ b/src/Ganeti/Constants.hs
+@@ -1821,6 +1821,9 @@ hvUsbMouse = "usb_mouse"
+ hvUseBootloader :: String
+ hvUseBootloader = "use_bootloader"
+ 
++hvUseGuestAgent :: String
++hvUseGuestAgent = "use_guest_agent"
++
+ hvUseLocaltime :: String
+ hvUseLocaltime = "use_localtime"
+ 
+@@ -1955,6 +1958,7 @@ hvsParameterTypes = Map.fromList
+   , (hvUsbDevices,                      VTypeString)
+   , (hvUsbMouse,                        VTypeString)
+   , (hvUseBootloader,                   VTypeBool)
++  , (hvUseGuestAgent,                   VTypeBool)
+   , (hvUseLocaltime,                    VTypeBool)
+   , (hvVga,                             VTypeString)
+   , (hvVhostNet,                        VTypeBool)
+@@ -4111,6 +4115,7 @@ hvcDefaults =
+           , (hvMigrationBandwidth,              PyValueEx (32 :: Int))
+           , (hvMigrationDowntime,               PyValueEx (30 :: Int))
+           , (hvMigrationMode,                   PyValueEx htMigrationLive)
++          , (hvUseGuestAgent,                   PyValueEx False)
+           , (hvUseLocaltime,                    PyValueEx False)
+           , (hvDiskCache,                       PyValueEx htCacheDefault)
+           , (hvSecurityModel,                   PyValueEx htSmNone)
+-- 
+2.11.0.rc2
+
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
new file mode 100644
index 000000000000..f87f125cb4b3
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+	inherit git-2
+	KEYWORDS=""
+	PATCHES=()
+else
+	DEBIAN_PATCH=4
+	SRC_URI="
+	  http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+	  mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+	"
+	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+	  "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+	  "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+	  "${WORKDIR}"/debian/patches/relax-deps
+	  "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+	  "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+	  "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+	)
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+	test? ( ipv6 )
+	kvm? ( || ( amd64 x86 ) )
+	${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+	dev-libs/openssl:0
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/bitarray[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/fdsend[${PYTHON_USEDEP}]
+	net-analyzer/arping
+	net-analyzer/fping
+	net-misc/bridge-utils
+	net-misc/curl[ssl]
+	net-misc/openssh
+	net-misc/socat
+	sys-apps/iproute2
+	sys-fs/lvm2
+	>=sys-apps/baselayout-2.0
+	dev-lang/ghc:0=
+	dev-haskell/cabal:0=
+	dev-haskell/cabal-install:0=
+	>=dev-haskell/mtl-2.1.1:0=
+	>=dev-haskell/old-time-1.1.0.0:0=
+	>=dev-haskell/random-1.0.1.1:0=
+	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+	>=dev-haskell/transformers-0.3.0.0:0=
+
+	>=dev-haskell/attoparsec-0.10.1.1:0=
+	<dev-haskell/attoparsec-0.14:0
+	>=dev-haskell/base64-bytestring-1.0.0.1:0=
+	<dev-haskell/base64-bytestring-1.1:0=
+	>=dev-haskell/crypto-4.2.4:0=
+	<dev-haskell/crypto-4.3:0=
+	>=dev-haskell/curl-1.3.7:0=
+	<dev-haskell/curl-1.4:0=
+	>=dev-haskell/hinotify-0.3.2:0=
+	<dev-haskell/hinotify-0.4:0=
+	>=dev-haskell/hslogger-1.1.4:0=
+	<dev-haskell/hslogger-1.3:0=
+	>=dev-haskell/json-0.5:0=
+	>=dev-haskell/lens-3.10:0=
+	>=dev-haskell/lifted-base-0.2.0.3:0=
+	<dev-haskell/lifted-base-0.3:0=
+	>=dev-haskell/monad-control-0.3.1.3:0=
+	<dev-haskell/monad-control-1.1:0=
+	>=dev-haskell/network-2.3.0.13:0=
+	<dev-haskell/network-2.7:0=
+	>=dev-haskell/parallel-3.2.0.2:3=
+	<dev-haskell/parallel-3.3:3=
+	>=dev-haskell/temporary-1.1.2.3:0=
+	<dev-haskell/temporary-1.3:0=
+	>=dev-haskell/regex-pcre-0.94.2:0=
+	<dev-haskell/regex-pcre-0.95:0=
+	>=dev-haskell/transformers-base-0.4.1:0=
+	<dev-haskell/transformers-base-0.5:0=
+	>=dev-haskell/utf8-string-0.3.7:0=
+	>=dev-haskell/zlib-0.5.3.3:0=
+	<dev-haskell/zlib-0.7:0=
+
+	>=dev-haskell/psqueue-1.1:0=
+	<dev-haskell/psqueue-1.2:0=
+	>=dev-haskell/snap-core-0.8.1:0=
+	<dev-haskell/snap-core-0.10:0=
+	>=dev-haskell/snap-server-0.8.1:0=
+	<dev-haskell/snap-server-0.10:0=
+	>=dev-haskell/case-insensitive-0.4.0.1
+
+	dev-haskell/vector:0=
+	xen? ( >=app-emulation/xen-3.0 )
+	kvm? (
+		dev-python/psutil
+		app-emulation/qemu
+	)
+	lxc? ( app-emulation/lxc )
+	drbd? (
+		|| (
+			<sys-cluster/drbd-8.5
+			sys-cluster/drbd-utils
+		)
+	)
+	rbd? ( sys-cluster/ceph )
+	ipv6? ( net-misc/ndisc6 )
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+DEPEND+="
+	sys-devel/m4
+	app-text/pandoc
+	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+	media-fonts/urw-fonts
+	media-gfx/graphviz
+	>=dev-haskell/test-framework-0.6:0=
+	<dev-haskell/test-framework-0.9:0=
+	>=dev-haskell/test-framework-hunit-0.2.7:0=
+	<dev-haskell/test-framework-hunit-0.4:0=
+	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+	<dev-haskell/test-framework-quickcheck2-0.4:0=
+	test? (
+		dev-python/mock
+		dev-python/pyyaml
+		dev-haskell/haddock:0=
+		>=dev-haskell/hunit-1.2.4.2:0=
+		<dev-haskell/hunit-1.3:0=
+		>=dev-haskell/quickcheck-2.4.2:2=
+		<dev-haskell/quickcheck-2.8.3:2=
+		sys-apps/fakeroot
+		>=net-misc/socat-1.7
+		dev-util/shelltestrunner
+	)"
+
+PATCHES+=(
+	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
+	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+	"${FILESDIR}/${PN}-2.10-rundir.patch"
+	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+	"${FILESDIR}/${PN}-2.11-tests.patch"
+	"${FILESDIR}/${PN}-lockdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
+	"${FILESDIR}/${PN}-2.15-python-mock.patch"
+	"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+	"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
+	"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
+	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+	usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+	local user
+	python-single-r1_pkg_setup
+
+	if use multiple-users; then
+		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+			enewgroup ${user}
+			enewuser ${user} -1 -1 -1 ${user}
+		done
+	fi
+}
+
+src_prepare() {
+	local testfile
+	if has_version '>=dev-lang/ghc-7.10'; then
+		# Breaks the build on 7.8
+		PATCHES+=(
+			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+		)
+	fi
+	if use experimental; then
+		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+		PATCHES+=(
+			# QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+			# backport available for 2.15, but refused upstream due to RPC breakage.
+			"${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
+		)
+	fi
+	eapply "${PATCHES[@]}"
+	# Upstream commits:
+	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+	# 24618882737fd7c189adf99f4acc767d48f572c3
+	sed -i \
+		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+		cabal/ganeti.template.cabal
+	# Neuter -Werror
+	sed -i \
+		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+		Makefile.am
+
+	# not sure why these tests are failing
+	# should remove this on next version bump if possible
+	for testfile in test/py/import-export_unittest.bash; do
+		printf '#!/bin/bash\ntrue\n' > "${testfile}"
+	done
+
+	# take the sledgehammer approach to bug #526270
+	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+	eapply_user
+
+	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+	rm autotools/missing
+	eautoreconf
+}
+
+src_configure () {
+	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
+	local kvm_arch
+
+	if use amd64; then
+		kvm_arch=x86_64
+	elif use x86; then
+		kvm_arch=i386
+	elif use kvm; then
+		die "Could not determine qemu system to use for kvm"
+	fi
+
+	econf --localstatedir=/var \
+		--sharedstatedir=/var \
+		--disable-symlinks \
+		--with-ssh-initscript=/etc/init.d/sshd \
+		--with-export-dir=/var/lib/ganeti-storage/export \
+		--with-os-search-path=/usr/share/${PN}/os \
+		$(use_enable restricted-commands) \
+		$(use_enable test haskell-tests) \
+		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+		$(use_enable syslog) \
+		$(use_enable monitoring) \
+		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+		--enable-socat-escape \
+		--enable-socat-compress
+}
+
+src_install () {
+	emake V=1 DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+	if use kvm; then
+		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+	fi
+
+	# ganeti installs it's own docs in a generic location
+	rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+	newbashcomp doc/examples/bash_completion gnt-instance
+	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+	use monitoring && bashcomp_alias gnt-instance mon-collector
+
+	dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+	docinto html
+	dodoc -r doc/html/* doc/css/*.css
+
+	docinto examples
+	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+	docinto examples/hooks
+	dodoc doc/examples/hooks/{ipsec,ethers}
+
+	insinto /etc/cron.d
+	newins doc/examples/ganeti.cron ${PN}
+
+	insinto /etc/logrotate.d
+	newins doc/examples/ganeti.logrotate ${PN}
+
+	# need to dodir rather than keepdir here (bug #552482)
+	dodir /var/lib/${PN}
+
+	keepdir /var/log/${PN}/
+	keepdir /usr/share/${PN}/${SERIES}/os/
+	keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+	dosym ${SERIES} "/usr/share/${PN}/default"
+	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+	if use multiple-users; then
+		elog "You have enable multiple user support, the users for this must"
+		elog "be created. You can use the provided tool for this, which is"
+		elog "located at:"
+		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
+	fi
+}
+
+src_test () {
+	PATH="${S}/scripts:${S}/src:${PATH}" \
+		TMPDIR="/tmp" \
+		GANETI_MASTER="$(hostname -f)" \
+		emake check || die "emake check failed"
+}
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index a9398190d8c6..ebe1bac01098 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="http://www.ganeti.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
 
 REQUIRED_USE="|| ( kvm xen lxc )
 	test? ( ipv6 )
@@ -213,6 +213,14 @@ src_prepare() {
 			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
 		)
 	fi
+	if use experimental; then
+		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+		PATCHES+=(
+			# QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+			# backport available for 2.15, but refused upstream due to RPC breakage.
+			"${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch
+		)
+	fi
 	eapply "${PATCHES[@]}"
 	# Upstream commits:
 	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index 85001c9d0638..829a788e570c 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="http://www.ganeti.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
 
 REQUIRED_USE="|| ( kvm xen lxc )
 	test? ( ipv6 )
@@ -214,6 +214,14 @@ src_prepare() {
 			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
 		)
 	fi
+	if use experimental; then
+		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+		PATCHES+=(
+			# QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+			# backport available for 2.15, but refused upstream due to RPC breakage.
+			"${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch
+		)
+	fi
 	eapply "${PATCHES[@]}"
 	# Upstream commits:
 	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index 2693e91dd293..d591fbcc6e46 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -34,5 +34,6 @@
 		<flag name="restricted-commands">Enable restricted commands in the node daemon</flag>
 		<flag name="rbd">Enable rados block device support via sys-cluster/ceph</flag>
 		<flag name="xen">Enable Xen support</flag>
+		<flag name="experimental">Enable experimental patches. Warning! This will break RPC within major versions if the patches applied differ!</flag>
 	</use>
 </pkgmetadata>