Change in vdsm[master]: virt: Fix arch check after cpuarch was merged

nsoffer at redhat.com nsoffer at redhat.com
Wed Jan 13 18:16:06 UTC 2016


Nir Soffer has uploaded a new change for review.

Change subject: virt: Fix arch check after cpuarch was merged
......................................................................

virt: Fix arch check after cpuarch was merged

commit d7a85d3c2cec (virt: Don't create <bios> on non-x86 architectures)
was somehow applied cleanly on master after caps.Architecture was
removed, breaking the build and probably the actual code when trying to
use serial console.

This patch updates the code to use cpuarch instead of caps.Architecture.

Change-Id: Ie5752ae9c291b2c79500607b7d03f42fd366a5cd
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M tests/vmTests.py
M vdsm/virt/vmxml.py
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/51809/1

diff --git a/tests/vmTests.py b/tests/vmTests.py
index b9b7fc4..c665cf0 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -297,10 +297,10 @@
 
     @permutations([
         # console_type, cpu_arch, use_serial, check_attrib
-        ['serial', caps.Architecture.X86_64, True, True],
-        ['virtio', caps.Architecture.X86_64, False, True],
-        ['serial', caps.Architecture.PPC64, False, False],
-        ['serial', caps.Architecture.PPC64LE, False, False],
+        ['serial', cpuarch.X86_64, True, True],
+        ['virtio', cpuarch.X86_64, False, True],
+        ['serial', cpuarch.PPC64, False, False],
+        ['serial', cpuarch.PPC64LE, False, False],
     ])
     def testSerialBios(self, console_type, cpu_arch, use_serial, check_attrib):
         devices = {'device': 'console', 'type': 'console',
diff --git a/vdsm/virt/vmxml.py b/vdsm/virt/vmxml.py
index 9b7d319..ff1accb 100644
--- a/vdsm/virt/vmxml.py
+++ b/vdsm/virt/vmxml.py
@@ -283,7 +283,7 @@
         if utils.tobool(self.conf.get('bootMenuEnable', False)):
             oselem.appendChildWithArgs('bootmenu', enable='yes')
 
-        if use_serial_console and caps.Architecture.is_x86(self.arch):
+        if use_serial_console and cpuarch.is_x86(self.arch):
             oselem.appendChildWithArgs('bios', useserial='yes')
 
     def appendSysinfo(self, osname, osversion, serialNumber):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5752ae9c291b2c79500607b7d03f42fd366a5cd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>


More information about the vdsm-patches mailing list