Change in vdsm[master]: caps: use cpuarch module

mpolednik at redhat.com mpolednik at redhat.com
Mon Dec 7 12:26:24 UTC 2015


Martin Polednik has uploaded a new change for review.

Change subject: caps: use cpuarch module
......................................................................

caps: use cpuarch module

With the cpuarch module, some of the code in caps can be rewritten to
use cpuarch directly.

Change-Id: I56ed03765a13b8591d91ef451a8e41578d4324d6
Signed-off-by: Martin Polednik <mpolednik at redhat.com>
---
M vdsm/caps.py
1 file changed, 7 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/49991/1

diff --git a/vdsm/caps.py b/vdsm/caps.py
index 2d22b94..3c60cf5 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -555,13 +555,6 @@
     return dict(release=release, version=version, name=osname)
 
 
-def getTargetArch():
-    if config.getboolean('vars', 'fake_kvm_support'):
-        return config.get('vars', 'fake_kvm_architecture')
-    else:
-        return platform.machine()
-
-
 def _getSELinux():
     selinux = dict()
     selinux['mode'] = str(utils.get_selinux_enforce_mode())
@@ -578,8 +571,6 @@
 
 
 def get():
-    targetArch = getTargetArch()
-
     caps = {}
 
     caps['kvmEnabled'] = \
@@ -598,12 +589,12 @@
     caps['onlineCpus'] = ','.join(cpuTopology.onlineCpus())
     caps['cpuSpeed'] = cpuInfo.mhz()
     if config.getboolean('vars', 'fake_kvm_support'):
-        if targetArch == cpuarch.Architecture.X86_64:
+        if cpuarch.target() == cpuarch.Architecture.X86_64:
             caps['cpuModel'] = 'Intel(Fake) CPU'
 
             flagList = ['vmx', 'sse2', 'nx']
 
-            if targetArch == platform.machine():
+            if cpuarch.target() == cpuarch.current():
                 flagList += cpuInfo.flags()
 
             flags = set(flagList)
@@ -612,11 +603,12 @@
                 'model_pentium2,model_pentium3,model_pentiumpro,' \
                 'model_qemu32,model_coreduo,model_core2duo,model_n270,' \
                 'model_Conroe,model_Penryn,model_Nehalem,model_Opteron_G1'
-        elif targetArch in cpuarch.Architecture.POWER:
+        elif cpuarch.target() in cpuarch.Architecture.POWER:
             caps['cpuModel'] = 'POWER 8 (fake)'
             caps['cpuFlags'] = 'powernv,model_POWER8'
         else:
-            raise RuntimeError('Unsupported architecture: %s' % targetArch)
+            raise RuntimeError('Unsupported architecture: %s' %
+                               cpuarch.target())
     else:
         caps['cpuModel'] = cpuInfo.model()
         caps['cpuFlags'] = ','.join(cpuInfo.flags() +
@@ -633,7 +625,7 @@
     caps['operatingSystem'] = osversion()
     caps['uuid'] = utils.getHostUUID()
     caps['packages2'] = _getKeyPackages()
-    caps['emulatedMachines'] = _getEmulatedMachines(targetArch)
+    caps['emulatedMachines'] = _getEmulatedMachines(cpuarch.target())
     caps['ISCSIInitiatorName'] = _getIscsiIniName()
     caps['HBAInventory'] = storage.hba.HBAInventory()
     caps['vmTypes'] = ['kvm']
@@ -666,7 +658,7 @@
 
     caps['selinux'] = _getSELinux()
 
-    liveSnapSupported = _getLiveSnapshotSupport(targetArch)
+    liveSnapSupported = _getLiveSnapshotSupport(cpuarch.target())
     if liveSnapSupported is not None:
         caps['liveSnapshot'] = str(liveSnapSupported).lower()
     caps['liveMerge'] = str(getLiveMergeSupport()).lower()


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56ed03765a13b8591d91ef451a8e41578d4324d6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpolednik at redhat.com>


More information about the vdsm-patches mailing list