Remove default channel for s390x.

The Qemu guest agent change for 390x,remove default channel device
for s390x and regenerate the test output.Modified the clitest xml.
This commit is contained in:
Kevin Zhao 2015-11-04 14:30:24 +08:00 committed by Cole Robinson
parent 79d02e356b
commit 2aca20141e
3 changed files with 2 additions and 8 deletions

View File

@ -31,9 +31,5 @@
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
</devices>
</domain>

View File

@ -31,9 +31,5 @@
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
</devices>
</domain>

View File

@ -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