From f5b13a6e19a2b9189c1f24bc99751621c94c0bc8 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 3 Apr 2015 16:25:57 -0400
Subject: [PATCH] Drop all references to xenner, it's long dead

---
 tests/capabilities.py     | 16 +++++++---------
 virtManager/connection.py |  5 +----
 virtinst/capabilities.py  | 14 --------------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/tests/capabilities.py b/tests/capabilities.py
index 2de8fb26..2f68ddcc 100644
--- a/tests/capabilities.py
+++ b/tests/capabilities.py
@@ -199,20 +199,18 @@ class TestCapabilities(unittest.TestCase):
         rhel_xen_caps = self._buildCaps("rhel5.4-xen-caps.xml")
         rhel_kvm_caps = self._buildCaps("rhel5.4-kvm-caps.xml")
 
-        def test_utils(caps, no_guests, is_hvm, is_kvm, is_bios_disable,
-                       is_xenner):
+        def test_utils(caps, no_guests, is_hvm, is_kvm, is_bios_disable):
             self.assertEquals(caps.no_install_options(), no_guests)
             self.assertEquals(caps.hw_virt_supported(), is_hvm)
             self.assertEquals(caps.is_kvm_available(), is_kvm)
             self.assertEquals(caps.is_bios_virt_disabled(), is_bios_disable)
-            self.assertEquals(caps.is_xenner_available(), is_xenner)
 
-        test_utils(new_caps, False, True, True, False, True)
-        test_utils(empty_caps, True, False, False, False, False)
-        test_utils(rhel_xen_enable_hvm_caps, False, True, False, False, False)
-        test_utils(rhel_xen_caps, False, True, False, True, False)
-        test_utils(rhel_kvm_caps, False, True, True, False, False)
-        test_utils(new_caps_no_kvm, False, True, False, False, False)
+        test_utils(new_caps, False, True, True, False)
+        test_utils(empty_caps, True, False, False, False)
+        test_utils(rhel_xen_enable_hvm_caps, False, True, False, False)
+        test_utils(rhel_xen_caps, False, True, False, True)
+        test_utils(rhel_kvm_caps, False, True, True, False)
+        test_utils(new_caps_no_kvm, False, True, False, False)
 
     def _testCPUMap(self, api):
         caps = self._buildCaps("libvirt-0.7.6-qemu-caps.xml")
diff --git a/virtManager/connection.py b/virtManager/connection.py
index 42a5d735..94886cb4 100644
--- a/virtManager/connection.py
+++ b/virtManager/connection.py
@@ -140,10 +140,7 @@ class vmmConnection(vmmGObject):
         domtype = domtype.lower()
 
         label = domtype
-        if domtype == "kvm":
-            if gtype == "xen":
-                label = "xenner"
-        elif domtype == "xen":
+        if domtype == "xen":
             if gtype == "xen":
                 label = "xen (paravirt)"
             elif gtype == "hvm":
diff --git a/virtinst/capabilities.py b/virtinst/capabilities.py
index ad849748..3311a8eb 100644
--- a/virtinst/capabilities.py
+++ b/virtinst/capabilities.py
@@ -422,20 +422,6 @@ class Capabilities(XMLBuilder):
 
         return False
 
-    def is_xenner_available(self):
-        """
-        Return True if xenner install option is available
-        """
-        for g in self.guests:
-            if g.os_type != "xen":
-                continue
-
-            for d in g.domains:
-                if d.hypervisor_type == "kvm":
-                    return True
-
-        return False
-
     def is_bios_virt_disabled(self):
         """
         Try to determine if fullvirt may be disabled in the bios.