Change in vdsm[master]: ppc64le: Add default device configs to this arch

mpolednik at redhat.com mpolednik at redhat.com
Thu Mar 26 09:08:34 UTC 2015


Martin Polednik has uploaded a new change for review.

Change subject: ppc64le: Add default device configs to this arch
......................................................................

ppc64le: Add default device configs to this arch

PPC64le is very similar in terms of what we do in vdsm to PPC64. This
patch updates branches to consider default devices and running
architecture for PPC64le.

Change-Id: Ib0e2ead135ca09e31e3d59ed0e14064cb7ece578
Signed-off-by: Martin Polednik <mpolednik at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/39217/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 7a64b30..710971d 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -726,7 +726,8 @@
 
     def _getDefaultDiskInterface(self):
         DEFAULT_DISK_INTERFACES = {caps.Architecture.X86_64: 'ide',
-                                   caps.Architecture.PPC64: 'scsi'}
+                                   caps.Architecture.PPC64: 'scsi',
+                                   caps.Architecture.PPC64LE: 'scsi'}
         return DEFAULT_DISK_INTERFACES[self.arch]
 
     def __init__(self, cif, params, recover=False):
@@ -803,9 +804,6 @@
         self.saveState()
         self._watchdogEvent = {}
         self.arch = caps.getTargetArch()
-
-        if self.arch not in caps.Architecture.POWER or self.arch != 'x86_64':
-            raise RuntimeError('Unsupported architecture: %s' % self.arch)
 
         self._powerDownEvent = threading.Event()
         self._liveMergeCleanupThreads = {}
@@ -1004,7 +1002,8 @@
         """
 
         DEFAULT_VIDEOS = {caps.Architecture.X86_64: 'cirrus',
-                          caps.Architecture.PPC64: 'vga'}
+                          caps.Architecture.PPC64: 'vga',
+                          caps.Architecture.PPC64LE: 'vga'}
 
         vcards = []
         if self.conf.get('display') == 'vnc':
@@ -3698,7 +3697,7 @@
                       actionToString(action))
 
     def changeCD(self, drivespec):
-        if self.arch == caps.Architecture.PPC64:
+        if self.arch in caps.Architecture.POWER:
             blockdev = 'sda'
         else:
             blockdev = 'hdc'


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0e2ead135ca09e31e3d59ed0e14064cb7ece578
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