[virt-tools-list] [virt-manager][PATCH 3/3] Modify the machine type for s390x.All machine types begin with "s390x-ccw" will by set to the default machine type "s390-ccw-virtio".

Kevin Zhao kevinzs at linux.vnet.ibm.com
Wed Nov 4 06:30:25 UTC 2015


---
 virtinst/capabilities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virtinst/capabilities.py b/virtinst/capabilities.py
index 4fa1724..10e7ea0 100644
--- a/virtinst/capabilities.py
+++ b/virtinst/capabilities.py
@@ -364,7 +364,7 @@ class _CapsInfo(object):
                 return "vexpress-a15"
 
         if self.arch in ["s390x"]:
-            if "s390-ccw-virtio" in self.machines:
+            if any(machine.startswith("s390-ccw") for machine in self.machines):
                 return "s390-ccw-virtio"
 
         return None
-- 
1.9.1




More information about the virt-tools-list mailing list