From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 23 Jun 2016 05:28:34 +0000 (+0200)
Subject: Add USB addresses to qemuhotplug test cases
X-Git-Tag: v2.1.0-rc1~283
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3681e0a9feb50b54a4097eb11b5c6cfd48522994;p=thirdparty%2Flibvirt.git

Add USB addresses to qemuhotplug test cases

This test assumes the XML will be the same after formatting.
Add USB addresses to it to keep it working when we autoassign them.
---

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml
index 3495ee67b4..7ca36d57b7 100644
--- a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml
+++ b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml
@@ -100,6 +100,7 @@
     </channel>
     <input type='tablet' bus='usb'>
       <alias name='input0'/>
+      <address type='usb' bus='0' port='1'/>
     </input>
     <input type='mouse' bus='ps2'>
       <alias name='input1'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml
index b36af270c3..f300940a33 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml
@@ -95,6 +95,7 @@
     </channel>
     <input type='tablet' bus='usb'>
       <alias name='input0'/>
+      <address type='usb' bus='0' port='1'/>
     </input>
     <input type='mouse' bus='ps2'>
       <alias name='input1'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
index 2ae104e119..7b35709fa9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
@@ -78,7 +78,9 @@
       <target type='virtio' name='org.qemu.guest_agent.0'/>
       <address type='virtio-serial' controller='0' bus='0' port='1'/>
     </channel>
-    <input type='tablet' bus='usb'/>
+    <input type='tablet' bus='usb'>
+      <address type='usb' bus='0' port='1'/>
+    </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'>