[Kimchi-devel] [PATCH 1/2] Add PPC support to ISO Stream feature test

Rodrigo Trujillo rodrigo.trujillo at linux.vnet.ibm.com
Thu Jul 3 17:37:08 UTC 2014


This patch removes hardcoded tags from iso stream xml. Tags are related
to machine type and architecture and are set in running type.

Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo at linux.vnet.ibm.com>
---
 src/kimchi/featuretests.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py
index 5192361..277dd56 100644
--- a/src/kimchi/featuretests.py
+++ b/src/kimchi/featuretests.py
@@ -20,6 +20,7 @@
 import cherrypy
 import libvirt
 import lxml.etree as ET
+import platform
 import socket
 import subprocess
 import threading
@@ -37,7 +38,7 @@ ISO_STREAM_XML = """
   <name>ISO_STREAMING</name>
   <memory unit='KiB'>1048576</memory>
   <os>
-    <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <type arch='%(arch)s' machine='%(machine)s'>hvm</type>
     <boot dev='cdrom'/>
   </os>
   <devices>
@@ -100,7 +101,14 @@ class FeatureTests(object):
 
     @staticmethod
     def libvirt_supports_iso_stream(protocol):
-        xml = ISO_STREAM_XML % {'protocol': protocol}
+        if platform.machine().startswith('ppc'):
+            arch = "ppc64"
+            machine = "pseries"
+        else:
+            arch = "x86_64"
+            machine = "pc-1.2"
+        xml = ISO_STREAM_XML % {'protocol': protocol, 'arch': arch,
+                                'machine': machine}
         conn = None
         try:
             FeatureTests.disable_screen_error_logging()
-- 
1.9.3




More information about the Kimchi-devel mailing list