[virt-tools-list] [virt-manager][PATCH 2/3] Remove default channel for s390x.

[Kevin Zhao]

The Qemu guest agent change for 390x,remove default channel device
for s390x and regenerate the test output.Modified the clitest xml.
---
 tests/cli-test-xml/compare/virt-install-s390x-KVMIBM.xml | 4 ----
 virtinst/guest.py                                        | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/cli-test-xml/compare/virt-install-s390x-KVMIBM.xml b/tests/cli-test-xml/compare/virt-install-s390x-KVMIBM.xml
index 081c45d..6155b13 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-KVMIBM.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-KVMIBM.xml
@@ -31,9 +31,5 @@
       <mac address="52:54:00:5c:68:3a"/>
     </interface>
     <console type="pty"/>
-    <channel type="unix">
-      <source mode="bind"/>
-      <target type="virtio" name="org.qemu.guest_agent.0"/>
-    </channel>
   </devices>
 </domain>
\ No newline at end of file
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