[virt-tools-list] [PATCH] virt-manager: Modified some features for s390x

[Kevin Zhao]

 modified the machine type ,remove the default channel
 since it is not supported now ,and modified the capabilities-xml
 since it has been updated.
---
 tests/capabilities-xml/kvm-s390x.xml | 14 +++++++++++---
 virtinst/capabilities.py             |  2 +-
 virtinst/guest.py                    |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/capabilities-xml/kvm-s390x.xml b/tests/capabilities-xml/kvm-s390x.xml
index 039c2e0..aeddfb0 100644
--- a/tests/capabilities-xml/kvm-s390x.xml
+++ b/tests/capabilities-xml/kvm-s390x.xml
@@ -52,15 +52,23 @@
     <arch name="s390x">
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-s390x</emulator>
+      <machine maxCpus="64">s390-ccw-kvmibm-1.1.1</machine>
+      <machine canonical="s390-ccw-kvmibm-1.1.1" maxCpus="64">s390-ccw-virtio</machine>
+      <machine maxCpus="64">s390-ccw-kvmibm-1.1.0</machine>
+      <machine maxCpus="255">s390-virtio</machine>
       <machine canonical="s390-virtio" maxCpus="255">s390</machine>
-      <machine canonical="s390-ccw-virtio" maxCpus="255">s390-ccw</machine>
+      <machine maxCpus="255">s390-ccw-virtio-2.4</machine>
       <domain type="qemu">
         <emulator>/usr/bin/qemu-system-s390x</emulator>
       </domain>
       <domain type="kvm">
-        <emulator>/usr/bin/qemu-system-s390x</emulator>
+        <emulator>/usr/bin/qemu-kvm</emulator>
+        <machine maxCpus="64">s390-ccw-kvmibm-1.1.1</machine>
+        <machine canonical="s390-ccw-kvmibm-1.1.1" maxCpus="64">s390-ccw-virtio</machine>
+        <machine maxCpus="64">s390-ccw-kvmibm-1.1.0</machine>
+        <machine maxCpus="255">s390-virtio</machine>
         <machine canonical="s390-virtio" maxCpus="255">s390</machine>
-        <machine canonical="s390-ccw-virtio" maxCpus="255">s390-ccw</machine>
+        <machine maxCpus="255">s390-ccw-virtio-2.4</machine>
       </domain>
     </arch>
     <features>
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
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 6f2b30a..4387ff4 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -657,6 +657,8 @@ class Guest(XMLBuilder):
             return
         if self.get_devices("channel"):
             return
+        if self.os.is_s390x():
+            return
 
         # Skip qemu-ga on ARM where virtio slots are currently limited
         if (self.conn.is_qemu() and
-- 
1.9.1