Change in vdsm[master]: caps: drop dead code

fromani at redhat.com fromani at redhat.com
Tue Apr 5 10:37:36 UTC 2016


Francesco Romani has uploaded a new change for review.

Change subject: caps: drop dead code
......................................................................

caps: drop dead code

We don't support RHEL6 anymore, and we depend anyway
on libvirt >= 1.2.1x so we don't need this code anymore.

Change-Id: I24059e5f27664de71690a5a9c20349fa02652ffa
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M vdsm/caps.py
1 file changed, 1 insertion(+), 17 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/55683/1

diff --git a/vdsm/caps.py b/vdsm/caps.py
index 85a4b9d..66eb245 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -23,7 +23,6 @@
 import os
 import logging
 import xml.etree.ElementTree as ET
-from distutils.version import LooseVersion
 
 import libvirt
 
@@ -188,22 +187,7 @@
                               config.getint('vars', 'extra_mem_reserve'))
     caps['guestOverhead'] = config.get('vars', 'guest_ram_overhead')
 
-    # Verify that our libvirt supports virtio RNG (since 10.0.2-31)
-    requiredVer = LooseVersion('0.10.2-31')
-    if 'libvirt' not in caps['packages2']:
-        libvirtVer = None
-    else:
-        libvirtVer = LooseVersion(
-            '-'.join((caps['packages2']['libvirt']['version'],
-                      caps['packages2']['libvirt']['release'])))
-
-    if libvirtVer is None:
-        logging.debug('VirtioRNG DISABLED: unknown libvirt version')
-    elif libvirtVer < requiredVer:
-        logging.debug('VirtioRNG DISABLED: libvirt version %s required >= %s',
-                      libvirtVer, requiredVer)
-    else:
-        caps['rngSources'] = vmdevices.core.Rng.available_sources()
+    caps['rngSources'] = vmdevices.core.Rng.available_sources()
 
     caps['numaNodes'] = dict(numa.topology())
     caps['numaNodeDistance'] = dict(numa.distances())


-- 
To view, visit https://gerrit.ovirt.org/55683
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24059e5f27664de71690a5a9c20349fa02652ffa
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>


More information about the vdsm-patches mailing list