mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-02-25 18:55:27 -06:00
Rip out all support for local RHEL6 version checks
These bits only apply if virt-manager is running directly on a RHEL6. Since latest virt-manager can't do that thanks to GTK3 conversion, just drop it all.
This commit is contained in:
parent
34f23165b6
commit
0366589812
@ -45,6 +45,6 @@
|
|||||||
<input type="tablet" bus="usb"/>
|
<input type="tablet" bus="usb"/>
|
||||||
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
|
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
|
||||||
<console type="pty"/>
|
<console type="pty"/>
|
||||||
<sound model="ich6"/>
|
<sound model="ac97"/>
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -282,7 +282,6 @@ class Guest(XMLBuilder):
|
|||||||
self._propstore["_devices"] = [dev.copy() for dev in self._devices]
|
self._propstore["_devices"] = [dev.copy() for dev in self._devices]
|
||||||
self._propstore["features"] = self.features.copy()
|
self._propstore["features"] = self.features.copy()
|
||||||
self._propstore["os"] = self.os.copy()
|
self._propstore["os"] = self.os.copy()
|
||||||
support.set_rhel6(self._is_rhel6())
|
|
||||||
except:
|
except:
|
||||||
self._finish_get_xml(data)
|
self._finish_get_xml(data)
|
||||||
raise
|
raise
|
||||||
@ -292,7 +291,6 @@ class Guest(XMLBuilder):
|
|||||||
(self._propstore["_devices"],
|
(self._propstore["_devices"],
|
||||||
self._propstore["features"],
|
self._propstore["features"],
|
||||||
self._propstore["os"]) = data
|
self._propstore["os"]) = data
|
||||||
support.set_rhel6(False)
|
|
||||||
|
|
||||||
def get_install_xml(self, *args, **kwargs):
|
def get_install_xml(self, *args, **kwargs):
|
||||||
data = self._prepare_get_xml()
|
data = self._prepare_get_xml()
|
||||||
@ -492,12 +490,6 @@ class Guest(XMLBuilder):
|
|||||||
# Guest Dictionary Helper methods #
|
# Guest Dictionary Helper methods #
|
||||||
###################################
|
###################################
|
||||||
|
|
||||||
def _is_rhel6(self):
|
|
||||||
emulator = self.emulator or ""
|
|
||||||
|
|
||||||
return (self.type in ["qemu", "kvm"] and
|
|
||||||
emulator.startswith("/usr/libexec/qemu"))
|
|
||||||
|
|
||||||
def _lookup_osdict_key(self, key, default):
|
def _lookup_osdict_key(self, key, default):
|
||||||
"""
|
"""
|
||||||
Use self.os_variant to find key in OSTYPES
|
Use self.os_variant to find key in OSTYPES
|
||||||
|
@ -24,21 +24,6 @@ import libvirt
|
|||||||
from virtinst import util
|
from virtinst import util
|
||||||
|
|
||||||
|
|
||||||
# RHEL6 has lots of feature backports, and since libvirt doesn't
|
|
||||||
# really offer any XML feature introspection, we have to use hacks to
|
|
||||||
# make sure we aren't generating bogus config on non RHEL
|
|
||||||
_rhel6 = False
|
|
||||||
|
|
||||||
|
|
||||||
def set_rhel6(val):
|
|
||||||
global _rhel6
|
|
||||||
_rhel6 = bool(val)
|
|
||||||
|
|
||||||
|
|
||||||
def get_rhel6():
|
|
||||||
return _rhel6
|
|
||||||
|
|
||||||
|
|
||||||
def support_remote_url_install(conn):
|
def support_remote_url_install(conn):
|
||||||
if hasattr(conn, "_virtinst__fake_conn"):
|
if hasattr(conn, "_virtinst__fake_conn"):
|
||||||
return False
|
return False
|
||||||
@ -125,17 +110,11 @@ class _SupportCheck(object):
|
|||||||
If a hypervisor is not listed, it is assumed to be NOT SUPPORTED.
|
If a hypervisor is not listed, it is assumed to be NOT SUPPORTED.
|
||||||
@drv_libvirt_version: List of tuples, similar to drv_version, but
|
@drv_libvirt_version: List of tuples, similar to drv_version, but
|
||||||
the version number is minimum supported _libvirt_ version
|
the version number is minimum supported _libvirt_ version
|
||||||
|
|
||||||
@rhel6_version
|
|
||||||
@rhel6_drv_version: Analog of the above params, but for versions for
|
|
||||||
RHEL6 qemu, and only if virt-manager is configured with the
|
|
||||||
rhel defaults switch
|
|
||||||
"""
|
"""
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
function=None, args=None, flag=None,
|
function=None, args=None, flag=None,
|
||||||
version=None, force_version=None,
|
version=None, force_version=None,
|
||||||
drv_version=None, drv_libvirt_version=None,
|
drv_version=None, drv_libvirt_version=None):
|
||||||
rhel6_drv_version=None, rhel6_version=None):
|
|
||||||
self.function = function
|
self.function = function
|
||||||
self.args = args
|
self.args = args
|
||||||
self.flag = flag
|
self.flag = flag
|
||||||
@ -144,22 +123,10 @@ class _SupportCheck(object):
|
|||||||
self.drv_version = drv_version or []
|
self.drv_version = drv_version or []
|
||||||
self.drv_libvirt_version = drv_libvirt_version or []
|
self.drv_libvirt_version = drv_libvirt_version or []
|
||||||
|
|
||||||
self.rhel6_version = rhel6_version and int(rhel6_version) or 0
|
|
||||||
self.rhel6_drv_version = rhel6_drv_version or []
|
|
||||||
|
|
||||||
def _get_min_lib_version(self):
|
def _get_min_lib_version(self):
|
||||||
ret = self.version
|
return self.version
|
||||||
rhel6_min = self.rhel6_version or ret
|
|
||||||
if get_rhel6():
|
|
||||||
ret = rhel6_min
|
|
||||||
return ret
|
|
||||||
|
|
||||||
def _get_drv_version(self):
|
def _get_drv_version(self):
|
||||||
ret = self.drv_version
|
return self.drv_version
|
||||||
rhel6_drv_version = self.rhel6_drv_version or ret
|
|
||||||
if get_rhel6():
|
|
||||||
ret = rhel6_drv_version
|
|
||||||
return ret
|
|
||||||
|
|
||||||
def check_support(self, conn, data):
|
def check_support(self, conn, data):
|
||||||
minimum_libvirt_version = self._get_min_lib_version()
|
minimum_libvirt_version = self._get_min_lib_version()
|
||||||
@ -314,9 +281,7 @@ SUPPORT_CONN_SOUND_AC97 = _make(version=6000,
|
|||||||
force_version=True,
|
force_version=True,
|
||||||
drv_version=[("qemu", 11000)])
|
drv_version=[("qemu", 11000)])
|
||||||
SUPPORT_CONN_SOUND_ICH6 = _make(version=8008,
|
SUPPORT_CONN_SOUND_ICH6 = _make(version=8008,
|
||||||
drv_version=[("qemu", 14000)],
|
drv_version=[("qemu", 14000)])
|
||||||
rhel6_drv_version=[("qemu", 12001)],
|
|
||||||
rhel6_version=8007)
|
|
||||||
SUPPORT_CONN_GRAPHICS_SPICE = _make(version=8006,
|
SUPPORT_CONN_GRAPHICS_SPICE = _make(version=8006,
|
||||||
drv_version=[("qemu", 14000)])
|
drv_version=[("qemu", 14000)])
|
||||||
SUPPORT_CONN_CHAR_SPICEVMC = _make(version=8008,
|
SUPPORT_CONN_CHAR_SPICEVMC = _make(version=8008,
|
||||||
|
Loading…
Reference in New Issue
Block a user