openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Drop all references to xenner, it's long dead

This commit is contained in:
Cole Robinson 2015-04-03 16:25:57 -04:00
parent 45ae269950
commit f5b13a6e19
3 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/capabilities.py
View File

@ -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")

5
virtManager/connection.py
View File

@ -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":

14
virtinst/capabilities.py
View File

@ -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.