NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

support: Remove negative version handling

Browse Source 
We can do it in other ways
This commit is contained in:
Cole Robinson 2014-02-10 16:14:39 -05:00
parent 96bbfebe5b
commit 19a72a4881
3 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
virtinst/guest.py
View File

@ -743,8 +743,7 @@ class Guest(XMLBuilder):
default = True
if (self._lookup_osdict_key("xen_disable_acpi", False) and
self.conn.check_support(
support.SUPPORT_CONN_SKIP_DEFAULT_ACPI)):
not self.conn.check_support(support.SUPPORT_CONN_CAN_ACPI)):
default = False
if self.features.acpi == "default":

2
virtinst/osdict.py
View File

@ -141,7 +141,7 @@ class _OSVariant(object):
@virtioconsole: If True, this OS supports virtio-console out of the box,
and we should use it as the default console.
@xen_disable_acpi: If True, disable acpi/apic for this OS if on old xen.
This corresponds with the SUPPORT_CONN_SKIP_DEFAULT_ACPI check
This corresponds with the SUPPORT_CONN_CAN_DEFAULT_ACPI check
@qemu_ga: If True, this distro has qemu_ga available by default
The rest of the parameters are about setting device/guest defaults

33
virtinst/support.py
View File

@ -102,6 +102,8 @@ class _SupportCheck(object):
@drv_version: A list of tuples of the form
(driver name (e.g qemu, xen, lxc), minimum supported version)
If a hypervisor is not listed, it is assumed to be NOT SUPPORTED.
If the special value 'all' is a key, assume any driver not listed
is explicitly supported.
@drv_libvirt_version: List of tuples, similar to drv_version, but
the version number is minimum supported _libvirt_ version
"""
@ -171,35 +173,18 @@ class _SupportCheck(object):
if minimum_libvirt_version > actual_lib_ver:
return False
# If driver specific version info specified, try to verify
if self.drv_version:
if drv_type not in self.drv_version:
return False
min_drv_ver = self.drv_version[drv_type]
found = False
if min_drv_ver < 0:
if actual_drv_ver <= -min_drv_ver:
found = True
else:
if actual_drv_ver >= min_drv_ver:
found = True
if not found:
if "all" not in self.drv_version:
return False
elif actual_drv_ver < self.drv_version[drv_type]:
return False
if self.drv_libvirt_version:
if drv_type not in self.drv_libvirt_version:
return False
min_lib_ver = self.drv_libvirt_version[drv_type]
found = False
if min_lib_ver < 0:
if actual_lib_ver <= -min_lib_ver:
found = True
else:
if actual_lib_ver >= min_lib_ver:
found = True
if not found:
if "all" not in self.drv_version:
return False
elif actual_lib_ver < self.drv_libvirt_version[drv_type]:
return False
return True
@ -256,7 +241,7 @@ SUPPORT_CONN_DEFAULT_QCOW2 = _make(version=8000,
drv_version={"qemu": 1002000, "test": 0})
SUPPORT_CONN_DEFAULT_USB2 = _make(version=9007,
drv_version={"qemu": 1000000, "test": 0})
SUPPORT_CONN_SKIP_DEFAULT_ACPI = _make(drv_version={"xen": -3001000})
SUPPORT_CONN_CAN_ACPI = _make(drv_version={"xen": 3001000, "all": 0})
SUPPORT_CONN_SOUND_AC97 = _make(version=6000, force_version=True,
drv_version={"qemu": 11000})
SUPPORT_CONN_SOUND_ICH6 = _make(version=8008, drv_version={"qemu": 14000})