[virt-tools-list] [virt-manager PATCH] guest: Enable qemu-ga by default on s390x

[Andrea Bolognani]

It was disabled with commit 2aca20141ec3 back in 2015, but
these days we have it enabled for all other architectures and
there doesn't seem to be a good reason for s390x to keep being
the outlier.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
Connie (CC'd) says she tested qemu-ga on s390x in the past and
remembers it working fine, and also promised she would give it
another try tomorrow and report back just for extra safety.

 .../cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml  | 4 ++++
 tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml       | 4 ++++
 tests/cli-test-xml/compare/virt-install-s390x-graphics.xml    | 4 ++++
 tests/cli-test-xml/compare/virt-install-s390x-headless.xml    | 4 ++++
 virtinst/guest.py                                             | 3 ---
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml b/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
index 7ebca458..8af2aee8 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
@@ -37,6 +37,10 @@
     <console type="pty">
       <target type="sclp"/>
     </console>
+    <channel type="unix">
+      <source mode="bind"/>
+      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    </channel>
     <graphics type="vnc" port="-1"/>
     <video>
       <model type="virtio"/>
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
index b5e9f66d..33ca6190 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
@@ -37,6 +37,10 @@
     <console type="pty">
       <target type="sclp"/>
     </console>
+    <channel type="unix">
+      <source mode="bind"/>
+      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    </channel>
     <rng model="virtio">
       <backend model="random">/dev/urandom</backend>
     </rng>
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml b/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml
index 82f303cf..2747254e 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml
@@ -29,6 +29,10 @@
     <console type="pty">
       <target type="sclp"/>
     </console>
+    <channel type="unix">
+      <source mode="bind"/>
+      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    </channel>
     <input type="tablet" bus="virtio"/>
     <input type="keyboard" bus="virtio"/>
     <graphics type="vnc" port="-1"/>
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-headless.xml b/tests/cli-test-xml/compare/virt-install-s390x-headless.xml
index 1a8f9112..c5344a5c 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-headless.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-headless.xml
@@ -29,6 +29,10 @@
     <console type="pty">
       <target type="sclp"/>
     </console>
+    <channel type="unix">
+      <source mode="bind"/>
+      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    </channel>
     <rng model="virtio">
       <backend model="random">/dev/urandom</backend>
     </rng>
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 9828f814..717ed21e 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -884,9 +884,6 @@ class Guest(XMLBuilder):
             return
         if self.devices.channel:
             return
-        if self.os.is_s390x():
-            # Not wanted for s390 apparently
-            return
 
         if (self.conn.is_qemu() and
             self._supports_virtioserial() and
-- 
2.21.0